From 0a318080dc890b1c94781d874b2b439eb9be02e3 Mon Sep 17 00:00:00 2001
From: mpolotsk-akamai <157619599+mpolotsk-akamai@users.noreply.github.com>
Date: Thu, 13 Nov 2025 10:20:47 +0100
Subject: [PATCH 01/91] fix: [UIE-9633] - IAM: users table aria-label fix
 (#13082)

* fix: [UIE-9633] - IAM: users table aria-label fix

* Added changeset: IAM: the aria-label for the Users table action menu displays an incorrect username

---------

Co-authored-by: Alban Bailly <130582365+abailly-akamai@users.noreply.github.com>
---
 packages/manager/.changeset/pr-13082-fixed-1762957507469.md  | 5 +++++
 .../src/features/IAM/Users/UsersTable/UsersActionMenu.tsx    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 packages/manager/.changeset/pr-13082-fixed-1762957507469.md

diff --git a/packages/manager/.changeset/pr-13082-fixed-1762957507469.md b/packages/manager/.changeset/pr-13082-fixed-1762957507469.md
new file mode 100644
index 00000000000..004e1cb6473
--- /dev/null
+++ b/packages/manager/.changeset/pr-13082-fixed-1762957507469.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+IAM: the aria-label for the Users table action menu displays an incorrect username ([#13082](https://github.com/linode/manager/pull/13082))
diff --git a/packages/manager/src/features/IAM/Users/UsersTable/UsersActionMenu.tsx b/packages/manager/src/features/IAM/Users/UsersTable/UsersActionMenu.tsx
index defaca1680f..fcf5920de61 100644
--- a/packages/manager/src/features/IAM/Users/UsersTable/UsersActionMenu.tsx
+++ b/packages/manager/src/features/IAM/Users/UsersTable/UsersActionMenu.tsx
@@ -109,7 +109,7 @@ export const UsersActionMenu = (props: Props) => {
   return (
     <ActionMenu
       actionsList={actions}
-      ariaLabel={`Action menu for user ${profileUserName}`}
+      ariaLabel={`Action menu for user ${username}`}
     />
   );
 };

From dab739db4db8daa9fa82f3b0dd6b17bb873a112c Mon Sep 17 00:00:00 2001
From: Hana Xu <115299789+hana-akamai@users.noreply.github.com>
Date: Thu, 13 Nov 2025 13:15:56 -0500
Subject: [PATCH 02/91] refactor: [UIE-9324] - Replace Formik with React Hook
 Form in MaintenanceWindow (#13060)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description 📝

Refactor Database MaintenanceWindow to use React Hook Form instead of Formik

### Verification steps

(How to verify changes)

- [ ] Go to a Database Cluster's details page, then click on the Settings tab
- [ ] Test setting the maintenance window for Aiven and legacy dbs, error messages, etc. There should be no regressions compared to Prod
---
 packages/api-v4/src/databases/types.ts        |   4 +-
 .../pr-13060-tech-stories-1762357716157.md    |   5 +
 .../DatabaseSettings/DatabaseSettings.tsx     |   2 +-
 .../DatabaseSettings/MaintenanceWindow.tsx    | 553 +++++++++---------
 packages/validation/src/databases.schema.ts   |   7 +
 5 files changed, 289 insertions(+), 282 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13060-tech-stories-1762357716157.md

diff --git a/packages/api-v4/src/databases/types.ts b/packages/api-v4/src/databases/types.ts
index 694493768e3..80611783fa2 100644
--- a/packages/api-v4/src/databases/types.ts
+++ b/packages/api-v4/src/databases/types.ts
@@ -163,12 +163,10 @@ interface ConnectionStrings {
   value: string;
 }
 
-export type UpdatesFrequency = 'monthly' | 'weekly';
-
 export interface UpdatesSchedule {
   day_of_week: number;
   duration: number;
-  frequency: UpdatesFrequency;
+  frequency: 'monthly' | 'weekly';
   hour_of_day: number;
   pending?: PendingUpdates[];
   week_of_month: null | number;
diff --git a/packages/manager/.changeset/pr-13060-tech-stories-1762357716157.md b/packages/manager/.changeset/pr-13060-tech-stories-1762357716157.md
new file mode 100644
index 00000000000..04211c454c6
--- /dev/null
+++ b/packages/manager/.changeset/pr-13060-tech-stories-1762357716157.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Tech Stories
+---
+
+Replace Formik with React Hook Form in MaintenanceWindow ([#13060](https://github.com/linode/manager/pull/13060))
diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/DatabaseSettings.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/DatabaseSettings.tsx
index 5b559edd92e..d9b8c332039 100644
--- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/DatabaseSettings.tsx
+++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/DatabaseSettings.tsx
@@ -27,7 +27,7 @@ import { DatabaseSettingsMaintenance } from './DatabaseSettingsMaintenance';
 import DatabaseSettingsMenuItem from './DatabaseSettingsMenuItem';
 import DatabaseSettingsResetPasswordDialog from './DatabaseSettingsResetPasswordDialog';
 import { DatabaseSettingsSuspendClusterDialog } from './DatabaseSettingsSuspendClusterDialog';
-import MaintenanceWindow from './MaintenanceWindow';
+import { MaintenanceWindow } from './MaintenanceWindow';
 
 export const DatabaseSettings = () => {
   const { database, disabled } = useDatabaseDetailContext();
diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/MaintenanceWindow.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/MaintenanceWindow.tsx
index a40bfd06db4..ba944b7927e 100644
--- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/MaintenanceWindow.tsx
+++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/MaintenanceWindow.tsx
@@ -1,3 +1,4 @@
+import { yupResolver } from '@hookform/resolvers/yup';
 import { useDatabaseMutation } from '@linode/queries';
 import {
   Autocomplete,
@@ -6,64 +7,23 @@ import {
   Notice,
   Radio,
   RadioGroup,
+  Stack,
   TooltipIcon,
   Typography,
 } from '@linode/ui';
+import { updateMaintenanceSchema } from '@linode/validation';
+import { styled } from '@mui/material/styles';
 import { Button } from 'akamai-cds-react-components';
-import { useFormik } from 'formik';
 import { DateTime } from 'luxon';
 import { useSnackbar } from 'notistack';
 import * as React from 'react';
-import { makeStyles } from 'tss-react/mui';
+import { useWatch } from 'react-hook-form';
+import { Controller, FormProvider, useForm } from 'react-hook-form';
 
 import { Link } from 'src/components/Link';
 
 import type { Database, UpdatesSchedule } from '@linode/api-v4/lib/databases';
-import type { APIError } from '@linode/api-v4/lib/types';
 import type { SelectOption } from '@linode/ui';
-import type { Theme } from '@mui/material/styles';
-
-const useStyles = makeStyles()((theme: Theme) => ({
-  formControlDropdown: {
-    '& label': {
-      overflow: 'visible',
-    },
-    marginRight: '3rem',
-    minWidth: '125px',
-  },
-  sectionButton: {
-    alignSelf: 'end',
-    marginBottom: '1rem',
-    marginTop: '1rem',
-    minWidth: 214,
-    [theme.breakpoints.down('md')]: {
-      alignSelf: 'flex-start',
-    },
-  },
-  sectionText: {
-    [theme.breakpoints.down('md')]: {
-      marginBottom: '1rem',
-    },
-    [theme.breakpoints.down('sm')]: {
-      width: '100%',
-    },
-    width: '65%',
-  },
-  sectionTitle: {
-    marginBottom: '0.25rem',
-  },
-  sectionTitleAndText: {
-    width: '100%',
-  },
-  topSection: {
-    alignItems: 'center',
-    display: 'flex',
-    justifyContent: 'space-between',
-    [theme.breakpoints.down('lg')]: {
-      flexDirection: 'column',
-    },
-  },
-}));
 
 interface Props {
   database: Database;
@@ -74,17 +34,9 @@ interface Props {
 export const MaintenanceWindow = (props: Props) => {
   const { database, disabled, timezone } = props;
 
-  const [maintenanceUpdateError, setMaintenanceUpdateError] =
-    React.useState<APIError[]>();
-
-  // This will be set to `true` once a form field has been touched. This is used to disable the
-  // "Save Changes" button unless there have been changes to the form.
-  const [formTouched, setFormTouched] = React.useState<boolean>(false);
-
   const [modifiedWeekSelectionMap, setModifiedWeekSelectionMap] =
     React.useState<SelectOption<number>[]>([]);
 
-  const { classes } = useStyles();
   const { enqueueSnackbar } = useSnackbar();
 
   const { mutateAsync: updateDatabase } = useDatabaseMutation(
@@ -116,32 +68,21 @@ export const MaintenanceWindow = (props: Props) => {
     weekSelectionModifier(dayOfWeek.label, weekSelectionMap);
   }, []);
 
-  const handleSaveMaintenanceWindow = (
-    values: Omit<UpdatesSchedule, 'duration'>,
-    {
-      setSubmitting,
-    }: {
-      setSubmitting: (isSubmitting: boolean) => void;
-    }
-  ) => {
+  const onSubmit = async (values: Partial<UpdatesSchedule>) => {
     // @TODO Update this to only send 'updates' and not 'allow_list' when the API supports it.
     // Additionally, at that time, enable the validationSchema which currently does not work
     // because allow_list is a required field in the schema.
-    updateDatabase({
-      allow_list: database.allow_list,
-      updates: values as UpdatesSchedule,
-    })
-      .then(() => {
-        setSubmitting(false);
-        enqueueSnackbar('Maintenance Window settings saved successfully.', {
-          variant: 'success',
-        });
-        setFormTouched(false);
-      })
-      .catch((e: APIError[]) => {
-        setMaintenanceUpdateError(e);
-        setSubmitting(false);
+    try {
+      await updateDatabase({
+        allow_list: database.allow_list,
+        updates: values as UpdatesSchedule,
+      });
+      enqueueSnackbar('Maintenance Window settings saved successfully.', {
+        variant: 'success',
       });
+    } catch (errors) {
+      setError('root', { message: errors[0].reason });
+    }
   };
 
   const utcOffsetInHours = timezone
@@ -155,17 +96,29 @@ export const MaintenanceWindow = (props: Props) => {
     return null;
   };
 
-  const { errors, handleSubmit, isSubmitting, setFieldValue, touched, values } =
-    useFormik({
-      initialValues: {
-        day_of_week: database.updates?.day_of_week ?? 1,
-        frequency: database.updates?.frequency ?? 'weekly',
-        hour_of_day: database.updates?.hour_of_day ?? 20,
-        week_of_month: getInitialWeekOfMonth(),
-      },
-      // validationSchema: updateDatabaseSchema,
-      onSubmit: handleSaveMaintenanceWindow,
-    });
+  const form = useForm<Partial<UpdatesSchedule>>({
+    defaultValues: {
+      day_of_week: database.updates?.day_of_week ?? 1,
+      frequency: database.updates?.frequency ?? 'weekly',
+      hour_of_day: database.updates?.hour_of_day ?? 20,
+      week_of_month: getInitialWeekOfMonth(),
+    },
+    mode: 'onBlur',
+    resolver: yupResolver(updateMaintenanceSchema),
+  });
+
+  const {
+    control,
+    formState: { isSubmitting, isDirty, errors },
+    handleSubmit,
+    setValue,
+    setError,
+  } = form;
+
+  const [dayOfWeek, hourOfDay, frequency, weekOfMonth] = useWatch({
+    control,
+    name: ['day_of_week', 'hour_of_day', 'frequency', 'week_of_month'],
+  });
 
   const isLegacy = database.platform === 'rdbms-legacy';
 
@@ -176,202 +129,215 @@ export const MaintenanceWindow = (props: Props) => {
     "OS and database engine updates will be performed on the schedule below. Select the frequency, day, and time you'd prefer maintenance to occur.";
 
   return (
-    <form onSubmit={handleSubmit}>
-      <div className={classes.topSection}>
-        <div className={classes.sectionTitleAndText}>
-          <Typography className={classes.sectionTitle} variant="h3">
-            {isLegacy
-              ? 'Maintenance Window'
-              : 'Set a Weekly Maintenance Window'}
-          </Typography>
-          {maintenanceUpdateError ? (
-            <Notice spacingTop={8} variant="error">
-              {maintenanceUpdateError[0].reason}
-            </Notice>
-          ) : null}
-          <Typography className={classes.sectionText}>
-            {isLegacy ? typographyLegacyDatabase : typographyDatabase}{' '}
-            {database.cluster_size !== 3
-              ? 'For non-HA plans, expect downtime during this window.'
-              : null}
-          </Typography>
-          <div>
-            <FormControl className={classes.formControlDropdown}>
-              <Autocomplete
-                autoHighlight
-                disableClearable
-                disabled={disabled}
-                errorText={touched.day_of_week ? errors.day_of_week : undefined}
-                isOptionEqualToValue={(option, value) =>
-                  option.value === value.value
-                }
-                label="Day of Week"
-                noMarginTop
-                onChange={(_, day) => {
-                  setFormTouched(true);
-                  setFieldValue('day_of_week', day.value);
-                  weekSelectionModifier(day.label, weekSelectionMap);
-                  // If week_of_month is not null (i.e., the user has selected a value for "Repeats on" already),
-                  // refresh the field value so that the selected option displays the chosen day.
-                  if (values.week_of_month) {
-                    setFieldValue('week_of_month', values.week_of_month);
-                  }
-                }}
-                options={daySelectionMap}
-                placeholder="Choose a day"
-                renderOption={(props, option) => (
-                  <li {...props}>{option.label}</li>
-                )}
-                textFieldProps={{
-                  dataAttrs: {
-                    'data-qa-weekday-select': true,
-                  },
-                }}
-                value={daySelectionMap.find(
-                  (thisOption) => thisOption.value === values.day_of_week
-                )}
-              />
-            </FormControl>
-            <FormControl className={classes.formControlDropdown}>
-              <div style={{ alignItems: 'center', display: 'flex' }}>
-                <Autocomplete
-                  autoHighlight
-                  defaultValue={hourSelectionMap.find(
-                    (option) => option.value === 20
-                  )}
-                  disableClearable
-                  disabled={disabled}
-                  errorText={
-                    touched.hour_of_day ? errors.hour_of_day : undefined
-                  }
-                  label="Time"
-                  noMarginTop
-                  onChange={(_, hour) => {
-                    setFormTouched(true);
-                    setFieldValue('hour_of_day', hour?.value);
-                  }}
-                  options={hourSelectionMap}
-                  placeholder="Choose a time"
-                  renderOption={(props, option) => (
-                    <li {...props}>{option.label}</li>
+    <FormProvider {...form}>
+      <form onSubmit={handleSubmit(onSubmit)}>
+        <StyledStack direction="row">
+          <Stack>
+            <Typography mb={0.5} variant="h3">
+              {isLegacy
+                ? 'Maintenance Window'
+                : 'Set a Weekly Maintenance Window'}
+            </Typography>
+            {errors.root?.message && (
+              <Notice spacingTop={8} variant="error">
+                {errors.root?.message}
+              </Notice>
+            )}
+            <StyledTypography>
+              {isLegacy ? typographyLegacyDatabase : typographyDatabase}{' '}
+              {database.cluster_size !== 3 &&
+                'For non-HA plans, expect downtime during this window.'}
+            </StyledTypography>
+            <Stack direction="row" mt={2} spacing={6}>
+              <FormControl>
+                <Controller
+                  control={control}
+                  name="day_of_week"
+                  render={({ field, fieldState }) => (
+                    <Autocomplete
+                      autoHighlight
+                      disableClearable
+                      disabled={disabled}
+                      errorText={fieldState.error?.message}
+                      isOptionEqualToValue={(option, value) =>
+                        option.value === value.value
+                      }
+                      label="Day of Week"
+                      noMarginTop
+                      onChange={(_, day) => {
+                        field.onChange(day.value);
+                        weekSelectionModifier(day.label, weekSelectionMap);
+                      }}
+                      options={daySelectionMap}
+                      placeholder="Choose a day"
+                      renderOption={(props, option) => (
+                        <li {...props}>{option.label}</li>
+                      )}
+                      textFieldProps={{
+                        dataAttrs: {
+                          'data-qa-weekday-select': true,
+                        },
+                      }}
+                      value={daySelectionMap.find(
+                        (thisOption) => thisOption.value === dayOfWeek
+                      )}
+                    />
                   )}
-                  textFieldProps={{
-                    dataAttrs: {
-                      'data-qa-time-select': true,
-                    },
-                  }}
-                  value={hourSelectionMap.find(
-                    (thisOption) => thisOption.value === values.hour_of_day
-                  )}
-                />
-                <TooltipIcon
-                  status="info"
-                  sxTooltipIcon={{
-                    marginTop: '1.75rem',
-                    padding: '0px 8px',
-                  }}
-                  text={
-                    <Typography>
-                      UTC is {utcOffsetText(utcOffsetInHours)} hours compared to
-                      your local timezone. Click{' '}
-                      <Link to="/profile/display">here</Link> to view or change
-                      your timezone settings.
-                    </Typography>
-                  }
                 />
-              </div>
-            </FormControl>
-          </div>
-          {isLegacy && (
-            <FormControl
-              disabled={disabled}
-              onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                setFormTouched(true);
-                setFieldValue('frequency', e.target.value);
-                if (e.target.value === 'weekly') {
-                  // If the frequency is weekly, set the 'week_of_month' field to null since that should only be specified for a monthly frequency.
-                  setFieldValue('week_of_month', null);
-                }
+              </FormControl>
+              <FormControl>
+                <div style={{ alignItems: 'center', display: 'flex' }}>
+                  <Controller
+                    control={control}
+                    name="hour_of_day"
+                    render={({ field, fieldState }) => (
+                      <Autocomplete
+                        autoHighlight
+                        defaultValue={hourSelectionMap.find(
+                          (option) => option.value === 20
+                        )}
+                        disableClearable
+                        disabled={disabled}
+                        errorText={fieldState.error?.message}
+                        label="Time"
+                        noMarginTop
+                        onChange={(_, hour) => {
+                          field.onChange(hour?.value);
+                        }}
+                        options={hourSelectionMap}
+                        placeholder="Choose a time"
+                        renderOption={(props, option) => (
+                          <li {...props}>{option.label}</li>
+                        )}
+                        textFieldProps={{
+                          dataAttrs: {
+                            'data-qa-time-select': true,
+                          },
+                        }}
+                        value={hourSelectionMap.find(
+                          (thisOption) => thisOption.value === hourOfDay
+                        )}
+                      />
+                    )}
+                  />
+                  <TooltipIcon
+                    status="info"
+                    sxTooltipIcon={{
+                      marginTop: '1.75rem',
+                      padding: '0px 8px',
+                    }}
+                    text={
+                      <Typography>
+                        UTC is {utcOffsetText(utcOffsetInHours)} hours compared
+                        to your local timezone. Click{' '}
+                        <Link to="/profile/display">here</Link> to view or
+                        change your timezone settings.
+                      </Typography>
+                    }
+                  />
+                </div>
+              </FormControl>
+            </Stack>
+            {isLegacy && (
+              <Controller
+                control={control}
+                name="frequency"
+                render={({ field }) => (
+                  <FormControl
+                    disabled={disabled}
+                    onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                      field.onChange(e.target.value);
+                      if (e.target.value === 'weekly') {
+                        // If the frequency is weekly, set the 'week_of_month' field to null since that should only be specified for a monthly frequency.
+                        setValue('week_of_month', null);
+                      }
 
-                if (e.target.value === 'monthly') {
-                  const dayOfWeek =
-                    daySelectionMap.find(
-                      (option) => option.value === values.day_of_week
-                    ) ?? daySelectionMap[0];
+                      if (e.target.value === 'monthly') {
+                        const _dayOfWeek =
+                          daySelectionMap.find(
+                            (option) => option.value === dayOfWeek
+                          ) ?? daySelectionMap[0];
 
-                  weekSelectionModifier(dayOfWeek.label, weekSelectionMap);
-                  setFieldValue(
-                    'week_of_month',
-                    modifiedWeekSelectionMap[0].value
-                  );
-                }
-              }}
-            >
-              <RadioGroup
-                style={{ marginBottom: 0, marginTop: 0 }}
-                value={values.frequency}
-              >
-                {maintenanceFrequencyMap.map((option) => (
-                  <FormControlLabel
-                    control={<Radio />}
-                    key={option.value}
-                    label={option.key}
-                    value={option.value}
-                  />
-                ))}
-              </RadioGroup>
-            </FormControl>
-          )}
-          <div>
-            {values.frequency === 'monthly' ? (
-              <FormControl
-                className={classes.formControlDropdown}
-                style={{ minWidth: '250px' }}
-              >
-                <Autocomplete
-                  autoHighlight
-                  defaultValue={modifiedWeekSelectionMap[0]}
-                  disableClearable
-                  errorText={
-                    touched.week_of_month ? errors.week_of_month : undefined
-                  }
-                  label="Repeats on"
-                  noMarginTop
-                  onChange={(_, week) => {
-                    setFormTouched(true);
-                    setFieldValue('week_of_month', week?.value);
-                  }}
-                  options={modifiedWeekSelectionMap}
-                  placeholder="Repeats on"
-                  renderOption={(props, option) => (
-                    <li {...props}>{option.label}</li>
-                  )}
-                  textFieldProps={{
-                    dataAttrs: {
-                      'data-qa-week-in-month-select': true,
-                    },
-                  }}
-                  value={modifiedWeekSelectionMap.find(
-                    (thisOption) => thisOption.value === values.week_of_month
+                        weekSelectionModifier(
+                          _dayOfWeek.label,
+                          weekSelectionMap
+                        );
+                        setValue(
+                          'week_of_month',
+                          modifiedWeekSelectionMap[0].value
+                        );
+                      }
+                    }}
+                  >
+                    <RadioGroup
+                      style={{ marginBottom: 0, marginTop: 0 }}
+                      value={frequency}
+                    >
+                      {maintenanceFrequencyMap.map((option) => (
+                        <FormControlLabel
+                          control={<Radio />}
+                          key={option.value}
+                          label={option.key}
+                          value={option.value}
+                        />
+                      ))}
+                    </RadioGroup>
+                  </FormControl>
+                )}
+              />
+            )}
+            <div>
+              {frequency === 'monthly' && (
+                <Controller
+                  control={control}
+                  name="week_of_month"
+                  render={({ field, fieldState }) => (
+                    <FormControl style={{ minWidth: '250px' }}>
+                      <Autocomplete
+                        autoHighlight
+                        defaultValue={modifiedWeekSelectionMap[0]}
+                        disableClearable
+                        errorText={fieldState.error?.message}
+                        label="Repeats on"
+                        noMarginTop
+                        onChange={(_, week) => {
+                          field.onChange(week.value);
+                        }}
+                        options={modifiedWeekSelectionMap}
+                        placeholder="Repeats on"
+                        renderOption={(props, option) => (
+                          <li {...props}>{option.label}</li>
+                        )}
+                        textFieldProps={{
+                          dataAttrs: {
+                            'data-qa-week-in-month-select': true,
+                          },
+                        }}
+                        value={modifiedWeekSelectionMap.find(
+                          (thisOption) => thisOption.value === weekOfMonth
+                        )}
+                      />
+                    </FormControl>
                   )}
                 />
-              </FormControl>
-            ) : null}
-          </div>
-        </div>
-        <Button
-          className={classes.sectionButton}
-          data-testid="save-changes-button"
-          disabled={!formTouched || isSubmitting || disabled}
-          processing={isSubmitting}
-          title="Save Changes"
-          type="submit"
-          variant="primary"
-        >
-          Save Changes
-        </Button>
-      </div>
-    </form>
+              )}
+            </div>
+          </Stack>
+          <StyledButtonStack>
+            <Button
+              data-testid="save-changes-button"
+              disabled={!isDirty || isSubmitting || disabled}
+              processing={isSubmitting}
+              title="Save Changes"
+              type="submit"
+              variant="primary"
+            >
+              Save Changes
+            </Button>
+          </StyledButtonStack>
+        </StyledStack>
+      </form>
+    </FormProvider>
   );
 };
 
@@ -436,4 +402,35 @@ const utcOffsetText = (utcOffsetInHours: number) => {
     : `-${utcOffsetInHours}`;
 };
 
-export default MaintenanceWindow;
+const StyledTypography = styled(Typography, {
+  label: 'StyledTypography',
+})(({ theme }) => ({
+  [theme.breakpoints.down('md')]: {
+    marginBottom: '1rem',
+  },
+  [theme.breakpoints.down('sm')]: {
+    width: '100%',
+  },
+  width: '65%',
+}));
+
+const StyledStack = styled(Stack, {
+  label: 'StyledStack',
+})(({ theme }) => ({
+  flexDirection: 'row',
+  [theme.breakpoints.down('md')]: {
+    flexDirection: 'column',
+  },
+}));
+
+const StyledButtonStack = styled(Stack, {
+  label: 'StyledButtonStack',
+})(({ theme }) => ({
+  alignSelf: 'end',
+  marginBottom: '1rem',
+  marginTop: '1rem',
+  minWidth: 214,
+  [theme.breakpoints.down('md')]: {
+    alignSelf: 'flex-start',
+  },
+}));
diff --git a/packages/validation/src/databases.schema.ts b/packages/validation/src/databases.schema.ts
index 6e1dc16382a..5cbead4508d 100644
--- a/packages/validation/src/databases.schema.ts
+++ b/packages/validation/src/databases.schema.ts
@@ -28,6 +28,13 @@ export const getDynamicDatabaseSchema = (isVPCSelected: boolean) => {
   });
 };
 
+export const updateMaintenanceSchema = object({
+  frequency: string().oneOf(['weekly', 'monthly']).optional(),
+  hour_of_day: number(),
+  day_of_week: number(),
+  week_of_month: number().nullable(),
+});
+
 export const updateDatabaseSchema = object({
   label: string().notRequired().min(3, LABEL_MESSAGE).max(32, LABEL_MESSAGE),
   allow_list: array().of(string()).notRequired(),

From 616459fa57ddeb5b056e7b9237c67fcfc21a33ff Mon Sep 17 00:00:00 2001
From: grevanak-akamai <145482092+grevanak-akamai@users.noreply.github.com>
Date: Fri, 14 Nov 2025 14:49:15 +0530
Subject: [PATCH 03/91] Upcoming: [UIE-9538]- Disable premium plan tab if
 corresponding g7 dedicated plans are available (#13081)

* upcoming: [UIE-9538]- Disable premium plan tab if g7 dedicated plans available

* Added changeset

* Making use of new GCP flag and address review comments
---
 ...r-13081-upcoming-features-1762935895154.md |  5 +++
 .../e2e/core/linodes/clone-linode.spec.ts     |  1 +
 .../e2e/core/linodes/plan-selection.spec.ts   | 13 ++++++--
 .../manager/src/dev-tools/FeatureFlagTool.tsx |  2 +-
 packages/manager/src/featureFlags.ts          |  6 +++-
 .../KubernetesPlansPanel.tsx                  | 33 ++++++++++++++++++-
 .../features/Linodes/LinodeCreate/Plan.tsx    | 11 +++++++
 .../components/PlansPanel/PlansPanel.tsx      | 20 ++++++++++-
 .../features/components/PlansPanel/utils.ts   | 18 ++++++++++
 .../presets/crud/handlers/linodes/linodes.ts  |  8 +++--
 .../manager/src/utilities/linodes.test.ts     |  8 +++--
 packages/manager/src/utilities/linodes.ts     |  3 +-
 packages/utilities/src/factories/linodes.ts   | 14 ++++++++
 13 files changed, 131 insertions(+), 11 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13081-upcoming-features-1762935895154.md

diff --git a/packages/manager/.changeset/pr-13081-upcoming-features-1762935895154.md b/packages/manager/.changeset/pr-13081-upcoming-features-1762935895154.md
new file mode 100644
index 00000000000..b65763c0fc7
--- /dev/null
+++ b/packages/manager/.changeset/pr-13081-upcoming-features-1762935895154.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Disable premium plan tab if corresponding g7 dedicated plans are available ([#13081](https://github.com/linode/manager/pull/13081))
diff --git a/packages/manager/cypress/e2e/core/linodes/clone-linode.spec.ts b/packages/manager/cypress/e2e/core/linodes/clone-linode.spec.ts
index 6fbb52b8e7d..43dce38bf2c 100644
--- a/packages/manager/cypress/e2e/core/linodes/clone-linode.spec.ts
+++ b/packages/manager/cypress/e2e/core/linodes/clone-linode.spec.ts
@@ -70,6 +70,7 @@ describe('clone linode', () => {
   beforeEach(() => {
     mockAppendFeatureFlags({
       linodeInterfaces: { enabled: false },
+      generationalPlansv2: { enabled: false, allowedPlans: [] },
     });
   });
 
diff --git a/packages/manager/cypress/e2e/core/linodes/plan-selection.spec.ts b/packages/manager/cypress/e2e/core/linodes/plan-selection.spec.ts
index 8b47a8bb2ed..b6c680627cc 100644
--- a/packages/manager/cypress/e2e/core/linodes/plan-selection.spec.ts
+++ b/packages/manager/cypress/e2e/core/linodes/plan-selection.spec.ts
@@ -86,6 +86,14 @@ const mockGPUType = [
   }),
 ];
 
+const mockPremiumType = [
+  linodeTypeFactory.build({
+    class: 'premium',
+    id: 'premium-8',
+    label: 'Premium 8GB',
+  }),
+];
+
 const mockAcceleratedType = [
   linodeTypeFactory.build({
     class: 'accelerated',
@@ -99,6 +107,7 @@ const mockLinodeTypes = [
   ...mockHighMemoryLinodeTypes,
   ...mockSharedLinodeTypes,
   ...mockGPUType,
+  ...mockPremiumType,
   ...mockAcceleratedType,
 ];
 
@@ -225,7 +234,7 @@ describe('displays linode plans panel based on availability', () => {
       cy.get(notices.unavailable).should('be.visible');
 
       cy.findByRole('table', { name: planSelectionTable }).within(() => {
-        cy.findAllByRole('row').should('have.length', 2);
+        cy.findAllByRole('row').should('have.length', 3);
         cy.get('[id="g7-premium-64"]').should('be.disabled');
         cy.findAllByTestId('disabled-plan-tooltip').should('have.length', 0);
       });
@@ -355,7 +364,7 @@ describe('displays kubernetes plans panel based on availability', () => {
       cy.get(notices.unavailable).should('be.visible');
 
       cy.findByRole('table', { name: planSelectionTable }).within(() => {
-        cy.findAllByRole('row').should('have.length', 2);
+        cy.findAllByRole('row').should('have.length', 3);
         cy.get('[data-qa-plan-row="Premium 512 GB"]').should(
           'have.attr',
           'disabled'
diff --git a/packages/manager/src/dev-tools/FeatureFlagTool.tsx b/packages/manager/src/dev-tools/FeatureFlagTool.tsx
index b6c0bf419fb..d38d32995a2 100644
--- a/packages/manager/src/dev-tools/FeatureFlagTool.tsx
+++ b/packages/manager/src/dev-tools/FeatureFlagTool.tsx
@@ -35,7 +35,7 @@ const options: { flag: keyof Flags; label: string }[] = [
     label: 'Firewall Rulesets & Prefixlists',
   },
   { flag: 'gecko2', label: 'Gecko' },
-  { flag: 'generationalPlans', label: 'Generational compute plans' },
+  { flag: 'generationalPlansv2', label: 'Generational compute plans' },
   { flag: 'limitsEvolution', label: 'Limits Evolution' },
   { flag: 'linodeDiskEncryption', label: 'Linode Disk Encryption (LDE)' },
   { flag: 'linodeInterfaces', label: 'Linode Interfaces' },
diff --git a/packages/manager/src/featureFlags.ts b/packages/manager/src/featureFlags.ts
index ce42d10a2e6..d3aec9ff50f 100644
--- a/packages/manager/src/featureFlags.ts
+++ b/packages/manager/src/featureFlags.ts
@@ -202,7 +202,7 @@ export interface Flags {
   disableLargestGbPlans: boolean;
   firewallRulesetsPrefixlists: boolean;
   gecko2: GeckoFeatureFlag;
-  generationalPlans: boolean;
+  generationalPlansv2: GenerationalPlansFlag;
   gpuv2: GpuV2;
   iam: BetaFeatureFlag;
   iamDelegation: BaseFeatureFlag;
@@ -386,3 +386,7 @@ export type AclpServices = {
     metrics?: AclpFlag;
   };
 };
+
+interface GenerationalPlansFlag extends BaseFeatureFlag {
+  allowedPlans: string[];
+}
diff --git a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx
index 6ded2e38371..4d7b7255034 100644
--- a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx
+++ b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx
@@ -11,6 +11,7 @@ import {
   isMTCPlan,
   planTabInfoContent,
   replaceOrAppendPlaceholder512GbPlans,
+  useShouldDisablePremiumPlansTab,
 } from 'src/features/components/PlansPanel/utils';
 import { useFlags } from 'src/hooks/useFlags';
 
@@ -82,6 +83,10 @@ export const KubernetesPlansPanel = (props: Props) => {
     Boolean(flags.soldOutChips) && Boolean(selectedRegionId)
   );
 
+  const shouldDisablePremiumPlansTab = useShouldDisablePremiumPlansTab({
+    types,
+  });
+
   const isPlanDisabledByAPL = (plan: 'shared' | LinodeTypeClass) =>
     plan === 'shared' && Boolean(isAPLEnabled);
 
@@ -109,7 +114,7 @@ export const KubernetesPlansPanel = (props: Props) => {
     { isLKE: true }
   );
 
-  const tabs = Object.keys(plans).map(
+  const tabs = Object.keys(plans)?.map(
     (plan: Exclude<LinodeTypeClass, 'nanode' | 'standard'>) => {
       const plansMap: PlanSelectionType[] = plans[plan]!;
       const {
@@ -125,6 +130,7 @@ export const KubernetesPlansPanel = (props: Props) => {
       });
 
       return {
+        disabled: false,
         render: () => {
           return (
             <>
@@ -170,6 +176,26 @@ export const KubernetesPlansPanel = (props: Props) => {
     currentPlanHeading
   );
 
+  // If there are no premium plans available, plans table will hide the premium tab.
+  // To override this behavior, we add the tab again and then disable it.
+  // If there are plans but they should be disabled, we disable the existing tab.
+  if (
+    shouldDisablePremiumPlansTab &&
+    !tabs.some((tab) => tab.title === planTabInfoContent.premium?.title)
+  ) {
+    tabs.push({
+      disabled: true,
+      render: () => <div />,
+      title: planTabInfoContent.premium?.title,
+    });
+  } else if (shouldDisablePremiumPlansTab) {
+    tabs.forEach((tab) => {
+      if (tab.title === planTabInfoContent.premium?.title) {
+        tab.disabled = true;
+      }
+    });
+  }
+
   return (
     <TabbedPanel
       copy={copy}
@@ -179,6 +205,11 @@ export const KubernetesPlansPanel = (props: Props) => {
       initTab={initialTab >= 0 ? initialTab : 0}
       notice={notice}
       sx={{ padding: 0 }}
+      tabDisabledMessage={
+        shouldDisablePremiumPlansTab
+          ? 'Premium CPUs are now called Dedicated G7 Plans.'
+          : undefined
+      }
       tabs={tabs}
     />
   );
diff --git a/packages/manager/src/features/Linodes/LinodeCreate/Plan.tsx b/packages/manager/src/features/Linodes/LinodeCreate/Plan.tsx
index 497c04cd73b..f6996a7120a 100644
--- a/packages/manager/src/features/Linodes/LinodeCreate/Plan.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreate/Plan.tsx
@@ -4,6 +4,7 @@ import { useController, useWatch } from 'react-hook-form';
 
 import { DocsLink } from 'src/components/DocsLink/DocsLink';
 import { PlansPanel } from 'src/features/components/PlansPanel/PlansPanel';
+import { useShouldDisablePremiumPlansTab } from 'src/features/components/PlansPanel/utils';
 import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
 import { sendLinodeCreateFlowDocsClickEvent } from 'src/utilities/analytics/customEventAnalytics';
 import { sendLinodeCreateFormInputEvent } from 'src/utilities/analytics/formEventAnalytics';
@@ -28,10 +29,15 @@ export const Plan = () => {
 
   const { data: permissions } = usePermissions('account', ['create_linode']);
 
+  const shouldDisablePremiumPlansTab = useShouldDisablePremiumPlansTab({
+    types,
+  });
+
   return (
     <PlansPanel
       data-qa-select-plan
       disabled={!permissions.create_linode}
+      disabledTabs={shouldDisablePremiumPlansTab ? ['premium'] : undefined}
       docsLink={
         <DocsLink
           href="https://techdocs.akamai.com/cloud-computing/docs/how-to-choose-a-compute-instance-plan"
@@ -55,6 +61,11 @@ export const Plan = () => {
       selectedId={field.value}
       selectedRegionID={regionId}
       showLimits
+      tabDisabledMessage={
+        shouldDisablePremiumPlansTab
+          ? 'Premium CPUs are now called Dedicated G7 Plans.'
+          : undefined
+      }
       types={types?.map(extendType) ?? []} // @todo don't extend type
     />
   );
diff --git a/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx b/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx
index 4a38be20d5d..7b1491c52ff 100644
--- a/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx
+++ b/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx
@@ -26,6 +26,7 @@ import {
   planTabInfoContent,
   replaceOrAppendPlaceholder512GbPlans,
   useIsAcceleratedPlansEnabled,
+  useShouldDisablePremiumPlansTab,
 } from './utils';
 
 import type { PlanSelectionType } from './types';
@@ -111,6 +112,10 @@ export const PlansPanel = (props: PlansPanelProps) => {
     Boolean(flags.soldOutChips) && Boolean(selectedRegionID)
   );
 
+  const shouldDisablePremiumPlansTab = useShouldDisablePremiumPlansTab({
+    types,
+  });
+
   const _types = types.filter((type) => {
     if (!isAcceleratedLinodePlansEnabled && type.class === 'accelerated') {
       return false;
@@ -162,7 +167,7 @@ export const PlansPanel = (props: PlansPanelProps) => {
 
   const isDatabaseResize = flow === 'database' && isResize;
 
-  const tabs = Object.keys(plans).map(
+  const tabs = Object.keys(plans)?.map(
     (plan: Exclude<LinodeTypeClass, 'nanode' | 'standard'>) => {
       const plansMap: PlanSelectionType[] = plans[plan]!;
       const {
@@ -255,6 +260,19 @@ export const PlansPanel = (props: PlansPanelProps) => {
     );
   }
 
+  // If there are no premium plans available, plans table will hide the premium tab.
+  // To override this behavior, we add the tab again and then disable it.
+  if (
+    shouldDisablePremiumPlansTab &&
+    !tabs.some((tab) => tab.title === planTabInfoContent.premium?.title)
+  ) {
+    tabs.push({
+      disabled: true,
+      render: () => <div />,
+      title: planTabInfoContent.premium?.title,
+    });
+  }
+
   return (
     <TabbedPanel
       copy={copy}
diff --git a/packages/manager/src/features/components/PlansPanel/utils.ts b/packages/manager/src/features/components/PlansPanel/utils.ts
index 8763d6ff3e9..90f4ffbeb3b 100644
--- a/packages/manager/src/features/components/PlansPanel/utils.ts
+++ b/packages/manager/src/features/components/PlansPanel/utils.ts
@@ -2,6 +2,7 @@ import { useAccount } from '@linode/queries';
 import { arrayToList, isFeatureEnabledV2 } from '@linode/utilities';
 
 import { useFlags } from 'src/hooks/useFlags';
+import { useIsGenerationalPlansEnabled } from 'src/utilities/linodes';
 
 import {
   DEDICATED_512_GB_PLAN,
@@ -23,6 +24,7 @@ import type {
 import type {
   BaseType,
   Capabilities,
+  LinodeType,
   LinodeTypeClass,
   Region,
   RegionAvailability,
@@ -495,3 +497,19 @@ export const getDisabledPlanReasonCopy = ({
 
   return PLAN_IS_CURRENTLY_UNAVAILABLE_COPY;
 };
+
+export const useShouldDisablePremiumPlansTab = ({
+  types,
+}: {
+  types: LinodeType[] | PlanSelectionType[] | undefined;
+}): boolean => {
+  const { isGenerationalPlansEnabled, allowedPlans } =
+    useIsGenerationalPlansEnabled();
+  // Check if any public premium plans are available.
+  // We can omit "Premium HT" and "Premium nested" plans as customers don't deploy them using cloud manager.
+  const arePublicPremiumPlansAvailable = types?.some(
+    (plan) => plan.class === 'premium' && allowedPlans.includes(plan.id)
+  );
+
+  return Boolean(isGenerationalPlansEnabled) && !arePublicPremiumPlansAvailable;
+};
diff --git a/packages/manager/src/mocks/presets/crud/handlers/linodes/linodes.ts b/packages/manager/src/mocks/presets/crud/handlers/linodes/linodes.ts
index 9188a5478fb..310ba9c0dc5 100644
--- a/packages/manager/src/mocks/presets/crud/handlers/linodes/linodes.ts
+++ b/packages/manager/src/mocks/presets/crud/handlers/linodes/linodes.ts
@@ -17,7 +17,8 @@ import {
   linodeStatsFactory,
   linodeTransferFactory,
   linodeTypeFactory,
-  premiumTypeFactory,
+  premiumHTTypeFactory,
+  premiumNestedTypeFactory,
 } from '@linode/utilities';
 import { DateTime } from 'luxon';
 import { http } from 'msw';
@@ -105,7 +106,10 @@ export const getLinodePlans = () => [
       const gpuTypesAda = gpuTypeAdaFactory.buildList(20);
       const gpuTypesRtx = gpuTypeRtxFactory.buildList(20);
       const gpuTypesRtxPro = gpuTypeRtxProFactory.buildList(20);
-      const premiumTypes = premiumTypeFactory.buildList(6);
+      const premiumTypes = [
+        premiumNestedTypeFactory.build(),
+        premiumHTTypeFactory.build(),
+      ];
       const acceleratedType = acceleratedTypeFactory.buildList(7);
       const mockPlans = [
         nanodeType,
diff --git a/packages/manager/src/utilities/linodes.test.ts b/packages/manager/src/utilities/linodes.test.ts
index 2bc56c34d14..3716e3929ea 100644
--- a/packages/manager/src/utilities/linodes.test.ts
+++ b/packages/manager/src/utilities/linodes.test.ts
@@ -82,7 +82,9 @@ describe('useIsLinodeCloneFirewallEnabled', () => {
 
 describe('useIsGenerationalPlansEnabled', () => {
   it('returns isGenerationalPlansEnabled: true if the feature is enabled', () => {
-    const options = { flags: { generationalPlans: true } };
+    const options = {
+      flags: { generationalPlansv2: { enabled: true, allowedPlans: [] } },
+    };
 
     const { result } = renderHook(() => useIsGenerationalPlansEnabled(), {
       wrapper: (ui) => wrapWithTheme(ui, options),
@@ -92,7 +94,9 @@ describe('useIsGenerationalPlansEnabled', () => {
   });
 
   it('returns isGenerationalPlansEnabled: false if the feature is NOT enabled', () => {
-    const options = { flags: { generationalPlans: false } };
+    const options = {
+      flags: { generationalPlansv2: { enabled: false, allowedPlans: [] } },
+    };
 
     const { result } = renderHook(() => useIsGenerationalPlansEnabled(), {
       wrapper: (ui) => wrapWithTheme(ui, options),
diff --git a/packages/manager/src/utilities/linodes.ts b/packages/manager/src/utilities/linodes.ts
index 35061e9b6bf..d2357b7dd0f 100644
--- a/packages/manager/src/utilities/linodes.ts
+++ b/packages/manager/src/utilities/linodes.ts
@@ -97,6 +97,7 @@ export const useIsGenerationalPlansEnabled = () => {
   const flags = useFlags();
 
   return {
-    isGenerationalPlansEnabled: Boolean(flags.generationalPlans),
+    isGenerationalPlansEnabled: Boolean(flags.generationalPlansv2?.enabled),
+    allowedPlans: flags.generationalPlansv2?.allowedPlans || [],
   };
 };
diff --git a/packages/utilities/src/factories/linodes.ts b/packages/utilities/src/factories/linodes.ts
index 7e66d2e7c95..09db77265fc 100644
--- a/packages/utilities/src/factories/linodes.ts
+++ b/packages/utilities/src/factories/linodes.ts
@@ -444,6 +444,20 @@ export const gpuTypeRtxProFactory = linodeTypeFactory.extend({
 
 export const premiumTypeFactory = linodeTypeFactory.extend({
   class: 'premium',
+  id: Factory.each((i) => `g7-premium-${i}`),
+  label: Factory.each((i) => `Premium ${i}GB`),
+});
+
+export const premiumNestedTypeFactory = linodeTypeFactory.extend({
+  class: 'premium',
+  id: 'g7-premium-112',
+  label: 'Premium Nested 112GB',
+});
+
+export const premiumHTTypeFactory = linodeTypeFactory.extend({
+  class: 'premium',
+  id: 'g7-premium-ht-256',
+  label: 'Premium HT 256GB',
 });
 
 export const acceleratedTypeFactory = linodeTypeFactory.extend({

From b167091669a9579c123a5ab5490adae563f3136f Mon Sep 17 00:00:00 2001
From: dmcintyr-akamai <dmcintyr@akamai.com>
Date: Fri, 14 Nov 2025 09:12:31 -0500
Subject: [PATCH 04/91] test [UIE-9634-]: Fix flakey vm-host test (#13083)

* fix flakey test

* Added changeset: Fix flakey vm-host test
---
 .../pr-13083-tests-1762969859293.md           |  5 +++
 .../vm-host-maintenance-linode.spec.ts        | 36 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 packages/manager/.changeset/pr-13083-tests-1762969859293.md

diff --git a/packages/manager/.changeset/pr-13083-tests-1762969859293.md b/packages/manager/.changeset/pr-13083-tests-1762969859293.md
new file mode 100644
index 00000000000..9b91e05e390
--- /dev/null
+++ b/packages/manager/.changeset/pr-13083-tests-1762969859293.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Tests
+---
+
+Fix flakey vm-host test ([#13083](https://github.com/linode/manager/pull/13083))
diff --git a/packages/manager/cypress/e2e/core/linodes/vm-host-maintenance-linode.spec.ts b/packages/manager/cypress/e2e/core/linodes/vm-host-maintenance-linode.spec.ts
index 47a0266d53f..6c6cab74d15 100644
--- a/packages/manager/cypress/e2e/core/linodes/vm-host-maintenance-linode.spec.ts
+++ b/packages/manager/cypress/e2e/core/linodes/vm-host-maintenance-linode.spec.ts
@@ -4,6 +4,7 @@ import { mockGetNotifications } from 'support/intercepts/events';
 import { mockAppendFeatureFlags } from 'support/intercepts/feature-flags';
 import { mockGetLinode, mockGetLinodes } from 'support/intercepts/linodes';
 import { mockGetProfile } from 'support/intercepts/profile';
+import { ui } from 'support/ui';
 import { randomLabel } from 'support/util/random';
 import { chooseRegion } from 'support/util/regions';
 
@@ -34,6 +35,8 @@ const mockMaintenanceScheduled = accountMaintenanceFactory.build({
   type: 'reboot',
   description: 'scheduled',
   maintenance_policy_set: 'linode/power_off_on',
+  reason:
+    "Your Linode's host has reached the end of its life cycle and will be retired.",
   status: 'scheduled',
   start_time: '2022-01-17T23:45:46.960',
 });
@@ -48,6 +51,7 @@ const mockMaintenanceEmergency = accountMaintenanceFactory.build({
   type: 'cold_migration',
   description: 'emergency',
   maintenance_policy_set: 'linode/power_off_on',
+  reason: "We must upgrade the OS of your Linode's host.",
   status: 'scheduled',
 });
 
@@ -107,6 +111,38 @@ describe('Host & VM maintenance notification banner', () => {
       });
   });
 
+  it('maintenance notification banner does not display platform maintenance messages', function () {
+    const mockPlatformMaintenance = accountMaintenanceFactory.build({
+      entity: {
+        id: mockLinodes[1].id,
+        label: mockLinodes[1].label,
+        type: 'linode',
+        url: `/v4/linode/instances/${mockLinodes[1].id}`,
+      },
+      type: 'reboot',
+      description: 'emergency',
+      maintenance_policy_set: 'linode/power_off_on',
+      // 'critical security update' in reason prevents message from displaying
+      reason: "We must apply a critical security update to your Linode's host.",
+      status: 'scheduled',
+    });
+    mockGetMaintenance([mockPlatformMaintenance], []).as('getMaintenances');
+    cy.visitWithLogin('/linodes');
+    cy.wait([
+      '@getLinodes',
+      '@getFeatureFlags',
+      '@getNotifications',
+      '@getMaintenances',
+    ]);
+    cy.get('#main-content').within(() => {
+      ui.button
+        .findByTitle('Create Linode')
+        .should('be.visible')
+        .should('be.enabled');
+      cy.get('[data-testid="maintenance-banner').should('not.exist');
+    });
+  });
+
   it('banner present on details page when linode has pending maintenance', function () {
     const mockLinode = mockLinodes[0];
     mockGetLinode(mockLinode.id, mockLinode).as('getLinode');

From b52ecdf20bc27e7c3c97d966c3220deaf0e163e2 Mon Sep 17 00:00:00 2001
From: Hana Xu <115299789+hana-akamai@users.noreply.github.com>
Date: Fri, 14 Nov 2025 18:08:43 -0500
Subject: [PATCH 05/91] fix: DBaaS Maintenance Window Save Changes not disabled
 (#13096)

Fix `update-database.spec.ts` test failing due to the Save Changes button staying enabled after submitting changes (missed during the refactor to react-hook-form in https://github.com/linode/manager/pull/13060). Also included a minor styling fix.
---
 .../DatabaseDetail/DatabaseSettings/MaintenanceWindow.tsx  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/MaintenanceWindow.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/MaintenanceWindow.tsx
index ba944b7927e..880d90e4152 100644
--- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/MaintenanceWindow.tsx
+++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/MaintenanceWindow.tsx
@@ -80,6 +80,8 @@ export const MaintenanceWindow = (props: Props) => {
       enqueueSnackbar('Maintenance Window settings saved successfully.', {
         variant: 'success',
       });
+      // reset dirty state to disable Save Changes button
+      reset(getValues(), { keepValues: true, keepDirty: false });
     } catch (errors) {
       setError('root', { message: errors[0].reason });
     }
@@ -110,7 +112,9 @@ export const MaintenanceWindow = (props: Props) => {
   const {
     control,
     formState: { isSubmitting, isDirty, errors },
+    getValues,
     handleSubmit,
+    reset,
     setValue,
     setError,
   } = form;
@@ -131,7 +135,7 @@ export const MaintenanceWindow = (props: Props) => {
   return (
     <FormProvider {...form}>
       <form onSubmit={handleSubmit(onSubmit)}>
-        <StyledStack direction="row">
+        <StyledStack>
           <Stack>
             <Typography mb={0.5} variant="h3">
               {isLegacy
@@ -417,6 +421,7 @@ const StyledTypography = styled(Typography, {
 const StyledStack = styled(Stack, {
   label: 'StyledStack',
 })(({ theme }) => ({
+  justifyContent: 'space-between',
   flexDirection: 'row',
   [theme.breakpoints.down('md')]: {
     flexDirection: 'column',

From 51a3b2f43e1d7e4cb0da609812924efc318cb75f Mon Sep 17 00:00:00 2001
From: Ankita <ankitaan@akamai.com>
Date: Mon, 17 Nov 2025 09:53:49 +0530
Subject: [PATCH 06/91] upcoming: [DI-28175] - Add linode_id to label
 conversion for blockstorage for display in widget legend rows (#13092)

* upcoming: [DI-28175] - Add linode_id to label conversion for blockstorage

* upcoming: [DI-28175] - fallback fix

* upcoming: [DI-28175] - Add mocks

* upcoming: [DI-28175] - Add changeset
---
 ...r-13092-upcoming-features-1763093527692.md |  5 +++
 .../Utils/CloudPulseWidgetUtils.test.ts       | 35 +++++++++++++++++++
 .../CloudPulse/Utils/CloudPulseWidgetUtils.ts | 14 ++++++--
 .../shared/CloudPulseResourcesSelect.tsx      |  1 +
 packages/manager/src/mocks/serverHandlers.ts  | 33 ++++++++++++-----
 .../src/queries/cloudpulse/resources.ts       |  1 +
 6 files changed, 77 insertions(+), 12 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13092-upcoming-features-1763093527692.md

diff --git a/packages/manager/.changeset/pr-13092-upcoming-features-1763093527692.md b/packages/manager/.changeset/pr-13092-upcoming-features-1763093527692.md
new file mode 100644
index 00000000000..3d6050b3391
--- /dev/null
+++ b/packages/manager/.changeset/pr-13092-upcoming-features-1763093527692.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+CloudPulse-Metrics: Enhance `CloudPulseWidgetUtils.ts` to handle id to label conversion of linode associated with volume in volumes service ([#13092](https://github.com/linode/manager/pull/13092))
diff --git a/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.test.ts b/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.test.ts
index a4af7fa538f..7caed886877 100644
--- a/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.test.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.test.ts
@@ -255,6 +255,41 @@ describe('getDimensionName method', () => {
     const result = getDimensionName(props);
     expect(result).toBe('linode-1 | test | primary-1');
   });
+
+  it('returns the linode label when key is linode_id and service type is firewall', () => {
+    const props: DimensionNameProperties = {
+      ...baseProps,
+      metric: { linode_id: '123' },
+      serviceType: 'firewall',
+      resources: [
+        {
+          id: '123',
+          label: 'Firewall-1',
+          entities: { '123': 'linode-1' },
+        },
+      ],
+    };
+    const result = getDimensionName(props);
+    expect(result).toBe('linode-1');
+  });
+
+  it('returns the volume linode label when key is linode_id and service type is blockstorage', () => {
+    const props: DimensionNameProperties = {
+      ...baseProps,
+      metric: { linode_id: '123' },
+      serviceType: 'blockstorage',
+      resources: [
+        {
+          id: '123',
+          label: 'Volume-1',
+          volumeLinodeId: '123',
+          volumeLinodeLabel: 'linode-1',
+        },
+      ],
+    };
+    const result = getDimensionName(props);
+    expect(result).toBe('linode-1');
+  });
 });
 
 it('test mapResourceIdToName method', () => {
diff --git a/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.ts b/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.ts
index 337d225dd5b..786cc2906ea 100644
--- a/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.ts
@@ -456,9 +456,17 @@ export const getDimensionName = (props: DimensionNameProperties): string => {
     }
 
     if (key === 'linode_id') {
-      const linodeLabel =
-        resources.find((resource) => resource.entities?.[value] !== undefined)
-          ?.entities?.[value] ?? value;
+      let linodeLabel = value;
+      if (serviceType === 'firewall') {
+        linodeLabel =
+          resources.find((resource) => resource.entities?.[value] !== undefined)
+            ?.entities?.[value] ?? linodeLabel;
+      }
+      if (serviceType === 'blockstorage') {
+        linodeLabel =
+          resources.find((resource) => resource.volumeLinodeId === value)
+            ?.volumeLinodeLabel ?? linodeLabel;
+      }
       const index = groupBy.indexOf('linode_id');
       if (index !== -1) {
         labels[index] = linodeLabel;
diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx
index a6b234c03cc..13c07000735 100644
--- a/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx
+++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx
@@ -24,6 +24,7 @@ export interface CloudPulseResources {
   region?: string;
   tags?: string[];
   volumeLinodeId?: string;
+  volumeLinodeLabel?: null | string;
 }
 
 export interface CloudPulseResourcesSelectProps {
diff --git a/packages/manager/src/mocks/serverHandlers.ts b/packages/manager/src/mocks/serverHandlers.ts
index 28833ad984d..be460a52f25 100644
--- a/packages/manager/src/mocks/serverHandlers.ts
+++ b/packages/manager/src/mocks/serverHandlers.ts
@@ -1676,22 +1676,37 @@ export const handlers = [
       'resizing',
     ];
     const volumes = statuses.map((status) =>
-      volumeFactory.build({ status, region: 'ap-west', linode_id: 1 })
+      volumeFactory.build({
+        status,
+        id: 1,
+        region: 'ap-west',
+        linode_id: 1,
+        linode_label: 'linode-1',
+      })
     );
     volumes.push(
-      ...volumeFactory.buildList(2, { region: 'us-east', linode_id: 2 })
+      ...volumeFactory.buildList(1, { region: 'us-east', linode_id: 2 })
     );
     volumes.push(
-      ...volumeFactory.buildList(2, { region: 'us-east', linode_id: 3 })
+      ...volumeFactory.buildList(1, { region: 'us-east', linode_id: 3 })
     );
     volumes.push(
-      ...volumeFactory.buildList(2, { region: 'us-east', linode_id: 4 })
+      ...volumeFactory.buildList(1, { region: 'us-east', linode_id: 4 })
     );
     volumes.push(
-      ...volumeFactory.buildList(2, { region: 'us-east', linode_id: 5 })
+      ...volumeFactory.buildList(1, { region: 'us-east', linode_id: 5 })
     );
     volumes.push(
-      ...volumeFactory.buildList(5, { region: 'eu-central', linode_id: 1 })
+      ...volumeFactory.buildList(1, { region: 'eu-central', linode_id: 6 })
+    );
+    volumes.push(
+      ...volumeFactory.buildList(1, {
+        id: 7,
+        label: 'volume-7',
+        region: 'ap-west',
+        linode_id: 7,
+        linode_label: 'linode-7',
+      })
     );
     return HttpResponse.json(makeResourcePage(volumes));
   }),
@@ -3873,7 +3888,7 @@ export const handlers = [
         result: [
           {
             metric: {
-              entity_id: '123',
+              entity_id: '1',
               metric_name: 'average_cpu_usage',
               linode_id: '1',
               node_id: 'primary-1',
@@ -3917,9 +3932,9 @@ export const handlers = [
           // })),
           {
             metric: {
-              entity_id: '456',
+              entity_id: '7',
               metric_name: 'average_cpu_usage',
-              linode_id: '123',
+              linode_id: '7',
               node_id: 'primary-2',
             },
             values: [
diff --git a/packages/manager/src/queries/cloudpulse/resources.ts b/packages/manager/src/queries/cloudpulse/resources.ts
index 405b5ea8820..0f629381345 100644
--- a/packages/manager/src/queries/cloudpulse/resources.ts
+++ b/packages/manager/src/queries/cloudpulse/resources.ts
@@ -63,6 +63,7 @@ export const useResourcesQuery = (
           entities,
           clusterSize: resource.cluster_size,
           volumeLinodeId: String(resource.linode_id),
+          volumeLinodeLabel: resource.linode_label,
         };
       });
     },

From 98018bfb3454334a2e6e5e095abdfa673cc3da53 Mon Sep 17 00:00:00 2001
From: Tanushree Bhattacharji <tbhattac@akamai.com>
Date: Mon, 17 Nov 2025 12:35:17 +0530
Subject: [PATCH 07/91] =?UTF-8?q?upcoming:=20[UIE-9558]=20-=20Add=20new=20?=
 =?UTF-8?q?API=20endpoints,=20types=20and=20queries=20for=20N=E2=80=A6=20(?=
 =?UTF-8?q?#13078)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* upcoming: [UIE-9558] - Add new API endpoints, types and queries for Network Load Balancer

* Adding changesets

* Fix type specification for NLB.

* Use named parameter interfaces for api-v4 client functions with 3+ arguments.
---
 ...r-13078-upcoming-features-1762869732236.md |   5 +
 packages/api-v4/src/index.ts                  |   2 +
 packages/api-v4/src/netloadbalancers/index.ts |   4 +
 .../api-v4/src/netloadbalancers/listeners.ts  |  45 ++++++++
 .../src/netloadbalancers/netloadbalancers.ts  |  33 ++++++
 packages/api-v4/src/netloadbalancers/nodes.ts |  62 +++++++++++
 packages/api-v4/src/netloadbalancers/types.ts |  97 +++++++++++++++++
 ...r-13078-upcoming-features-1762869790174.md |   5 +
 packages/queries/src/index.ts                 |   1 +
 .../queries/src/netloadbalancers/index.ts     |   5 +
 packages/queries/src/netloadbalancers/keys.ts | 101 ++++++++++++++++++
 .../queries/src/netloadbalancers/listeners.ts |  48 +++++++++
 .../src/netloadbalancers/netloadbalancers.ts  |  82 ++++++++++++++
 .../queries/src/netloadbalancers/nodes.ts     |  52 +++++++++
 .../queries/src/netloadbalancers/requests.ts  |  53 +++++++++
 15 files changed, 595 insertions(+)
 create mode 100644 packages/api-v4/.changeset/pr-13078-upcoming-features-1762869732236.md
 create mode 100644 packages/api-v4/src/netloadbalancers/index.ts
 create mode 100644 packages/api-v4/src/netloadbalancers/listeners.ts
 create mode 100644 packages/api-v4/src/netloadbalancers/netloadbalancers.ts
 create mode 100644 packages/api-v4/src/netloadbalancers/nodes.ts
 create mode 100644 packages/api-v4/src/netloadbalancers/types.ts
 create mode 100644 packages/queries/.changeset/pr-13078-upcoming-features-1762869790174.md
 create mode 100644 packages/queries/src/netloadbalancers/index.ts
 create mode 100644 packages/queries/src/netloadbalancers/keys.ts
 create mode 100644 packages/queries/src/netloadbalancers/listeners.ts
 create mode 100644 packages/queries/src/netloadbalancers/netloadbalancers.ts
 create mode 100644 packages/queries/src/netloadbalancers/nodes.ts
 create mode 100644 packages/queries/src/netloadbalancers/requests.ts

diff --git a/packages/api-v4/.changeset/pr-13078-upcoming-features-1762869732236.md b/packages/api-v4/.changeset/pr-13078-upcoming-features-1762869732236.md
new file mode 100644
index 00000000000..f671a53b5a9
--- /dev/null
+++ b/packages/api-v4/.changeset/pr-13078-upcoming-features-1762869732236.md
@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Upcoming Features
+---
+
+Add new API endpoints and types for Network Load Balancers ([#13078](https://github.com/linode/manager/pull/13078))
diff --git a/packages/api-v4/src/index.ts b/packages/api-v4/src/index.ts
index 00e09bce480..3b90f57ec71 100644
--- a/packages/api-v4/src/index.ts
+++ b/packages/api-v4/src/index.ts
@@ -28,6 +28,8 @@ export * from './longview';
 
 export * from './managed';
 
+export * from './netloadbalancers';
+
 export * from './network-transfer';
 
 export * from './networking';
diff --git a/packages/api-v4/src/netloadbalancers/index.ts b/packages/api-v4/src/netloadbalancers/index.ts
new file mode 100644
index 00000000000..7ef573ac031
--- /dev/null
+++ b/packages/api-v4/src/netloadbalancers/index.ts
@@ -0,0 +1,4 @@
+export * from './listeners';
+export * from './netloadbalancers';
+export * from './nodes';
+export * from './types';
diff --git a/packages/api-v4/src/netloadbalancers/listeners.ts b/packages/api-v4/src/netloadbalancers/listeners.ts
new file mode 100644
index 00000000000..4f9db29fae8
--- /dev/null
+++ b/packages/api-v4/src/netloadbalancers/listeners.ts
@@ -0,0 +1,45 @@
+import { BETA_API_ROOT } from '../constants';
+import Request, { setMethod, setParams, setURL, setXFilter } from '../request';
+
+import type { Filter, ResourcePage as Page, Params } from '../types';
+import type { NetworkLoadBalancerListener } from './types';
+
+/**
+ * getNetworkLoadBalancerListeners
+ *
+ * Returns a paginated list of listeners for a Network Load Balancer.
+ *
+ * @param networkLoadBalancerId { number } The ID of the Network Load Balancer.
+ */
+export const getNetworkLoadBalancerListeners = (
+  networkLoadBalancerId: number,
+  params?: Params,
+  filters?: Filter,
+) =>
+  Request<Page<NetworkLoadBalancerListener>>(
+    setURL(
+      `${BETA_API_ROOT}/netloadbalancers/${encodeURIComponent(networkLoadBalancerId)}/listeners`,
+    ),
+    setMethod('GET'),
+    setParams(params),
+    setXFilter(filters),
+  );
+
+/**
+ * getNetworkLoadBalancerListener
+ *
+ * Returns detailed information about a single listener.
+ *
+ * @param networkLoadBalancerId { number } The ID of the Network Load Balancer.
+ * @param listenerId { number } The ID of the listener to retrieve.
+ */
+export const getNetworkLoadBalancerListener = (
+  networkLoadBalancerId: number,
+  listenerId: number,
+) =>
+  Request<NetworkLoadBalancerListener>(
+    setURL(
+      `${BETA_API_ROOT}/netloadbalancers/${encodeURIComponent(networkLoadBalancerId)}/listeners/${encodeURIComponent(listenerId)}`,
+    ),
+    setMethod('GET'),
+  );
diff --git a/packages/api-v4/src/netloadbalancers/netloadbalancers.ts b/packages/api-v4/src/netloadbalancers/netloadbalancers.ts
new file mode 100644
index 00000000000..faca6f073b5
--- /dev/null
+++ b/packages/api-v4/src/netloadbalancers/netloadbalancers.ts
@@ -0,0 +1,33 @@
+import { BETA_API_ROOT } from '../constants';
+import Request, { setMethod, setParams, setURL, setXFilter } from '../request';
+
+import type { Filter, ResourcePage as Page, Params } from '../types';
+import type { NetworkLoadBalancer } from './types';
+
+/**
+ * getNetworkLoadBalancers
+ *
+ * Returns a paginated list of Network Load Balancers on your account.
+ */
+export const getNetworkLoadBalancers = (params?: Params, filters?: Filter) =>
+  Request<Page<NetworkLoadBalancer>>(
+    setURL(`${BETA_API_ROOT}/netloadbalancers`),
+    setMethod('GET'),
+    setParams(params),
+    setXFilter(filters),
+  );
+
+/**
+ * getNetworkLoadBalancer
+ *
+ * Returns detailed information about a single Network Load Balancer.
+ *
+ * @param networkLoadBalancerId { number } The ID of the Network Load Balancer to retrieve.
+ */
+export const getNetworkLoadBalancer = (networkLoadBalancerId: number) =>
+  Request<NetworkLoadBalancer>(
+    setURL(
+      `${BETA_API_ROOT}/netloadbalancers/${encodeURIComponent(networkLoadBalancerId)}`,
+    ),
+    setMethod('GET'),
+  );
diff --git a/packages/api-v4/src/netloadbalancers/nodes.ts b/packages/api-v4/src/netloadbalancers/nodes.ts
new file mode 100644
index 00000000000..e7ad1045469
--- /dev/null
+++ b/packages/api-v4/src/netloadbalancers/nodes.ts
@@ -0,0 +1,62 @@
+import { BETA_API_ROOT } from '../constants';
+import Request, { setMethod, setParams, setURL, setXFilter } from '../request';
+
+import type { Filter, ResourcePage as Page, Params } from '../types';
+import type { NetworkLoadBalancerNode } from './types';
+
+/**
+ * getNetworkLoadBalancerNodes
+ *
+ * Returns a paginated list of nodes for a listener.
+ *
+ * @param networkLoadBalancerId { number } The ID of the Network Load Balancer.
+ * @param listenerId { number } The ID of the listener.
+ */
+interface GetNetworkLoadBalancerNodesOptions {
+  filters?: Filter;
+  listenerId: number;
+  networkLoadBalancerId: number;
+  params?: Params;
+}
+
+export const getNetworkLoadBalancerNodes = ({
+  networkLoadBalancerId,
+  listenerId,
+  params,
+  filters,
+}: GetNetworkLoadBalancerNodesOptions) =>
+  Request<Page<NetworkLoadBalancerNode>>(
+    setURL(
+      `${BETA_API_ROOT}/netloadbalancers/${encodeURIComponent(networkLoadBalancerId)}/listeners/${encodeURIComponent(listenerId)}/nodes`,
+    ),
+    setMethod('GET'),
+    setParams(params),
+    setXFilter(filters),
+  );
+
+/**
+ * getNetworkLoadBalancerNode
+ *
+ * Returns detailed information about a single node.
+ *
+ * @param networkLoadBalancerId { number } The ID of the Network Load Balancer.
+ * @param listenerId { number } The ID of the listener.
+ * @param nodeId { number } The ID of the node to retrieve.
+ */
+interface GetNetworkLoadBalancerNodeOptions {
+  listenerId: number;
+  networkLoadBalancerId: number;
+  nodeId: number;
+}
+
+export const getNetworkLoadBalancerNode = ({
+  listenerId,
+  networkLoadBalancerId,
+  nodeId,
+}: GetNetworkLoadBalancerNodeOptions) =>
+  Request<NetworkLoadBalancerNode>(
+    setURL(
+      `${BETA_API_ROOT}/netloadbalancers/${encodeURIComponent(networkLoadBalancerId)}/listeners/${encodeURIComponent(listenerId)}/nodes/${encodeURIComponent(nodeId)}`,
+    ),
+    setMethod('GET'),
+  );
diff --git a/packages/api-v4/src/netloadbalancers/types.ts b/packages/api-v4/src/netloadbalancers/types.ts
new file mode 100644
index 00000000000..6feb36d197b
--- /dev/null
+++ b/packages/api-v4/src/netloadbalancers/types.ts
@@ -0,0 +1,97 @@
+import type { LKEClusterInfo } from '../nodebalancers/types';
+
+export interface LinodeInfo {
+  id: number;
+  label: string;
+  type: 'linode';
+  url: string;
+}
+
+export type NetworkLoadBalancerStatus = 'active' | 'canceled' | 'suspended';
+
+export type NetworkLoadBalancerListenerProtocol = 'tcp' | 'udp';
+
+export interface NetworkLoadBalancerListener {
+  created: string;
+  /**
+   * The unique ID of this listener
+   */
+  id: number;
+  /**
+   * The label for this listener
+   */
+  label: string;
+  /**
+   * The port the listener is configured to listen on
+   */
+  port: number;
+  /**
+   * The protocol used by this listener
+   */
+  protocol: NetworkLoadBalancerListenerProtocol;
+  updated: string;
+}
+
+export interface NetworkLoadBalancerNode {
+  /**
+   * The IPv6 address of the node
+   */
+  address_v6: string;
+  created: string;
+  /**
+   * The unique ID of this node
+   */
+  id: number;
+  /**
+   * The label for this node
+   */
+  label: string;
+  /**
+   * Information about the Linode this node is associated with (if available)
+   */
+  linode_id: number;
+  updated: string;
+  weight: number;
+  weight_updated: string;
+}
+
+export interface NetworkLoadBalancer {
+  /**
+   * Virtual IP addresses assigned to this Network Load Balancer
+   */
+  address_v4: string;
+  address_v6: string;
+  /**
+   * When this Network Load Balancer was created
+   */
+  created: string;
+  /**
+   * The unique ID of this Network Load Balancer
+   */
+  id: number;
+  /**
+   * The label for this Network Load Balancer
+   */
+  label: string;
+  last_composite_updated: string;
+  /**
+   * Listeners configured on this Network Load Balancer
+   */
+  listeners: NetworkLoadBalancerListener[];
+  /**
+   * Information about the LKE cluster this NLB is associated with
+   */
+  lke_cluster?: LKEClusterInfo;
+  /**
+   * The region where this Network Load Balancer is deployed
+   */
+  region: string;
+  /**
+   * The current status of this Network Load Balancer
+   */
+  status: NetworkLoadBalancerStatus;
+  /**
+   * When this Network Load Balancer was last updated
+   */
+  updated: string;
+}
diff --git a/packages/queries/.changeset/pr-13078-upcoming-features-1762869790174.md b/packages/queries/.changeset/pr-13078-upcoming-features-1762869790174.md
new file mode 100644
index 00000000000..6ad1e3662f2
--- /dev/null
+++ b/packages/queries/.changeset/pr-13078-upcoming-features-1762869790174.md
@@ -0,0 +1,5 @@
+---
+"@linode/queries": Upcoming Features
+---
+
+Add new queries for Network Load Balancers ([#13078](https://github.com/linode/manager/pull/13078))
diff --git a/packages/queries/src/index.ts b/packages/queries/src/index.ts
index d55c9a3eeff..6c61dab7f07 100644
--- a/packages/queries/src/index.ts
+++ b/packages/queries/src/index.ts
@@ -10,6 +10,7 @@ export * from './firewalls';
 export * from './iam';
 export * from './images';
 export * from './linodes';
+export * from './netloadbalancers';
 export * from './networking';
 export * from './networktransfer';
 export * from './nodebalancers';
diff --git a/packages/queries/src/netloadbalancers/index.ts b/packages/queries/src/netloadbalancers/index.ts
new file mode 100644
index 00000000000..88f45ea208a
--- /dev/null
+++ b/packages/queries/src/netloadbalancers/index.ts
@@ -0,0 +1,5 @@
+export * from './keys';
+export * from './listeners';
+export * from './netloadbalancers';
+export * from './nodes';
+export * from './requests';
diff --git a/packages/queries/src/netloadbalancers/keys.ts b/packages/queries/src/netloadbalancers/keys.ts
new file mode 100644
index 00000000000..dc3e2455825
--- /dev/null
+++ b/packages/queries/src/netloadbalancers/keys.ts
@@ -0,0 +1,101 @@
+import {
+  getNetworkLoadBalancer,
+  getNetworkLoadBalancerListener,
+  getNetworkLoadBalancerListeners,
+  getNetworkLoadBalancerNode,
+  getNetworkLoadBalancerNodes,
+  getNetworkLoadBalancers,
+} from '@linode/api-v4';
+import { createQueryKeys } from '@lukemorales/query-key-factory';
+
+import {
+  getAllNetworkLoadBalancerListeners,
+  getAllNetworkLoadBalancerNodes,
+  getAllNetworkLoadBalancers,
+} from './requests';
+
+import type { Filter, Params } from '@linode/api-v4';
+
+export const networkLoadBalancerQueries = createQueryKeys('netloadbalancers', {
+  netloadbalancer: (id: number) => ({
+    contextQueries: {
+      listener: (listenerId: number) => ({
+        contextQueries: {
+          node: (nodeId: number) => ({
+            queryFn: () =>
+              getNetworkLoadBalancerNode({
+                networkLoadBalancerId: id,
+                listenerId,
+                nodeId,
+              }),
+            queryKey: [nodeId],
+          }),
+          nodes: {
+            contextQueries: {
+              all: (params: Params = {}, filter: Filter = {}) => ({
+                queryFn: () =>
+                  getAllNetworkLoadBalancerNodes(
+                    id,
+                    listenerId,
+                    params,
+                    filter,
+                  ),
+                queryKey: [params, filter],
+              }),
+              paginated: (params: Params = {}, filter: Filter = {}) => ({
+                queryFn: () =>
+                  getNetworkLoadBalancerNodes({
+                    networkLoadBalancerId: id,
+                    listenerId,
+                    params,
+                    filters: filter,
+                  }),
+                queryKey: [params, filter],
+              }),
+            },
+            queryKey: null,
+          },
+        },
+        queryFn: () => getNetworkLoadBalancerListener(id, listenerId),
+        queryKey: [listenerId],
+      }),
+      listeners: {
+        contextQueries: {
+          all: (params: Params = {}, filter: Filter = {}) => ({
+            queryFn: () =>
+              getAllNetworkLoadBalancerListeners(id, params, filter),
+            queryKey: [params, filter],
+          }),
+          paginated: (params: Params = {}, filter: Filter = {}) => ({
+            queryFn: () => getNetworkLoadBalancerListeners(id, params, filter),
+            queryKey: [params, filter],
+          }),
+        },
+        queryKey: null,
+      },
+    },
+    queryFn: () => getNetworkLoadBalancer(id),
+    queryKey: [id],
+  }),
+  netloadbalancers: {
+    contextQueries: {
+      all: (params: Params = {}, filter: Filter = {}) => ({
+        queryFn: () => getAllNetworkLoadBalancers(params, filter),
+        queryKey: [params, filter],
+      }),
+      infinite: (filter: Filter = {}) => ({
+        queryFn: ({ pageParam }) =>
+          getNetworkLoadBalancers(
+            { page: pageParam as number, page_size: 25 },
+            filter,
+          ),
+        queryKey: [filter],
+      }),
+      paginated: (params: Params = {}, filter: Filter = {}) => ({
+        queryFn: () => getNetworkLoadBalancers(params, filter),
+        queryKey: [params, filter],
+      }),
+    },
+    queryKey: null,
+  },
+});
diff --git a/packages/queries/src/netloadbalancers/listeners.ts b/packages/queries/src/netloadbalancers/listeners.ts
new file mode 100644
index 00000000000..b20f968f84d
--- /dev/null
+++ b/packages/queries/src/netloadbalancers/listeners.ts
@@ -0,0 +1,48 @@
+import { keepPreviousData, useQuery } from '@tanstack/react-query';
+
+import { networkLoadBalancerQueries } from './keys';
+
+import type {
+  APIError,
+  Filter,
+  NetworkLoadBalancerListener,
+  Params,
+  ResourcePage,
+} from '@linode/api-v4';
+
+/**
+ * useNetworkLoadBalancerListenersQuery
+ *
+ * Returns a paginated list of listeners for a Network Load Balancer
+ */
+export const useNetworkLoadBalancerListenersQuery = (
+  networkLoadBalancerId: number,
+  params: Params = {},
+  filter: Filter = {},
+  enabled: boolean = true,
+) =>
+  useQuery<ResourcePage<NetworkLoadBalancerListener>, APIError[]>({
+    ...networkLoadBalancerQueries
+      .netloadbalancer(networkLoadBalancerId)
+      ._ctx.listeners._ctx.paginated(params, filter),
+    enabled,
+    placeholderData: keepPreviousData,
+  });
+
+/**
+ * useNetworkLoadBalancerListenerQuery
+ *
+ * Returns a single listener by ID for a Network Load Balancer
+ */
+export const useNetworkLoadBalancerListenerQuery = (
+  networkLoadBalancerId: number,
+  listenerId: number,
+  enabled: boolean = true,
+) => {
+  return useQuery<NetworkLoadBalancerListener, APIError[]>({
+    ...networkLoadBalancerQueries
+      .netloadbalancer(networkLoadBalancerId)
+      ._ctx.listener(listenerId),
+    enabled,
+  });
+};
diff --git a/packages/queries/src/netloadbalancers/netloadbalancers.ts b/packages/queries/src/netloadbalancers/netloadbalancers.ts
new file mode 100644
index 00000000000..57ed3a1918e
--- /dev/null
+++ b/packages/queries/src/netloadbalancers/netloadbalancers.ts
@@ -0,0 +1,82 @@
+import {
+  keepPreviousData,
+  useInfiniteQuery,
+  useQuery,
+} from '@tanstack/react-query';
+
+import { networkLoadBalancerQueries } from './keys';
+
+import type {
+  APIError,
+  Filter,
+  NetworkLoadBalancer,
+  Params,
+  ResourcePage,
+} from '@linode/api-v4';
+
+/**
+ * useNetworkLoadBalancersQuery
+ *
+ * Returns a paginated list of Network Load Balancers
+ */
+export const useNetworkLoadBalancersQuery = (params: Params, filter: Filter) =>
+  useQuery<ResourcePage<NetworkLoadBalancer>, APIError[]>({
+    ...networkLoadBalancerQueries.netloadbalancers._ctx.paginated(
+      params,
+      filter,
+    ),
+    placeholderData: keepPreviousData,
+  });
+
+/**
+ * useAllNetworkLoadBalancersQuery
+ *
+ * Returns all Network Load Balancers (not paginated)
+ * Please use sparingly - prefer paginated queries when possible
+ */
+export const useAllNetworkLoadBalancersQuery = (
+  enabled: boolean = true,
+  params: Params = {},
+  filter: Filter = {},
+) =>
+  useQuery<NetworkLoadBalancer[], APIError[]>({
+    ...networkLoadBalancerQueries.netloadbalancers._ctx.all(params, filter),
+    enabled,
+  });
+
+/**
+ * useNetworkLoadBalancerQuery
+ *
+ * Returns a single Network Load Balancer by ID
+ */
+export const useNetworkLoadBalancerQuery = (
+  id: number,
+  enabled: boolean = true,
+) => {
+  return useQuery<NetworkLoadBalancer, APIError[]>({
+    ...networkLoadBalancerQueries.netloadbalancer(id),
+    enabled,
+  });
+};
+
+/**
+ * useInfiniteNetworkLoadBalancersQuery
+ *
+ * Returns an infinite query for Network Load Balancers
+ */
+export const useInfiniteNetworkLoadBalancersQuery = (
+  filter: Filter,
+  enabled: boolean = true,
+) =>
+  useInfiniteQuery<ResourcePage<NetworkLoadBalancer>, APIError[]>({
+    ...networkLoadBalancerQueries.netloadbalancers._ctx.infinite(filter),
+    enabled,
+    getNextPageParam: ({ page, pages }) => {
+      if (page === pages) {
+        return undefined;
+      }
+      return page + 1;
+    },
+    initialPageParam: 1,
+    retry: false,
+  });
diff --git a/packages/queries/src/netloadbalancers/nodes.ts b/packages/queries/src/netloadbalancers/nodes.ts
new file mode 100644
index 00000000000..4c248c8e35d
--- /dev/null
+++ b/packages/queries/src/netloadbalancers/nodes.ts
@@ -0,0 +1,52 @@
+import { keepPreviousData, useQuery } from '@tanstack/react-query';
+
+import { networkLoadBalancerQueries } from './keys';
+
+import type {
+  APIError,
+  Filter,
+  NetworkLoadBalancerNode,
+  Params,
+  ResourcePage,
+} from '@linode/api-v4';
+
+/**
+ * useNetworkLoadBalancerNodesQuery
+ *
+ * Returns a paginated list of nodes for a Network Load Balancer listener
+ */
+export const useNetworkLoadBalancerNodesQuery = (
+  networkLoadBalancerId: number,
+  listenerId: number,
+  params: Params = {},
+  filter: Filter = {},
+  enabled: boolean = true,
+) =>
+  useQuery<ResourcePage<NetworkLoadBalancerNode>, APIError[]>({
+    ...networkLoadBalancerQueries
+      .netloadbalancer(networkLoadBalancerId)
+      ._ctx.listener(listenerId)
+      ._ctx.nodes._ctx.paginated(params, filter),
+    enabled,
+    placeholderData: keepPreviousData,
+  });
+
+/**
+ * useNetworkLoadBalancerNodeQuery
+ *
+ * Returns a single node by ID for a Network Load Balancer listener
+ */
+export const useNetworkLoadBalancerNodeQuery = (
+  networkLoadBalancerId: number,
+  listenerId: number,
+  nodeId: number,
+  enabled: boolean = true,
+) => {
+  return useQuery<NetworkLoadBalancerNode, APIError[]>({
+    ...networkLoadBalancerQueries
+      .netloadbalancer(networkLoadBalancerId)
+      ._ctx.listener(listenerId)
+      ._ctx.node(nodeId),
+    enabled,
+  });
+};
diff --git a/packages/queries/src/netloadbalancers/requests.ts b/packages/queries/src/netloadbalancers/requests.ts
new file mode 100644
index 00000000000..6599459b8eb
--- /dev/null
+++ b/packages/queries/src/netloadbalancers/requests.ts
@@ -0,0 +1,53 @@
+import {
+  getNetworkLoadBalancerListeners,
+  getNetworkLoadBalancerNodes,
+  getNetworkLoadBalancers,
+} from '@linode/api-v4';
+import { getAll } from '@linode/utilities';
+
+import type {
+  Filter,
+  NetworkLoadBalancer,
+  NetworkLoadBalancerListener,
+  NetworkLoadBalancerNode,
+  Params,
+} from '@linode/api-v4';
+
+export const getAllNetworkLoadBalancers = (
+  passedParams: Params = {},
+  passedFilter: Filter = {},
+) =>
+  getAll<NetworkLoadBalancer>((params, filter) =>
+    getNetworkLoadBalancers(
+      { ...params, ...passedParams },
+      { ...filter, ...passedFilter },
+    ),
+  )().then((data) => data.data);
+
+export const getAllNetworkLoadBalancerListeners = (
+  networkLoadBalancerId: number,
+  passedParams: Params = {},
+  passedFilter: Filter = {},
+) =>
+  getAll<NetworkLoadBalancerListener>((params, filter) =>
+    getNetworkLoadBalancerListeners(
+      networkLoadBalancerId,
+      { ...params, ...passedParams },
+      { ...filter, ...passedFilter },
+    ),
+  )().then((data) => data.data);
+
+export const getAllNetworkLoadBalancerNodes = (
+  networkLoadBalancerId: number,
+  listenerId: number,
+  passedParams: Params = {},
+  passedFilter: Filter = {},
+) =>
+  getAll<NetworkLoadBalancerNode>((params, filter) =>
+    getNetworkLoadBalancerNodes({
+      networkLoadBalancerId,
+      listenerId,
+      params: { ...params, ...passedParams },
+      filters: { ...filter, ...passedFilter },
+    }),
+  )().then((data) => data.data);

From d5d28d188af5fccb62abe2109d485f1947542582 Mon Sep 17 00:00:00 2001
From: Harsh Shankar Rao <hrao@akamai.com>
Date: Mon, 17 Nov 2025 14:27:18 +0530
Subject: [PATCH 08/91] upcoming: [UIE-9559, UIE-9560] - Introduce Network Load
 Balancer feature to CM (#13068)

* upcoming: [UIE-9559, UIE-9560] - Implement routing for Network Load Balancer

* added support for feature flag

* PR feedback @tanushree-akamai

* add unit test for Network Load Balancers Item in primary nav component

* Added changeset: Implement feature flag and routing for NLB

* correct routing for nlb

* fix failing unit test

* PR feedback

* fix nlb item visibility in side nav

* removed nlb routes that are not yet implemented

* ux writing fixes
---
 packages/api-v4/src/account/types.ts          |  1 +
 ...r-13068-upcoming-features-1762930872294.md |  5 +++
 .../components/PrimaryNav/PrimaryNav.test.tsx | 26 ++++++++++++
 .../src/components/PrimaryNav/PrimaryNav.tsx  |  9 ++++
 .../manager/src/dev-tools/FeatureFlagTool.tsx |  1 +
 packages/manager/src/featureFlags.ts          |  2 +
 .../NetworkLoadBalancersLanding.tsx           | 20 +++++++++
 .../networkLoadBalancersLazyRoute.tsx         |  9 ++++
 .../NetworkLoadBalancers/utils.test.ts        | 42 +++++++++++++++++++
 .../features/NetworkLoadBalancers/utils.ts    | 27 ++++++++++++
 packages/manager/src/routes/index.tsx         |  2 +
 .../src/routes/networkLoadBalancer/index.ts   | 22 ++++++++++
 .../networkLoadBalancersRoute.tsx             | 21 ++++++++++
 13 files changed, 187 insertions(+)
 create mode 100644 packages/manager/.changeset/pr-13068-upcoming-features-1762930872294.md
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding.tsx
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/networkLoadBalancersLazyRoute.tsx
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/utils.test.ts
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/utils.ts
 create mode 100644 packages/manager/src/routes/networkLoadBalancer/index.ts
 create mode 100644 packages/manager/src/routes/networkLoadBalancer/networkLoadBalancersRoute.tsx

diff --git a/packages/api-v4/src/account/types.ts b/packages/api-v4/src/account/types.ts
index 73d008377cf..e6b4a27c25c 100644
--- a/packages/api-v4/src/account/types.ts
+++ b/packages/api-v4/src/account/types.ts
@@ -80,6 +80,7 @@ export const accountCapabilities = [
   'Managed Databases',
   'Managed Databases Beta',
   'NETINT Quadra T1U',
+  'Network LoadBalancer',
   'NodeBalancers',
   'Object Storage Access Key Regions',
   'Object Storage Endpoint Types',
diff --git a/packages/manager/.changeset/pr-13068-upcoming-features-1762930872294.md b/packages/manager/.changeset/pr-13068-upcoming-features-1762930872294.md
new file mode 100644
index 00000000000..47909ba6d28
--- /dev/null
+++ b/packages/manager/.changeset/pr-13068-upcoming-features-1762930872294.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Implement feature flag and routing for NLB ([#13068](https://github.com/linode/manager/pull/13068))
diff --git a/packages/manager/src/components/PrimaryNav/PrimaryNav.test.tsx b/packages/manager/src/components/PrimaryNav/PrimaryNav.test.tsx
index 220bf0121c8..835b35727eb 100644
--- a/packages/manager/src/components/PrimaryNav/PrimaryNav.test.tsx
+++ b/packages/manager/src/components/PrimaryNav/PrimaryNav.test.tsx
@@ -561,4 +561,30 @@ describe('PrimaryNav', () => {
       ).toBeNull();
     });
   });
+
+  it('should show Network Load Balancers menu item if the user has the account capability and the flag is enabled', async () => {
+    const account = accountFactory.build({
+      capabilities: ['Network LoadBalancer'],
+    });
+
+    queryMocks.useAccount.mockReturnValue({
+      data: account,
+      isLoading: false,
+      error: null,
+    });
+
+    const flags: Partial<Flags> = {
+      networkLoadBalancer: true,
+    };
+
+    const { findByTestId } = renderWithTheme(<PrimaryNav {...props} />, {
+      flags,
+    });
+
+    const databaseNavItem = await findByTestId(
+      'menu-item-Network Load Balancer'
+    );
+
+    expect(databaseNavItem).toBeVisible();
+  });
 });
diff --git a/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx b/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx
index 191648a49b1..f2b0ef1ab18 100644
--- a/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx
+++ b/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx
@@ -22,6 +22,7 @@ import { useIsACLPEnabled } from 'src/features/CloudPulse/Utils/utils';
 import { useIsDatabasesEnabled } from 'src/features/Databases/utilities';
 import { useIsACLPLogsEnabled } from 'src/features/Delivery/deliveryUtils';
 import { useIsIAMEnabled } from 'src/features/IAM/hooks/useIsIAMEnabled';
+import { useIsNetworkLoadBalancerEnabled } from 'src/features/NetworkLoadBalancers/utils';
 import { useIsPlacementGroupsEnabled } from 'src/features/PlacementGroups/utils';
 import { useFlags } from 'src/hooks/useFlags';
 
@@ -56,6 +57,7 @@ export type NavEntity =
   | 'Marketplace'
   | 'Metrics'
   | 'Monitor'
+  | 'Network Load Balancer'
   | 'NodeBalancers'
   | 'Object Storage'
   | 'Placement Groups'
@@ -115,6 +117,7 @@ export const PrimaryNav = (props: PrimaryNavProps) => {
   const { isDatabasesEnabled, isDatabasesV2Beta } = useIsDatabasesEnabled();
 
   const { isIAMBeta, isIAMEnabled } = useIsIAMEnabled();
+  const { isNetworkLoadBalancerEnabled } = useIsNetworkLoadBalancerEnabled();
 
   const {
     data: preferences,
@@ -202,6 +205,11 @@ export const PrimaryNav = (props: PrimaryNavProps) => {
                 display: 'Firewalls',
                 to: '/firewalls',
               },
+              {
+                display: 'Network Load Balancer',
+                hide: !isNetworkLoadBalancerEnabled,
+                to: '/netloadbalancers',
+              },
               {
                 display: 'NodeBalancers',
                 to: '/nodebalancers',
@@ -340,6 +348,7 @@ export const PrimaryNav = (props: PrimaryNavProps) => {
         isIAMBeta,
         isIAMEnabled,
         iamRbacPrimaryNavChanges,
+        isNetworkLoadBalancerEnabled,
         limitsEvolution,
       ]
     );
diff --git a/packages/manager/src/dev-tools/FeatureFlagTool.tsx b/packages/manager/src/dev-tools/FeatureFlagTool.tsx
index d38d32995a2..51a36260c38 100644
--- a/packages/manager/src/dev-tools/FeatureFlagTool.tsx
+++ b/packages/manager/src/dev-tools/FeatureFlagTool.tsx
@@ -40,6 +40,7 @@ const options: { flag: keyof Flags; label: string }[] = [
   { flag: 'linodeDiskEncryption', label: 'Linode Disk Encryption (LDE)' },
   { flag: 'linodeInterfaces', label: 'Linode Interfaces' },
   { flag: 'lkeEnterprise2', label: 'LKE-Enterprise' },
+  { flag: 'networkLoadBalancer', label: 'Network Load Balancer' },
   { flag: 'nodebalancerIpv6', label: 'NodeBalancer Dual Stack (IPv6)' },
   { flag: 'nodebalancerVpc', label: 'NodeBalancer-VPC Integration' },
   { flag: 'objMultiCluster', label: 'OBJ Multi-Cluster' },
diff --git a/packages/manager/src/featureFlags.ts b/packages/manager/src/featureFlags.ts
index d3aec9ff50f..097fbcaf01b 100644
--- a/packages/manager/src/featureFlags.ts
+++ b/packages/manager/src/featureFlags.ts
@@ -218,6 +218,7 @@ export interface Flags {
   marketplaceAppOverrides: MarketplaceAppOverride[];
   metadata: boolean;
   mtc: MTC;
+  networkLoadBalancer: boolean;
   nodebalancerIpv6: boolean;
   nodebalancerVpc: boolean;
   objectStorageGen2: BaseFeatureFlag;
@@ -341,6 +342,7 @@ export type ProductInformationBannerLocation =
   | 'Logs'
   | 'Longview'
   | 'Managed'
+  | 'Network LoadBalancers'
   | 'NodeBalancers'
   | 'Object Storage'
   | 'Placement Groups'
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding.tsx
new file mode 100644
index 00000000000..373a1e0e883
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding.tsx
@@ -0,0 +1,20 @@
+import { Notice } from '@linode/ui';
+import * as React from 'react';
+
+import { LandingHeader } from 'src/components/LandingHeader';
+
+export const NetworkLoadBalancersLanding = () => {
+  return (
+    <>
+      <LandingHeader
+        breadcrumbProps={{
+          pathname: 'Network Load Balancer',
+          removeCrumbX: 1,
+        }}
+        spacingBottom={16}
+        title="Network Load Balancer"
+      />
+      <Notice variant="info">Network Load Balancer is coming soon...</Notice>
+    </>
+  );
+};
diff --git a/packages/manager/src/features/NetworkLoadBalancers/networkLoadBalancersLazyRoute.tsx b/packages/manager/src/features/NetworkLoadBalancers/networkLoadBalancersLazyRoute.tsx
new file mode 100644
index 00000000000..def65acf048
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/networkLoadBalancersLazyRoute.tsx
@@ -0,0 +1,9 @@
+import { createLazyRoute } from '@tanstack/react-router';
+
+import { NetworkLoadBalancersLanding } from './NetworkLoadBalancersLanding';
+
+export const networkLoadBalancersLazyRoute = createLazyRoute(
+  '/netloadbalancers'
+)({
+  component: NetworkLoadBalancersLanding,
+});
diff --git a/packages/manager/src/features/NetworkLoadBalancers/utils.test.ts b/packages/manager/src/features/NetworkLoadBalancers/utils.test.ts
new file mode 100644
index 00000000000..aa679304b4b
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/utils.test.ts
@@ -0,0 +1,42 @@
+import { renderHook, waitFor } from '@testing-library/react';
+
+import { accountFactory } from 'src/factories';
+import { http, HttpResponse, server } from 'src/mocks/testServer';
+import { wrapWithTheme } from 'src/utilities/testHelpers';
+
+import { useIsNetworkLoadBalancerEnabled } from './utils';
+
+describe('useIsNetworkLoadBalancerEnabled', () => {
+  it('returns true if the feature is enabled', async () => {
+    const options = { flags: { networkLoadBalancer: true } };
+    const account = accountFactory.build({
+      capabilities: ['Network LoadBalancer'],
+    });
+
+    server.use(
+      http.get('*/v4*/account', () => {
+        return HttpResponse.json(account);
+      })
+    );
+
+    const { result } = renderHook(() => useIsNetworkLoadBalancerEnabled(), {
+      wrapper: (ui) => wrapWithTheme(ui, options),
+    });
+
+    await waitFor(() => {
+      expect(result.current.isNetworkLoadBalancerEnabled).toBe(true);
+    });
+  });
+
+  it('returns false if the feature is NOT enabled', async () => {
+    const options = { flags: { networkLoadBalancer: false } };
+
+    const { result } = renderHook(() => useIsNetworkLoadBalancerEnabled(), {
+      wrapper: (ui) => wrapWithTheme(ui, options),
+    });
+
+    await waitFor(() => {
+      expect(result.current.isNetworkLoadBalancerEnabled).toBe(false);
+    });
+  });
+});
diff --git a/packages/manager/src/features/NetworkLoadBalancers/utils.ts b/packages/manager/src/features/NetworkLoadBalancers/utils.ts
new file mode 100644
index 00000000000..66c9a2a2865
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/utils.ts
@@ -0,0 +1,27 @@
+import { useAccount } from '@linode/queries';
+import { isFeatureEnabledV2 } from '@linode/utilities';
+
+import { useFlags } from 'src/hooks/useFlags';
+
+/**
+ *
+ * @returns an object that contains boolean property to check whether Network LoadBalancer is enabled or not
+ */
+export const useIsNetworkLoadBalancerEnabled = (): {
+  isNetworkLoadBalancerEnabled: boolean;
+} => {
+  const { data: account } = useAccount();
+  const flags = useFlags();
+
+  if (!flags) {
+    return { isNetworkLoadBalancerEnabled: false };
+  }
+
+  const isNetworkLoadBalancerEnabled = isFeatureEnabledV2(
+    'Network LoadBalancer',
+    Boolean(flags.networkLoadBalancer),
+    account?.capabilities ?? []
+  );
+
+  return { isNetworkLoadBalancerEnabled };
+};
diff --git a/packages/manager/src/routes/index.tsx b/packages/manager/src/routes/index.tsx
index 2647d63ab12..3c2193f36fa 100644
--- a/packages/manager/src/routes/index.tsx
+++ b/packages/manager/src/routes/index.tsx
@@ -30,6 +30,7 @@ import { longviewRouteTree } from './longview';
 import { maintenanceRouteTree } from './maintenance';
 import { managedRouteTree } from './managed';
 import { cloudPulseMetricsRouteTree } from './metrics';
+import { networkLoadBalancersRouteTree } from './networkLoadBalancer';
 import { nodeBalancersRouteTree } from './nodeBalancers';
 import { objectStorageRouteTree } from './objectStorage';
 import { placementGroupsRouteTree } from './placementGroups';
@@ -79,6 +80,7 @@ export const routeTree = rootRoute.addChildren([
   longviewRouteTree,
   maintenanceRouteTree,
   managedRouteTree,
+  networkLoadBalancersRouteTree,
   nodeBalancersRouteTree,
   objectStorageRouteTree,
   placementGroupsRouteTree,
diff --git a/packages/manager/src/routes/networkLoadBalancer/index.ts b/packages/manager/src/routes/networkLoadBalancer/index.ts
new file mode 100644
index 00000000000..80427760f2f
--- /dev/null
+++ b/packages/manager/src/routes/networkLoadBalancer/index.ts
@@ -0,0 +1,22 @@
+import { createRoute } from '@tanstack/react-router';
+
+import { rootRoute } from '../root';
+import { NetworkLoadBalancersRoute } from './networkLoadBalancersRoute';
+
+const networkLoadBalancersRoute = createRoute({
+  component: NetworkLoadBalancersRoute,
+  getParentRoute: () => rootRoute,
+  path: 'netloadbalancers',
+});
+
+const networkLoadBalancersIndexRoute = createRoute({
+  getParentRoute: () => networkLoadBalancersRoute,
+  path: '/',
+}).lazy(() =>
+  import(
+    'src/features/NetworkLoadBalancers/networkLoadBalancersLazyRoute'
+  ).then((m) => m.networkLoadBalancersLazyRoute)
+);
+
+export const networkLoadBalancersRouteTree =
+  networkLoadBalancersRoute.addChildren([networkLoadBalancersIndexRoute]);
diff --git a/packages/manager/src/routes/networkLoadBalancer/networkLoadBalancersRoute.tsx b/packages/manager/src/routes/networkLoadBalancer/networkLoadBalancersRoute.tsx
new file mode 100644
index 00000000000..85ca98e8304
--- /dev/null
+++ b/packages/manager/src/routes/networkLoadBalancer/networkLoadBalancersRoute.tsx
@@ -0,0 +1,21 @@
+import { NotFound } from '@linode/ui';
+import { Outlet } from '@tanstack/react-router';
+import React from 'react';
+
+import { ProductInformationBanner } from 'src/components/ProductInformationBanner/ProductInformationBanner';
+import { SuspenseLoader } from 'src/components/SuspenseLoader';
+import { useIsNetworkLoadBalancerEnabled } from 'src/features/NetworkLoadBalancers/utils';
+
+export const NetworkLoadBalancersRoute = () => {
+  const { isNetworkLoadBalancerEnabled } = useIsNetworkLoadBalancerEnabled();
+
+  if (!isNetworkLoadBalancerEnabled) {
+    return <NotFound />;
+  }
+  return (
+    <React.Suspense fallback={<SuspenseLoader />}>
+      <ProductInformationBanner bannerLocation="Network LoadBalancers" />
+      <Outlet />
+    </React.Suspense>
+  );
+};

From f49e9f06bd2b98eb4413c4ffe6c2d4caa3e7be7c Mon Sep 17 00:00:00 2001
From: aaleksee-akamai <aaleksee@akamai.com>
Date: Mon, 17 Nov 2025 12:00:13 +0100
Subject: [PATCH 09/91] feat: [UIE-9423] - IAM Parent/Child: permissions switch
 account (#13075)

* feat: [UIE-9423] - IAM Parent/Child: permissions switch account

* update a condition

* Added changeset: IAM Parent/Child: permissions switch account

---------

Co-authored-by: Alban Bailly <130582365+abailly-akamai@users.noreply.github.com>
---
 .../pr-13075-added-1762776269124.md           |  5 ++
 .../src/features/Account/AccountLanding.tsx   |  8 +-
 .../Account/SwitchAccountButton.test.tsx      | 77 ++++++++++++++++++-
 .../features/Account/SwitchAccountButton.tsx  | 17 ++++
 .../Billing/BillingLanding/BillingLanding.tsx |  8 +-
 .../TopMenu/UserMenu/UserMenuPopover.tsx      | 14 +++-
 6 files changed, 120 insertions(+), 9 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13075-added-1762776269124.md

diff --git a/packages/manager/.changeset/pr-13075-added-1762776269124.md b/packages/manager/.changeset/pr-13075-added-1762776269124.md
new file mode 100644
index 00000000000..ed452d6cbe3
--- /dev/null
+++ b/packages/manager/.changeset/pr-13075-added-1762776269124.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Added
+---
+
+IAM Parent/Child: permissions switch account ([#13075](https://github.com/linode/manager/pull/13075))
diff --git a/packages/manager/src/features/Account/AccountLanding.tsx b/packages/manager/src/features/Account/AccountLanding.tsx
index 8a702687d98..0f626cc9850 100644
--- a/packages/manager/src/features/Account/AccountLanding.tsx
+++ b/packages/manager/src/features/Account/AccountLanding.tsx
@@ -24,6 +24,7 @@ import { useTabs } from 'src/hooks/useTabs';
 import { sendSwitchAccountEvent } from 'src/utilities/analytics/customEventAnalytics';
 
 import { PlatformMaintenanceBanner } from '../../components/PlatformMaintenanceBanner/PlatformMaintenanceBanner';
+import { useIsIAMDelegationEnabled } from '../IAM/hooks/useIsIAMEnabled';
 import { usePermissions } from '../IAM/hooks/usePermissions';
 import { SwitchAccountButton } from './SwitchAccountButton';
 import { SwitchAccountDrawer } from './SwitchAccountDrawer';
@@ -60,6 +61,8 @@ export const AccountLanding = () => {
     globalGrantType: 'child_account_access',
   });
 
+  const { isIAMDelegationEnabled } = useIsIAMDelegationEnabled();
+
   const { isParentTokenExpired } = useIsParentTokenExpired({ isProxyUser });
 
   const { tabs, handleTabChange, tabIndex, getTabIndex } = useTabs([
@@ -124,8 +127,9 @@ export const AccountLanding = () => {
   };
 
   const isBillingTabSelected = getTabIndex('/account/billing') === tabIndex;
-  const canSwitchBetweenParentOrProxyAccount =
-    (!isChildAccountAccessRestricted && isParentUser) || isProxyUser;
+  const canSwitchBetweenParentOrProxyAccount = isIAMDelegationEnabled
+    ? isParentUser
+    : (!isChildAccountAccessRestricted && isParentUser) || isProxyUser;
 
   const landingHeaderProps: LandingHeaderProps = {
     breadcrumbProps: {
diff --git a/packages/manager/src/features/Account/SwitchAccountButton.test.tsx b/packages/manager/src/features/Account/SwitchAccountButton.test.tsx
index b043e9f825c..2749e17c495 100644
--- a/packages/manager/src/features/Account/SwitchAccountButton.test.tsx
+++ b/packages/manager/src/features/Account/SwitchAccountButton.test.tsx
@@ -1,10 +1,30 @@
-import { screen } from '@testing-library/react';
+import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
 import { SwitchAccountButton } from 'src/features/Account/SwitchAccountButton';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
+const queryMocks = vi.hoisted(() => ({
+  userPermissions: vi.fn(() => ({
+    data: {
+      create_child_account_token: true,
+    },
+  })),
+  useFlags: vi.fn().mockReturnValue({}),
+}));
+vi.mock('src/features/IAM/hooks/usePermissions', () => ({
+  usePermissions: queryMocks.userPermissions,
+}));
+
+vi.mock('src/hooks/useFlags', () => {
+  const actual = vi.importActual('src/hooks/useFlags');
+  return {
+    ...actual,
+    useFlags: queryMocks.useFlags,
+  };
+});
+
 describe('SwitchAccountButton', () => {
   test('renders Switch Account button with SwapIcon', () => {
     renderWithTheme(<SwitchAccountButton />);
@@ -22,4 +42,59 @@ describe('SwitchAccountButton', () => {
 
     expect(onClickMock).toHaveBeenCalledTimes(1);
   });
+
+  test('enables the button when user has create_child_account_token permission', () => {
+    queryMocks.useFlags.mockReturnValue({
+      iamDelegation: { enabled: true },
+    });
+
+    renderWithTheme(<SwitchAccountButton />);
+
+    const button = screen.getByRole('button', { name: /switch account/i });
+    expect(button).toBeEnabled();
+  });
+
+  test('disables the button when user does not have create_child_account_token permission', async () => {
+    queryMocks.userPermissions.mockReturnValue({
+      data: {
+        create_child_account_token: false,
+      },
+    });
+
+    queryMocks.useFlags.mockReturnValue({
+      iamDelegation: { enabled: true },
+    });
+
+    renderWithTheme(<SwitchAccountButton />);
+
+    const button = screen.getByRole('button', { name: /switch account/i });
+    expect(button).toBeDisabled();
+
+    // Check that the tooltip is properly configured
+    expect(button).toHaveAttribute('aria-describedby', 'button-tooltip');
+
+    // Hover over the button to show the tooltip
+    await userEvent.hover(button);
+
+    // Wait for tooltip to appear and check its content
+    await waitFor(() => {
+      screen.getByRole('tooltip');
+    });
+
+    expect(
+      screen.getByText('You do not have permission to switch accounts.')
+    ).toBeVisible();
+  });
+
+  test('enables the button when iamDelegation flag is off', async () => {
+    queryMocks.useFlags.mockReturnValue({
+      iamDelegation: { enabled: false },
+    });
+
+    renderWithTheme(<SwitchAccountButton />);
+
+    const button = screen.getByRole('button', { name: /switch account/i });
+    expect(button).toBeEnabled();
+    expect(button).not.toHaveAttribute('aria-describedby', 'button-tooltip');
+  });
 });
diff --git a/packages/manager/src/features/Account/SwitchAccountButton.tsx b/packages/manager/src/features/Account/SwitchAccountButton.tsx
index 33944ec21e5..ab1dd3b3e2b 100644
--- a/packages/manager/src/features/Account/SwitchAccountButton.tsx
+++ b/packages/manager/src/features/Account/SwitchAccountButton.tsx
@@ -3,11 +3,23 @@ import * as React from 'react';
 
 import SwapIcon from 'src/assets/icons/swapSmall.svg';
 
+import { useIsIAMDelegationEnabled } from '../IAM/hooks/useIsIAMEnabled';
+import { usePermissions } from '../IAM/hooks/usePermissions';
+
 import type { ButtonProps } from '@linode/ui';
 
 export const SwitchAccountButton = (props: ButtonProps) => {
+  const { isIAMDelegationEnabled } = useIsIAMDelegationEnabled();
+
+  const { data: permissions } = usePermissions('account', [
+    'create_child_account_token',
+  ]);
+
   return (
     <Button
+      disabled={
+        isIAMDelegationEnabled ? !permissions.create_child_account_token : false
+      }
       startIcon={<SwapIcon data-testid="swap-icon" />}
       sx={(theme) => ({
         '& .MuiButton-startIcon svg path': {
@@ -16,6 +28,11 @@ export const SwitchAccountButton = (props: ButtonProps) => {
         font: theme.tokens.alias.Typography.Label.Semibold.S,
         marginTop: theme.tokens.spacing.S4,
       })}
+      tooltipText={
+        isIAMDelegationEnabled && !permissions.create_child_account_token
+          ? 'You do not have permission to switch accounts.'
+          : undefined
+      }
       {...props}
     >
       Switch Account
diff --git a/packages/manager/src/features/Billing/BillingLanding/BillingLanding.tsx b/packages/manager/src/features/Billing/BillingLanding/BillingLanding.tsx
index 8cf69732bfd..62baffaf790 100644
--- a/packages/manager/src/features/Billing/BillingLanding/BillingLanding.tsx
+++ b/packages/manager/src/features/Billing/BillingLanding/BillingLanding.tsx
@@ -8,6 +8,7 @@ import { MaintenanceBannerV2 } from 'src/components/MaintenanceBanner/Maintenanc
 import { switchAccountSessionContext } from 'src/context/switchAccountSessionContext';
 import { useIsParentTokenExpired } from 'src/features/Account/SwitchAccounts/useIsParentTokenExpired';
 import { getRestrictedResourceText } from 'src/features/Account/utils';
+import { useIsIAMDelegationEnabled } from 'src/features/IAM/hooks/useIsIAMEnabled';
 import { useFlags } from 'src/hooks/useFlags';
 import { useRestrictedGlobalGrantCheck } from 'src/hooks/useRestrictedGlobalGrantCheck';
 import { sendSwitchAccountEvent } from 'src/utilities/analytics/customEventAnalytics';
@@ -45,6 +46,8 @@ export const BillingLanding = () => {
     globalGrantType: 'child_account_access',
   });
 
+  const { isIAMDelegationEnabled } = useIsIAMDelegationEnabled();
+
   const { isParentTokenExpired } = useIsParentTokenExpired({ isProxyUser });
 
   const isReadOnly = !permissions.make_billing_payment || isChildUser;
@@ -56,8 +59,9 @@ export const BillingLanding = () => {
     return <Navigate replace to="/account/billing" />;
   }
 
-  const canSwitchBetweenParentOrProxyAccount =
-    (!isChildAccountAccessRestricted && isParentUser) || isProxyUser;
+  const canSwitchBetweenParentOrProxyAccount = isIAMDelegationEnabled
+    ? isParentUser
+    : (!isChildAccountAccessRestricted && isParentUser) || isProxyUser;
 
   const handleAccountSwitch = () => {
     if (isParentTokenExpired) {
diff --git a/packages/manager/src/features/TopMenu/UserMenu/UserMenuPopover.tsx b/packages/manager/src/features/TopMenu/UserMenu/UserMenuPopover.tsx
index 91d51143ab3..5a6544153d7 100644
--- a/packages/manager/src/features/TopMenu/UserMenu/UserMenuPopover.tsx
+++ b/packages/manager/src/features/TopMenu/UserMenu/UserMenuPopover.tsx
@@ -10,7 +10,10 @@ import { Link } from 'src/components/Link';
 import { switchAccountSessionContext } from 'src/context/switchAccountSessionContext';
 import { SwitchAccountButton } from 'src/features/Account/SwitchAccountButton';
 import { useIsParentTokenExpired } from 'src/features/Account/SwitchAccounts/useIsParentTokenExpired';
-import { useIsIAMEnabled } from 'src/features/IAM/hooks/useIsIAMEnabled';
+import {
+  useIsIAMDelegationEnabled,
+  useIsIAMEnabled,
+} from 'src/features/IAM/hooks/useIsIAMEnabled';
 import { useFlags } from 'src/hooks/useFlags';
 import { useRestrictedGlobalGrantCheck } from 'src/hooks/useRestrictedGlobalGrantCheck';
 import { sendSwitchAccountEvent } from 'src/utilities/analytics/customEventAnalytics';
@@ -46,11 +49,14 @@ export const UserMenuPopover = (props: UserMenuPopoverProps) => {
     globalGrantType: 'child_account_access',
   });
 
+  const { isIAMDelegationEnabled } = useIsIAMDelegationEnabled();
+
   const isProxyUser = profile?.user_type === 'proxy';
 
-  const canSwitchBetweenParentOrProxyAccount =
-    (profile?.user_type === 'parent' && !isChildAccountAccessRestricted) ||
-    profile?.user_type === 'proxy';
+  const canSwitchBetweenParentOrProxyAccount = isIAMDelegationEnabled
+    ? profile?.user_type === 'parent'
+    : (profile?.user_type === 'parent' && !isChildAccountAccessRestricted) ||
+      profile?.user_type === 'proxy';
 
   const open = Boolean(anchorEl);
   const id = open ? 'user-menu-popover' : undefined;

From 9b2a4fe77be914ed2e6d3f37ad9ae2fc0cb97036 Mon Sep 17 00:00:00 2001
From: aaleksee-akamai <aaleksee@akamai.com>
Date: Mon, 17 Nov 2025 14:18:58 +0100
Subject: [PATCH 10/91] feat: [UIE-9557] - IAM: fix perm for detach volumes
 (#13099)

* feat: [UIE-9557] - IAM: fix perm for detach volumes

* Added changeset: IAM: fix permission check for detaching volumes
---
 .../manager/.changeset/pr-13099-changed-1763377007914.md    | 5 +++++
 .../src/features/Volumes/Dialogs/DetachVolumeDialog.tsx     | 4 ++--
 .../src/features/Volumes/Partials/VolumesActionMenu.tsx     | 6 +++---
 3 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13099-changed-1763377007914.md

diff --git a/packages/manager/.changeset/pr-13099-changed-1763377007914.md b/packages/manager/.changeset/pr-13099-changed-1763377007914.md
new file mode 100644
index 00000000000..7a0e0ee8287
--- /dev/null
+++ b/packages/manager/.changeset/pr-13099-changed-1763377007914.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Changed
+---
+
+IAM: fix permission check for detaching volumes ([#13099](https://github.com/linode/manager/pull/13099))
diff --git a/packages/manager/src/features/Volumes/Dialogs/DetachVolumeDialog.tsx b/packages/manager/src/features/Volumes/Dialogs/DetachVolumeDialog.tsx
index b6160826e60..2e61911c38e 100644
--- a/packages/manager/src/features/Volumes/Dialogs/DetachVolumeDialog.tsx
+++ b/packages/manager/src/features/Volumes/Dialogs/DetachVolumeDialog.tsx
@@ -38,7 +38,7 @@ export const DetachVolumeDialog = (props: Props) => {
 
   const { data: linodePermissions } = usePermissions(
     'linode',
-    ['delete_linode'],
+    ['update_linode'],
     linode?.id,
     open
   );
@@ -64,7 +64,7 @@ export const DetachVolumeDialog = (props: Props) => {
   return (
     <TypeToConfirmDialog
       disableTypeToConfirmInput={
-        !(volumePermissions?.detach_volume && linodePermissions?.delete_linode)
+        !(volumePermissions?.detach_volume && linodePermissions?.update_linode)
       }
       entity={{
         action: 'detachment',
diff --git a/packages/manager/src/features/Volumes/Partials/VolumesActionMenu.tsx b/packages/manager/src/features/Volumes/Partials/VolumesActionMenu.tsx
index 19f9c790665..194dcb691fe 100644
--- a/packages/manager/src/features/Volumes/Partials/VolumesActionMenu.tsx
+++ b/packages/manager/src/features/Volumes/Partials/VolumesActionMenu.tsx
@@ -53,7 +53,7 @@ export const VolumesActionMenu = (props: Props) => {
 
   const { data: linodePermissions } = usePermissions(
     'linode',
-    ['delete_linode'],
+    ['update_linode'],
     volume.linode_id!,
     isOpen && isAttached
   );
@@ -121,12 +121,12 @@ export const VolumesActionMenu = (props: Props) => {
     },
     DETACH: {
       disabled: !(
-        volumePermissions?.detach_volume && linodePermissions?.delete_linode
+        volumePermissions?.detach_volume && linodePermissions?.update_linode
       ),
       onClick: handlers.handleDetach,
       title: 'Detach',
       tooltip: !(
-        volumePermissions?.detach_volume && linodePermissions?.delete_linode
+        volumePermissions?.detach_volume && linodePermissions?.update_linode
       )
         ? getRestrictedResourceText({
             action: 'detach',

From 70589db478c108471a26a737c1b9ad7af5297c18 Mon Sep 17 00:00:00 2001
From: shagufa-akamai <shaali@akamai.com>
Date: Mon, 17 Nov 2025 10:17:41 -0600
Subject: [PATCH 11/91] change: [M3-10685] - Update Cloud Manager Icons to
 Akamai Design System (#13032)

 change: [M3-10685] - Update Cloud Manager Icons to Akamai Design System
---
 .../pr-13032-changed-1761686860911.md         |   5 +
 .../manager/src/assets/icons/LKEminusSign.svg |   5 +-
 .../manager/src/assets/icons/ResizeWindow.svg |   6 +-
 .../manager/src/assets/icons/arrow-down.svg   |   2 +-
 .../manager/src/assets/icons/arrow-up.svg     |   2 +-
 packages/manager/src/assets/icons/caution.svg |   9 +-
 packages/manager/src/assets/icons/chat.svg    |  12 +-
 .../src/assets/icons/checkmark-enabled.svg    |  14 +-
 .../manager/src/assets/icons/code-file.svg    |  12 +-
 .../manager/src/assets/icons/community.svg    |  19 +-
 packages/manager/src/assets/icons/copy.svg    |   4 +-
 .../manager/src/assets/icons/credit-card.svg  |   8 +-
 packages/manager/src/assets/icons/db-logo.svg |  35 ++--
 .../src/assets/icons/divider-vertical.svg     |   2 +-
 packages/manager/src/assets/icons/docs.svg    |   4 +-
 .../manager/src/assets/icons/document.svg     |  14 +-
 .../manager/src/assets/icons/download.svg     |  13 +-
 .../src/assets/icons/drag-indicator.svg       |  20 +-
 packages/manager/src/assets/icons/error.svg   |   4 +-
 .../src/assets/icons/fileUploadComplete.svg   |   6 +-
 packages/manager/src/assets/icons/flag.svg    |  20 +-
 .../manager/src/assets/icons/grid-view.svg    |   4 +-
 .../manager/src/assets/icons/group-by-tag.svg |   4 +-
 .../src/assets/icons/icon-feedback.svg        |   8 +-
 packages/manager/src/assets/icons/kebab.svg   |   8 +-
 .../manager/src/assets/icons/lke-download.svg |   8 +-
 packages/manager/src/assets/icons/lock.svg    |   2 +-
 .../manager/src/assets/icons/marketplace.svg  |  17 +-
 packages/manager/src/assets/icons/mongodb.svg |  14 +-
 .../src/assets/icons/monitor-disabled.svg     |   9 +-
 .../src/assets/icons/monitor-failed.svg       |  12 +-
 .../manager/src/assets/icons/monitor-ok.svg   |  12 +-
 packages/manager/src/assets/icons/mysql.svg   |  13 +-
 .../src/assets/icons/objectStorage/folder.svg |   8 +-
 .../src/assets/icons/objectStorage/object.svg |   9 +-
 .../manager/src/assets/icons/parent-child.svg |   7 +-
 .../src/assets/icons/payment/gPayButton.svg   |   2 +-
 .../src/assets/icons/payment/googlePay.svg    |   2 +-
 .../manager/src/assets/icons/payment/jcb.svg  |  12 +-
 .../src/assets/icons/payment/mastercard.svg   |   2 +-
 packages/manager/src/assets/icons/pending.svg |  16 +-
 packages/manager/src/assets/icons/pointer.svg |  10 +-
 .../manager/src/assets/icons/postgresql.svg   |  35 ++--
 .../promotionalOffers/heavenly-bucket.svg     |  21 +--
 .../providers/akamai-logo-rgb-waveOnly.svg    |  12 +-
 .../assets/icons/providers/github-logo.svg    |  18 +-
 .../assets/icons/providers/google-logo.svg    |  16 +-
 packages/manager/src/assets/icons/reset.svg   |  11 +-
 packages/manager/src/assets/icons/ssh-key.svg |  10 +-
 packages/manager/src/assets/icons/status.svg  |  16 +-
 packages/manager/src/assets/icons/support.svg |  19 +-
 .../manager/src/assets/icons/swapSmall.svg    |   2 +-
 packages/manager/src/assets/icons/ticket.svg  |   6 +-
 packages/manager/src/assets/icons/undo.svg    |   9 +-
 .../manager/src/assets/icons/unsorted.svg     |   2 +-
 packages/manager/src/assets/icons/view.svg    |  23 +--
 packages/manager/src/assets/icons/youtube.svg |  16 +-
 packages/manager/src/assets/icons/zoomin.svg  |  28 +--
 .../manager/src/components/AvatarForProxy.tsx |   5 +-
 .../IconGallery/IconGallery.stories.tsx       | 178 ++++++++++++++++++
 .../components/IconGallery/IconGallery.tsx    | 104 ++++++++++
 .../components/Uploaders/FileUpload.styles.ts |   6 +
 .../src/components/Uploaders/FileUpload.tsx   |   5 +-
 .../src/dev-tools/components/Draggable.tsx    |   2 +-
 packages/manager/src/dev-tools/dev-tools.css  |   2 +-
 .../LinodeSummary/LinodeSummary.tsx           |   6 +-
 .../TransferHistory.tsx                       |  10 +-
 .../LinodesLanding/LinodeRow/LinodeRow.tsx    |   4 +-
 .../ManagedDashboardCard/MonitorStatus.tsx    |  14 +-
 .../features/Managed/Monitors/IssueDay.tsx    |  18 +-
 .../features/Managed/Monitors/MonitorRow.tsx  |  11 +-
 .../features/Managed/Monitors/monitorMaps.ts  |  10 +
 .../NodeBalancerSummary/TablesPanel.tsx       |   6 +-
 .../AccessKeyLanding/AccessCell.tsx           |   3 +-
 .../AuthenticationSettings/TPAProviders.tsx   |  12 +-
 75 files changed, 592 insertions(+), 443 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13032-changed-1761686860911.md
 create mode 100644 packages/manager/src/components/IconGallery/IconGallery.stories.tsx
 create mode 100644 packages/manager/src/components/IconGallery/IconGallery.tsx

diff --git a/packages/manager/.changeset/pr-13032-changed-1761686860911.md b/packages/manager/.changeset/pr-13032-changed-1761686860911.md
new file mode 100644
index 00000000000..dcdc79dea36
--- /dev/null
+++ b/packages/manager/.changeset/pr-13032-changed-1761686860911.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Changed
+---
+
+Update icon svg files to match with Akamai design system ([#13032](https://github.com/linode/manager/pull/13032))
diff --git a/packages/manager/src/assets/icons/LKEminusSign.svg b/packages/manager/src/assets/icons/LKEminusSign.svg
index 9c83ce56708..65bafe8f6c3 100644
--- a/packages/manager/src/assets/icons/LKEminusSign.svg
+++ b/packages/manager/src/assets/icons/LKEminusSign.svg
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="11px" height="3px" viewBox="0 0 11 3" xmlns="http://www.w3.org/2000/svg" fill="currentColor">
-    <path d="M0 1.5 H11" stroke="currentColor" stroke-width="1.8" />
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M2.66821 8.00002C2.66821 7.63275 2.96594 7.33502 3.33321 7.33502H12.6665C13.0338 7.33502 13.3315 7.63275 13.3315 8.00002C13.3315 8.36729 13.0338 8.66502 12.6665 8.66502H3.33321C2.96594 8.66502 2.66821 8.36729 2.66821 8.00002Z" fill="currentColor"/>
 </svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/ResizeWindow.svg b/packages/manager/src/assets/icons/ResizeWindow.svg
index c9ea7c2201a..17d9056b31e 100644
--- a/packages/manager/src/assets/icons/ResizeWindow.svg
+++ b/packages/manager/src/assets/icons/ResizeWindow.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" mirror-in-rtl="true">
-  <path fill="currentColor" d="M14.228 16.227a1 1 0 0 1-.707-1.707l1-1a1 1 0 0 1 1.416 1.414l-1 1a1 1 0 0 1-.707.293zm-5.638 0a1 1 0 0 1-.707-1.707l6.638-6.638a1 1 0 0 1 1.416 1.414l-6.638 6.638a1 1 0 0 1-.707.293zm-5.84 0a1 1 0 0 1-.707-1.707L14.52 2.043a1 1 0 1 1 1.415 1.414L3.457 15.934a1 1 0 0 1-.707.293z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8" viewBox="0 0 8 8" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M7.35356 1.35353L1.35356 7.35353L0.646454 6.64642L6.64645 0.646423L7.35356 1.35353Z" fill="currentColor"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M7.35356 4.85353L4.85356 7.35353L4.14645 6.64642L6.64645 4.14642L7.35356 4.85353Z" fill="currentColor"/>
 </svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/arrow-down.svg b/packages/manager/src/assets/icons/arrow-down.svg
index 31850bef730..faad9650a57 100644
--- a/packages/manager/src/assets/icons/arrow-down.svg
+++ b/packages/manager/src/assets/icons/arrow-down.svg
@@ -1,3 +1,3 @@
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9.99996 3.33167C10.4611 3.33167 10.835 3.70551 10.835 4.16667V13.8175L13.5762 11.0762C13.9023 10.7501 14.431 10.7501 14.7571 11.0762C15.0831 11.4023 15.0831 11.931 14.7571 12.2571L10.5904 16.4238C10.2643 16.7499 9.73561 16.7499 9.40952 16.4238L5.24286 12.2571C4.91677 11.931 4.91677 11.4023 5.24286 11.0762C5.56894 10.7501 6.09764 10.7501 6.42373 11.0762L9.16496 13.8175V4.16667C9.16496 3.70551 9.5388 3.33167 9.99996 3.33167Z" fill="#3D3D42"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.99996 3.33167C10.4611 3.33167 10.835 3.70551 10.835 4.16667V13.8175L13.5762 11.0762C13.9023 10.7501 14.431 10.7501 14.7571 11.0762C15.0831 11.4023 15.0831 11.931 14.7571 12.2571L10.5904 16.4238C10.2643 16.7499 9.73561 16.7499 9.40952 16.4238L5.24286 12.2571C4.91677 11.931 4.91677 11.4023 5.24286 11.0762C5.56894 10.7501 6.09764 10.7501 6.42373 11.0762L9.16496 13.8175V4.16667C9.16496 3.70551 9.5388 3.33167 9.99996 3.33167Z" fill="currentColor"/>
 </svg>
diff --git a/packages/manager/src/assets/icons/arrow-up.svg b/packages/manager/src/assets/icons/arrow-up.svg
index c08fd2dee22..5a84aed6d22 100644
--- a/packages/manager/src/assets/icons/arrow-up.svg
+++ b/packages/manager/src/assets/icons/arrow-up.svg
@@ -1,3 +1,3 @@
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9.40952 3.57623C9.73561 3.25014 10.2643 3.25014 10.5904 3.57623L14.7571 7.7429C15.0831 8.06898 15.0831 8.59768 14.7571 8.92377C14.431 9.24985 13.9023 9.24985 13.5762 8.92377L10.835 6.18253V15.8333C10.835 16.2945 10.4611 16.6683 9.99996 16.6683C9.5388 16.6683 9.16496 16.2945 9.16496 15.8333V6.18253L6.42373 8.92377C6.09764 9.24985 5.56894 9.24985 5.24286 8.92377C4.91677 8.59768 4.91677 8.06898 5.24286 7.7429L9.40952 3.57623Z" fill="#3D3D42"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.40952 3.57623C9.73561 3.25014 10.2643 3.25014 10.5904 3.57623L14.7571 7.7429C15.0831 8.06898 15.0831 8.59768 14.7571 8.92377C14.431 9.24985 13.9023 9.24985 13.5762 8.92377L10.835 6.18253V15.8333C10.835 16.2945 10.4611 16.6683 9.99996 16.6683C9.5388 16.6683 9.16496 16.2945 9.16496 15.8333V6.18253L6.42373 8.92377C6.09764 9.24985 5.56894 9.24985 5.24286 8.92377C4.91677 8.59768 4.91677 8.06898 5.24286 7.7429L9.40952 3.57623Z" fill="currentColor"/>
 </svg>
diff --git a/packages/manager/src/assets/icons/caution.svg b/packages/manager/src/assets/icons/caution.svg
index 9d5f060687b..6073595fbd3 100644
--- a/packages/manager/src/assets/icons/caution.svg
+++ b/packages/manager/src/assets/icons/caution.svg
@@ -1,6 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-  <g fill="none" fill-rule="evenodd" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" transform="translate(1 1)">
-    <path d="M11 15.125C10.81025 15.125 10.65625 15.279 10.65625 15.46875 10.65625 15.6585 10.81025 15.8125 11 15.8125 11.18975 15.8125 11.34375 15.6585 11.34375 15.46875 11.34375 15.279 11.18975 15.125 11 15.125L11 15.125M11 12.375L11 5.5"/>
-    <path d="M1.17333333,12.17425 C0.52525,11.5261667 0.52525,10.47475 1.17333333,9.82666667 L9.82666667,1.17425 C10.4729167,0.526166667 11.5225,0.52525 12.1705833,1.1715 C12.1715,1.17241667 12.1724167,1.17333333 12.1733333,1.17425 L20.8266667,9.82666667 C21.47475,10.47475 21.47475,11.5261667 20.8266667,12.17425 L12.1733333,20.8266667 C11.52525,21.4738333 10.47475,21.4738333 9.82666667,20.8266667 L1.17333333,12.17425 Z"/>
-  </g>
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.9999 8.5C12.5522 8.5 12.9999 8.94772 12.9999 9.5V13.5C12.9999 14.0523 12.5522 14.5 11.9999 14.5C11.4477 14.5 10.9999 14.0523 10.9999 13.5V9.5C10.9999 8.94772 11.4477 8.5 11.9999 8.5Z" fill="currentColor"/>
+<path d="M12.9999 17C12.9999 17.5523 12.5522 18 11.9999 18C11.4477 18 10.9999 17.5523 10.9999 17C10.9999 16.4477 11.4477 16 11.9999 16C12.5522 16 12.9999 16.4477 12.9999 17Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.6982 2.34297C11.0976 2.11812 11.5481 2 12.0065 2C12.4648 2 12.9153 2.11812 13.3147 2.34297C13.7141 2.56782 14.0488 2.8918 14.2865 3.28366C14.2968 3.30065 14.3066 3.31794 14.3158 3.33552L21.8015 17.5184C22.0275 17.9171 22.147 18.3674 22.1483 18.826C22.1496 19.2916 22.0289 19.7494 21.7984 20.154C21.5678 20.5585 21.2353 20.8956 20.834 21.1317C20.4327 21.3679 19.9765 21.4948 19.5109 21.4999L19.4999 21.5001L4.48892 21.5C4.02331 21.4949 3.56717 21.3679 3.16586 21.1317C2.76455 20.8956 2.43207 20.5585 2.20149 20.154C1.97091 19.7494 1.85027 19.2916 1.85157 18.826C1.85286 18.3673 1.97243 17.9168 2.19857 17.518L9.69741 3.33488C9.70659 3.31752 9.71628 3.30044 9.72646 3.28366C9.96415 2.8918 10.2988 2.56782 10.6982 2.34297ZM12.0065 4C11.8919 4 11.7792 4.02953 11.6794 4.08574C11.5862 4.13822 11.5071 4.21229 11.4486 4.3016L3.95895 18.4674C3.95314 18.4784 3.94712 18.4893 3.9409 18.5001C3.88269 18.6009 3.85189 18.7152 3.85157 18.8316C3.85124 18.948 3.8814 19.0624 3.93904 19.1636C3.99669 19.2647 4.07981 19.349 4.18014 19.408C4.27924 19.4663 4.3917 19.498 4.50661 19.5H19.4932C19.6081 19.498 19.7206 19.4663 19.8197 19.408C19.92 19.349 20.0032 19.2647 20.0608 19.1636C20.1185 19.0624 20.1486 18.948 20.1483 18.8316C20.148 18.7152 20.1172 18.6009 20.059 18.5001C20.0553 18.4938 20.0518 18.4875 20.0483 18.4812C20.0457 18.4764 20.0431 18.4716 20.0406 18.4668L12.5641 4.30137C12.5057 4.21216 12.4266 4.13817 12.3335 4.08574C12.2337 4.02953 12.121 4 12.0065 4Z" fill="currentColor"/>
 </svg>
diff --git a/packages/manager/src/assets/icons/chat.svg b/packages/manager/src/assets/icons/chat.svg
index 3ed66931c0f..42e1da7e6bb 100644
--- a/packages/manager/src/assets/icons/chat.svg
+++ b/packages/manager/src/assets/icons/chat.svg
@@ -1,9 +1,3 @@
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve" fill="none">
-	 <desc>Linode Support Bot</desc>
-	<circle id="background" class="outerCircle" stroke-width="2" cx="31.9" cy="31.9" r="29.9"></circle>
-	<g id="chat" class="insidePath" transform="translate(14.000000, 15.000000)">
-		<polygon id="Stroke-1006" points="32.4,13.1 14.9,13.1 9.1,17.7 9.1,13.1 2.6,13.1 2.6,2.7 32.4,2.7"/>
-		<polyline id="Stroke-1007" points="5.9,17 2.6,17 2.6,26.1 20.1,26.1 25.9,31.3 25.9,26.1 32.4,26.1 32.4,17 15.6,17"/>
-	</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M5 4C4.73478 4 4.48043 4.10536 4.29289 4.29289C4.10536 4.48043 4 4.73478 4 5V18.5858L6.29289 16.2929C6.48043 16.1054 6.73478 16 7 16H19C19.2652 16 19.5196 15.8946 19.7071 15.7071C19.8946 15.5196 20 15.2652 20 15V5C20 4.73478 19.8946 4.48043 19.7071 4.29289C19.5196 4.10536 19.2652 4 19 4H5ZM2.87868 2.87868C3.44129 2.31607 4.20435 2 5 2H19C19.7957 2 20.5587 2.31607 21.1213 2.87868C21.6839 3.44129 22 4.20435 22 5V15C22 15.7957 21.6839 16.5587 21.1213 17.1213C20.5587 17.6839 19.7957 18 19 18H7.41421L3.70711 21.7071C3.42111 21.9931 2.99099 22.0787 2.61732 21.9239C2.24364 21.7691 2 21.4045 2 21V5C2 4.20435 2.31607 3.44129 2.87868 2.87868Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/checkmark-enabled.svg b/packages/manager/src/assets/icons/checkmark-enabled.svg
index 3fd216c9113..a7894d0300f 100644
--- a/packages/manager/src/assets/icons/checkmark-enabled.svg
+++ b/packages/manager/src/assets/icons/checkmark-enabled.svg
@@ -1,11 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="26px" height="26px" viewBox="0 0 26 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="TFA-–-Google-selected-state_blue" transform="translate(-752.000000, -373.000000)" stroke="#4D91E0">
-            <g id="Group-14" transform="translate(752.000000, 373.000000)">
-                <circle id="Oval" cx="13" cy="13" r="12.5"></circle>
-                <polyline id="Path" stroke-width="2.5" points="6.01669312 14.4675751 10.907074 19.0117264 20.3579407 8.12538147"></polyline>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22ZM16.8222 9.56921C17.1366 9.11513 17.0233 8.49217 16.5692 8.17781C16.1151 7.86344 15.4922 7.97671 15.1778 8.43079L11.3089 14.0192L8.65079 11.7407C8.23147 11.3813 7.60017 11.4299 7.24074 11.8492C6.88132 12.2685 6.92988 12.8998 7.34921 13.2593L10.8492 16.2593C11.0642 16.4435 11.3472 16.528 11.628 16.4918C11.9088 16.4556 12.161 16.302 12.3222 16.0692L16.8222 9.56921Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/code-file.svg b/packages/manager/src/assets/icons/code-file.svg
index 9c6bcd734a0..4786f37bf26 100755
--- a/packages/manager/src/assets/icons/code-file.svg
+++ b/packages/manager/src/assets/icons/code-file.svg
@@ -1,6 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-    <g fill="none" fill-rule="evenodd" stroke="#3683DC" stroke-linecap="round" stroke-linejoin="round">
-        <path d="M14 14.502c0 .552-.448 1-1 1H1c-.552 0-1-.448-1-1v-13c0-.552.448-1 1-1h10.03c.261 0 .512.102.699.285l1.97 1.921c.192.188.301.446.301.716v11.078z" transform="translate(1)"/>
-        <path d="M8.53 6.002L11.03 8.502 8.53 11.002M5.53 6.002L3.03 8.502 5.53 11.002" transform="translate(1)"/>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M5.00166 3.3695L5.00167 16.6306C5.00577 16.6364 5.01111 16.6428 5.01752 16.6492C5.02392 16.6556 5.03035 16.6609 5.03613 16.665H7.49931L7.49998 18.335H5C4.52009 18.335 4.11008 18.1035 3.83664 17.8301C3.5632 17.5566 3.33167 17.1466 3.33167 16.6667L3.33167 3.33337C3.33167 2.85347 3.56321 2.44346 3.83664 2.17002C4.11008 1.89659 4.52009 1.66504 4.99999 1.66504H15C15.4799 1.66504 15.8899 1.89658 16.1633 2.17002C16.4368 2.44346 16.6683 2.85347 16.6683 3.33337V8.33332H14.9983V3.36951C14.9942 3.36372 14.9889 3.3573 14.9825 3.35089C14.9761 3.34448 14.9696 3.33914 14.9639 3.33504H5.03613C5.03035 3.33914 5.02392 3.34448 5.01752 3.35089C5.01111 3.3573 5.00577 3.36372 5.00166 3.3695ZM7.49998 18.335C7.96113 18.335 8.335 17.9612 8.335 17.5C8.335 17.0389 7.96047 16.665 7.49931 16.665L7.49998 18.335ZM5 16.665L5.00167 16.665L5 16.665ZM15.8333 9.16837C15.3722 9.16837 14.9983 8.79448 14.9983 8.33332H16.6683C16.6683 8.79448 16.2945 9.16837 15.8333 9.16837Z" fill="currentColor"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M12.9167 11.6684C11.767 11.6684 10.835 12.6004 10.835 13.75C10.835 14.8997 11.767 15.8317 12.9167 15.8317C13.543 15.8317 14.104 15.5561 14.4868 15.1168C14.806 14.7506 14.9983 14.2738 14.9983 13.75C14.9983 12.6004 14.0663 11.6684 12.9167 11.6684ZM9.165 13.75C9.165 11.6781 10.8447 9.99837 12.9167 9.99837C14.9887 9.99837 16.6683 11.6781 16.6683 13.75C16.6683 14.3998 16.5026 15.0118 16.2116 15.5452L17.6529 16.8894C17.9901 17.204 18.0085 17.7323 17.694 18.0696C17.3794 18.4068 16.851 18.4252 16.5138 18.1107L15.1055 16.7972C14.4898 17.2401 13.7335 17.5017 12.9167 17.5017C10.8447 17.5017 9.165 15.822 9.165 13.75Z" fill="currentColor"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M6.835 5.41671C6.835 5.04944 7.13273 4.75171 7.5 4.75171H12.5C12.8673 4.75171 13.165 5.04944 13.165 5.41671C13.165 5.78398 12.8673 6.08171 12.5 6.08171H7.5C7.13273 6.08171 6.835 5.78398 6.835 5.41671Z" fill="currentColor"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M6.835 7.91671C6.835 7.54944 7.13273 7.25171 7.5 7.25171H10C10.3673 7.25171 10.665 7.54944 10.665 7.91671C10.665 8.28398 10.3673 8.58171 10 8.58171H7.5C7.13273 8.58171 6.835 8.28398 6.835 7.91671Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/community.svg b/packages/manager/src/assets/icons/community.svg
index c999ea0ee3a..47de15bf21f 100644
--- a/packages/manager/src/assets/icons/community.svg
+++ b/packages/manager/src/assets/icons/community.svg
@@ -1,13 +1,8 @@
-<svg viewBox="0 0 60.8 60.8" xmlns="http://www.w3.org/2000/svg">
-  <g fill="none" stroke="currentColor" stroke-miterlimit="10">
-  <circle class="outerCircle" cx="30.4" cy="30.4" r="29.9"/>
-    <g id="community" class="insidePath">
-    <path d="m37.91 32.45a7.22 7.22 0 0 0 -6.91-5.27h-.49a7.22 7.22 0 0 0 -7 5.48 5.16 5.16 0 0 1 1.8 3.92v5.56h10.54v-5.56a5.16 5.16 0 0 1 2.06-4.13z"/>
-      <circle cx="30.72" cy="19.12" r="5.68"/>
-      <circle cx="41.22" cy="25.6" r="4.08"/>
-      <path d="m41.39 31.4h-.39a5.17 5.17 0 0 0 -3.13 1.05 7 7 0 0 1 .27 1.95v7.74h8.4v-5.56a5.18 5.18 0 0 0 -5.15-5.18z"/>
-      <circle cx="19.9" cy="25.6" r="4.08"/>
-      <path d="m23.46 32.66a5.14 5.14 0 0 0 -3.39-1.26h-.35a5.19 5.19 0 0 0 -5.19 5.18v5.56h8.72v-7.74a7.15 7.15 0 0 1 .21-1.74z"/>
-    </g>
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M6.17585 15.5406C6.94917 14.5888 8.04794 13.9996 9.25006 13.9996H14.75C15.9521 13.9996 17.0509 14.5888 17.8242 15.5406C18.5929 16.4867 19 17.733 19 18.9996L19 19.9996C19 20.5519 18.5523 20.9996 18 20.9996C17.4477 20.9996 17 20.5519 17 19.9996L17 18.9996C17 18.1445 16.7222 17.356 16.272 16.8018C15.8263 16.2533 15.2718 15.9996 14.75 15.9996H9.25006C8.72828 15.9996 8.17375 16.2533 7.72808 16.8018C7.27781 17.356 7.00006 18.1445 7.00006 18.9996L7.00007 19.9996C7.00007 20.5519 6.55235 20.9996 6.00007 20.9996C5.44778 20.9996 5.00007 20.5519 5.00007 19.9996L5.00006 18.9996C5.00006 17.733 5.40714 16.4867 6.17585 15.5406Z" fill="currentColor"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M16.75 10.9996C16.75 10.4474 17.1977 9.99964 17.75 9.99964C18.9521 9.99964 20.0509 10.5889 20.8242 11.5406C21.5929 12.4867 22 13.733 22 14.9996L22 15.9996C22 16.5519 21.5523 16.9997 21 16.9997C20.4477 16.9997 20 16.5519 20 15.9997L20 14.9996C20 14.1445 19.7223 13.356 19.272 12.8018C18.8263 12.2533 18.2718 11.9996 17.75 11.9996C17.1977 11.9996 16.75 11.5519 16.75 10.9996Z" fill="currentColor"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M7.25 10.9996C7.25 10.4473 6.80229 9.99963 6.25 9.99963C5.04788 9.99963 3.94911 10.5888 3.17579 11.5406C2.40708 12.4867 2 13.733 2 14.9996L2 15.9996C2 16.5519 2.44771 16.9996 3 16.9996C3.55228 16.9996 4 16.5519 4 15.9996L4 14.9996C4 14.1445 4.27775 13.356 4.72802 12.8018C5.17369 12.2533 5.72822 11.9996 6.25 11.9996C6.80229 11.9996 7.25 11.5519 7.25 10.9996Z" fill="currentColor"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M12 7.99964C11.1716 7.99964 10.5 8.67122 10.5 9.49964C10.5 10.3281 11.1716 10.9996 12 10.9996C12.8284 10.9996 13.5 10.3281 13.5 9.49964C13.5 8.67122 12.8284 7.99964 12 7.99964ZM8.5 9.49964C8.5 7.56665 10.067 5.99964 12 5.99964C13.933 5.99964 15.5 7.56665 15.5 9.49964C15.5 11.4326 13.933 12.9996 12 12.9996C10.067 12.9996 8.5 11.4326 8.5 9.49964Z" fill="currentColor"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M14.5515 4.45954C14.2753 3.98125 14.4392 3.36966 14.9175 3.09352C16.5915 2.12702 18.7321 2.70058 19.6986 4.37461C20.6651 6.04863 20.0915 8.1892 18.4175 9.1557C17.9392 9.43184 17.3276 9.26796 17.0515 8.78967C16.7753 8.31138 16.9392 7.69979 17.4175 7.42365C18.1349 7.00943 18.3807 6.09205 17.9665 5.37461C17.5523 4.65717 16.6349 4.41136 15.9175 4.82557C15.4392 5.10171 14.8276 4.93784 14.5515 4.45954Z" fill="currentColor"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M9.36605 4.49962C9.64219 4.02133 9.47831 3.40974 9.00002 3.13359C7.326 2.1671 5.18543 2.74066 4.21893 4.41468C3.25243 6.08871 3.826 8.22927 5.50002 9.19577C5.97831 9.47192 6.5899 9.30804 6.86605 8.82975C7.14219 8.35145 6.97831 7.73986 6.50002 7.46372C5.78258 7.04951 5.53677 6.13212 5.95098 5.41468C6.3652 4.69724 7.28258 4.45143 8.00002 4.86565C8.47831 5.14179 9.0899 4.97791 9.36605 4.49962Z" fill="currentColor"/>
 </svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/copy.svg b/packages/manager/src/assets/icons/copy.svg
index 36ad859323b..f5503f2d7a2 100644
--- a/packages/manager/src/assets/icons/copy.svg
+++ b/packages/manager/src/assets/icons/copy.svg
@@ -1 +1,3 @@
-<svg enable-background="new 0 0 193.6 224.6" viewBox="0 0 193.6 224.6" xmlns="http://www.w3.org/2000/svg"><path d="m174.6 224.6h-112.8c-10.5 0-19-8.5-19-19v-146.1c0-10.5 8.5-19 19-19h112.8c10.5 0 19 8.5 19 19v146.1c0 10.5-8.5 19-19 19zm-110.7-21h108.8v-142.1h-108.8zm-42.9-182.6h122.8v-21h-124.8c-10.5 0-19 8.5-19 19v143.9h21z" fill="currentColor"/></svg>
\ No newline at end of file
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.54102 3.54108C3.67294 3.40915 3.85187 3.33504 4.03844 3.33504H10.9615C11.1481 3.33504 11.327 3.40915 11.4589 3.54108C11.5909 3.673 11.665 3.85193 11.665 4.0385V4.80773C11.665 5.26889 12.0388 5.64273 12.5 5.64273C12.9611 5.64273 13.335 5.26889 13.335 4.80773V4.0385C13.335 3.40902 13.0849 2.80532 12.6398 2.36021C12.1947 1.9151 11.591 1.66504 10.9615 1.66504H4.03844C3.40896 1.66504 2.80526 1.9151 2.36015 2.36021C1.91504 2.80532 1.66498 3.40902 1.66498 4.0385V10.9616C1.66498 11.5911 1.91504 12.1948 2.36015 12.6399C2.80526 13.085 3.40896 13.335 4.03844 13.335H4.80767C5.26883 13.335 5.64267 12.9612 5.64267 12.5C5.64267 12.0389 5.26883 11.665 4.80767 11.665H4.03844C3.85187 11.665 3.67294 11.5909 3.54102 11.459C3.40909 11.3271 3.33498 11.1481 3.33498 10.9616V4.0385C3.33498 3.85193 3.40909 3.673 3.54102 3.54108ZM8.33498 9.0385C8.33498 8.64999 8.64993 8.33504 9.03844 8.33504H15.9615C16.35 8.33504 16.665 8.64999 16.665 9.0385V15.9616C16.665 16.3501 16.35 16.665 15.9615 16.665H9.03844C8.64993 16.665 8.33498 16.3501 8.33498 15.9616V9.0385ZM9.03844 6.66504C7.72761 6.66504 6.66498 7.72767 6.66498 9.0385V15.9616C6.66498 17.2724 7.72761 18.335 9.03844 18.335H15.9615C17.2723 18.335 18.335 17.2724 18.335 15.9616V9.0385C18.335 7.72767 17.2723 6.66504 15.9615 6.66504H9.03844Z" fill="currentColor"/>
+</svg>
diff --git a/packages/manager/src/assets/icons/credit-card.svg b/packages/manager/src/assets/icons/credit-card.svg
index 3a26b0b5724..5af38da3f5f 100755
--- a/packages/manager/src/assets/icons/credit-card.svg
+++ b/packages/manager/src/assets/icons/credit-card.svg
@@ -1,5 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="25" viewBox="0 0 24 25">
-    <g fill="none" fill-rule="evenodd" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5">
-        <path d="M1.737.16h20.526c.872 0 1.58.72 1.58 1.608v14.464c0 .887-.708 1.607-1.58 1.607H1.737c-.872 0-1.58-.72-1.58-1.607V1.768C.158.88.866.16 1.738.16zM.158 4.982L23.842 4.982M4.895 9.804L13.579 9.804M4.895 13.018L10.421 13.018" transform="translate(0 3.917)"/>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path d="M20 4H4C2.897 4 2 4.897 2 6V8H22V6C22 4.897 21.103 4 20 4ZM2 18C2 19.103 2.897 20 4 20H20C21.103 20 22 19.103 22 18V12H2V18ZM5 15H11V17H5V15Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/db-logo.svg b/packages/manager/src/assets/icons/db-logo.svg
index 5776006d284..2fe5c3a22b9 100644
--- a/packages/manager/src/assets/icons/db-logo.svg
+++ b/packages/manager/src/assets/icons/db-logo.svg
@@ -1,23 +1,12 @@
-<svg width="59" height="18" viewBox="0 0 59 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_693_1607)">
-<path d="M13.7434 11.556C14.0539 11.556 14.3533 11.6115 14.6305 11.7113C15.074 11.2012 15.3069 10.6468 15.3069 10.0701C15.3069 9.12761 14.6637 8.21833 13.5105 7.50866C12.2686 6.75462 10.6053 6.33325 8.84216 6.33325C7.06797 6.33325 5.40466 6.75462 4.17381 7.50866C3.0095 8.21833 2.37744 9.12761 2.37744 10.0701C2.37744 10.6468 2.6103 11.2012 3.05385 11.7113C3.33107 11.6115 3.63047 11.556 3.94095 11.556C4.63954 11.556 5.29377 11.8222 5.78168 12.3212C6.12543 12.6649 6.35829 13.0863 6.46918 13.552C7.21212 13.7294 8.01051 13.8181 8.84216 13.8181C9.67381 13.8181 10.4611 13.7294 11.2151 13.552C11.326 13.0974 11.5589 12.6649 11.9026 12.3212C12.3905 11.8333 13.0448 11.556 13.7434 11.556ZM8.84216 9.38265C8.04377 9.38265 7.38954 8.72841 7.38954 7.93003H10.2948C10.2948 8.72841 9.64055 9.38265 8.84216 9.38265Z" fill="#303030"/>
-<path d="M3.808 6.83221C3.95215 6.7435 4.0963 6.66588 4.24046 6.58826H4.22937C3.86344 6.31104 3.43098 6.17798 2.99852 6.17798C2.37755 6.17798 1.76767 6.4552 1.36848 6.98745L1.20215 7.22032L2.35537 8.08524C2.7213 7.61951 3.20921 7.19814 3.808 6.83221Z" fill="#303030"/>
-<path d="M2.37754 12.0771C1.98943 11.5781 1.74548 11.0348 1.67895 10.4692C1.65677 10.3362 1.64568 10.2031 1.64568 10.07C1.64568 9.40471 1.86746 8.77266 2.27774 8.19604H2.13358C1.00254 8.19604 0.0932617 9.11641 0.0932617 10.2364V10.5247H1.61242C1.21322 10.8573 0.958181 11.312 0.891649 11.8221C0.814028 12.3654 0.958181 12.8977 1.29084 13.3301L1.41282 13.4964C1.52371 13.0529 1.75657 12.6537 2.08923 12.321C2.17794 12.2323 2.27774 12.1547 2.37754 12.0771Z" fill="#303030"/>
-<path d="M15.3182 8.08524L16.4714 7.22032L16.3051 6.98745C15.9059 6.4552 15.296 6.17798 14.675 6.17798C14.2426 6.17798 13.8212 6.31104 13.4442 6.58826H13.4331C13.5773 6.66588 13.7325 6.7435 13.8656 6.83221C14.4754 7.19814 14.9633 7.61951 15.3182 8.08524Z" fill="#303030"/>
-<path d="M17.5913 10.2364C17.5913 9.10532 16.6709 8.19604 15.5509 8.19604H15.3957C15.8171 8.77266 16.0278 9.4158 16.0278 10.07C16.0278 10.2031 16.0167 10.3362 15.9945 10.4692C15.9169 11.0348 15.6729 11.5781 15.2959 12.0771C15.3957 12.1547 15.4955 12.2323 15.5842 12.321C15.9169 12.6537 16.1497 13.0529 16.2606 13.4964L16.3826 13.3301C16.7153 12.8977 16.8594 12.3543 16.7818 11.8221C16.7153 11.312 16.4602 10.8462 16.061 10.5247H17.5802V10.2364H17.5913Z" fill="#303030"/>
-<path d="M6.38065 5.86751C7.5117 5.86751 8.42098 4.94715 8.42098 3.82719C8.42098 2.69614 7.50061 1.78687 6.38065 1.78687C5.24961 1.78687 4.34033 2.70723 4.34033 3.82719C4.34033 4.94715 5.26069 5.86751 6.38065 5.86751ZM6.38065 2.70723C6.24759 2.85138 6.15888 3.05098 6.15888 3.27275C6.15888 3.70521 6.51372 4.06005 6.94618 4.06005C7.16795 4.06005 7.36755 3.97134 7.5117 3.82719V3.83828C7.5117 4.45924 7.01271 4.95824 6.39174 4.95824C5.77078 4.95824 5.27178 4.45924 5.27178 3.83828C5.26069 3.20622 5.75969 2.70723 6.38065 2.70723Z" fill="#303030"/>
-<path d="M11.2928 5.86751C12.4238 5.86751 13.3331 4.94715 13.3331 3.82719C13.3331 2.69614 12.4127 1.78687 11.2928 1.78687C10.1617 1.78687 9.25244 2.70723 9.25244 3.82719C9.25244 4.94715 10.1728 5.86751 11.2928 5.86751ZM11.2928 2.70723C11.3039 2.70723 11.3039 2.70723 11.2928 2.70723C11.1597 2.85138 11.071 3.05098 11.071 3.27275C11.071 3.70521 11.4258 4.06005 11.8583 4.06005C12.0801 4.06005 12.2797 3.97134 12.4238 3.82719V3.83828C12.4238 4.45924 11.9248 4.95824 11.3039 4.95824C10.6829 4.95824 10.1839 4.45924 10.1839 3.83828C10.1728 3.20622 10.6829 2.70723 11.2928 2.70723Z" fill="#303030"/>
-<path d="M3.9412 12.1216C2.81015 12.1216 1.90088 13.0309 1.90088 14.1619C1.90088 15.293 2.81015 16.2022 3.9412 16.2022C4.17406 16.2022 4.40693 16.1579 4.61761 16.0803C4.59544 16.0581 4.57326 16.047 4.56217 16.0248C3.97447 15.4371 3.76378 14.672 4.11862 14.3282C4.46237 13.9845 5.22749 14.1841 5.81519 14.7718C5.83737 14.794 5.84846 14.8161 5.87064 14.8272C5.94826 14.6165 5.99261 14.3948 5.99261 14.1508C5.98152 13.0419 5.06116 12.1216 3.9412 12.1216Z" fill="#303030"/>
-<path d="M13.7434 12.1216C12.6124 12.1216 11.7031 13.0309 11.7031 14.1619C11.7031 14.3948 11.7475 14.6276 11.8251 14.8383C11.8473 14.8161 11.8584 14.794 11.8805 14.7829C12.4682 14.1952 13.2334 13.9845 13.5771 14.3393C13.9209 14.6831 13.7213 15.4482 13.1336 16.0359C13.1114 16.0581 13.1003 16.0692 13.0781 16.0913C13.2888 16.169 13.5106 16.2133 13.7545 16.2133C14.8856 16.2133 15.7949 15.304 15.7949 14.173C15.7838 13.0419 14.8745 12.1216 13.7434 12.1216Z" fill="#303030"/>
-<path d="M25.9068 6.37183C26.5389 6.37183 27.0711 6.44945 27.4925 6.60469C27.925 6.75993 28.2687 6.98171 28.5238 7.27001C28.7788 7.55832 28.9673 7.90207 29.0782 8.30126C29.1891 8.70046 29.2445 9.144 29.2445 9.63191V14.6218C28.9562 14.6884 28.5127 14.766 27.9139 14.8547C27.3262 14.9434 26.6498 14.9878 25.9068 14.9878C25.4189 14.9878 24.9643 14.9434 24.554 14.8436C24.1437 14.7549 23.8 14.5996 23.5117 14.389C23.2234 14.1783 23.0016 13.9011 22.8353 13.5684C22.6689 13.2357 22.5913 12.8144 22.5913 12.3265C22.5913 11.8496 22.68 11.4615 22.8685 11.1289C23.057 10.8073 23.301 10.5412 23.6115 10.3305C23.922 10.1309 24.2879 9.97566 24.7093 9.88695C25.1195 9.79824 25.552 9.75388 26.0066 9.75388C26.2173 9.75388 26.4391 9.76497 26.672 9.79824C26.9048 9.82042 27.1488 9.86477 27.4149 9.9313V9.62082C27.4149 9.39904 27.3927 9.18836 27.3373 8.98876C27.2818 8.78916 27.1931 8.61175 27.0601 8.4565C26.927 8.30126 26.7607 8.19037 26.5389 8.10166C26.3282 8.01296 26.051 7.97969 25.7294 7.97969C25.2859 7.97969 24.8867 8.01296 24.5207 8.07949C24.1548 8.14602 23.8554 8.21255 23.6226 8.30126L23.3897 6.75993C23.6336 6.67122 23.9774 6.5936 24.4431 6.50489C24.8867 6.41618 25.3746 6.37183 25.9068 6.37183ZM26.0621 13.4686C26.6498 13.4686 27.0933 13.4353 27.4038 13.3799V11.273C27.304 11.2398 27.1488 11.2065 26.9492 11.1843C26.7496 11.1511 26.5278 11.14 26.2838 11.14C26.0732 11.14 25.8625 11.1511 25.6518 11.1843C25.4411 11.2176 25.2415 11.273 25.0752 11.3617C24.8978 11.4505 24.7647 11.5613 24.6538 11.7166C24.554 11.8718 24.4986 12.0603 24.4986 12.2932C24.4986 12.7478 24.6427 13.0583 24.9199 13.2246C25.1972 13.3799 25.5742 13.4686 26.0621 13.4686Z" fill="#303030"/>
-<path d="M33.3807 4.17638C33.3807 4.53122 33.2698 4.81952 33.037 5.03021C32.8041 5.2409 32.538 5.34069 32.2164 5.34069C31.8948 5.34069 31.6176 5.2409 31.3848 5.03021C31.1519 4.81952 31.041 4.54231 31.041 4.17638C31.041 3.81045 31.1519 3.52215 31.3848 3.31146C31.6176 3.10077 31.8948 3.00098 32.2164 3.00098C32.5269 3.00098 32.8041 3.10077 33.037 3.31146C33.2588 3.52215 33.3807 3.81045 33.3807 4.17638ZM33.17 14.8105H31.2628V6.58263H33.17V14.8105Z" fill="#303030"/>
-<path d="M37.7164 14.8103C37.1952 13.7347 36.6519 12.4928 36.0974 11.0845C35.543 9.68736 35.044 8.17929 34.5894 6.58252H36.6186C36.7295 7.04825 36.8736 7.53615 37.0178 8.06841C37.173 8.60066 37.3283 9.13292 37.5057 9.65409C37.6831 10.1863 37.8605 10.6964 38.0379 11.1954C38.2265 11.6944 38.3928 12.138 38.548 12.5372C38.7033 12.138 38.8696 11.6944 39.0581 11.1954C39.2355 10.6964 39.4129 10.1863 39.5904 9.65409C39.7678 9.12183 39.9341 8.58958 40.0894 8.06841C40.2446 7.53615 40.3887 7.04825 40.4996 6.58252H42.4623C42.0077 8.19038 41.5087 9.68736 40.9543 11.0845C40.3998 12.4817 39.8565 13.7236 39.3353 14.8103H37.7164Z" fill="#303030"/>
-<path d="M42.9058 10.7298C42.9058 10.009 43.0166 9.37697 43.2273 8.82253C43.438 8.27919 43.7263 7.82455 44.0812 7.45862C44.436 7.09269 44.8463 6.82657 45.312 6.63806C45.7777 6.44955 46.2435 6.36084 46.7314 6.36084C47.8624 6.36084 48.7495 6.71568 49.3816 7.41427C50.0136 8.11286 50.3352 9.16628 50.3352 10.5635C50.3352 10.6633 50.3352 10.7852 50.3241 10.9183C50.3241 11.0514 50.313 11.1623 50.3019 11.2731H44.8796C44.935 11.9385 45.1679 12.4485 45.5781 12.8034C45.9884 13.1693 46.5983 13.3467 47.3745 13.3467C47.8402 13.3467 48.2616 13.3024 48.6386 13.2248C49.0267 13.136 49.3261 13.0473 49.5479 12.9586L49.8029 14.511C49.7031 14.5665 49.559 14.6219 49.3705 14.6774C49.182 14.7328 48.9824 14.7883 48.7384 14.8326C48.5056 14.877 48.2505 14.9213 47.9733 14.9546C47.6961 14.9879 47.4189 14.9989 47.1417 14.9989C46.4209 14.9989 45.7888 14.8881 45.2566 14.6774C44.7243 14.4667 44.2808 14.1673 43.937 13.7792C43.5933 13.3911 43.3382 12.9475 43.1608 12.4264C42.9945 11.9163 42.9058 11.3508 42.9058 10.7298ZM48.4279 9.88705C48.4279 9.62092 48.3947 9.37697 48.3171 9.14411C48.2394 8.91124 48.1396 8.70056 47.9955 8.53423C47.8513 8.35681 47.685 8.22374 47.4743 8.12394C47.2747 8.02415 47.0308 7.97979 46.7425 7.97979C46.4541 7.97979 46.188 8.03523 45.9662 8.14612C45.7445 8.25701 45.556 8.40116 45.4118 8.57858C45.2566 8.756 45.1457 8.96669 45.057 9.18846C44.9683 9.42132 44.9128 9.65419 44.8796 9.89814H48.4279V9.88705Z" fill="#303030"/>
-<path d="M52.0317 6.84882C52.3977 6.74902 52.8745 6.64923 53.4622 6.54943C54.0499 6.44963 54.7041 6.40527 55.4138 6.40527C56.0902 6.40527 56.6446 6.49398 57.0993 6.68249C57.5539 6.871 57.9088 7.12604 58.1749 7.4587C58.441 7.79136 58.6295 8.19056 58.7404 8.65628C58.8513 9.12201 58.9067 9.63209 58.9067 10.1865V14.8105H56.9995V10.4859C56.9995 10.0424 56.9662 9.66535 56.9108 9.36596C56.8553 9.05548 56.7555 8.80044 56.6225 8.61193C56.4894 8.42342 56.312 8.27927 56.0902 8.19056C55.8684 8.10185 55.5912 8.05749 55.2696 8.05749C55.0257 8.05749 54.7817 8.06858 54.5156 8.10185C54.2495 8.13511 54.061 8.15729 53.939 8.17947V14.8105H52.0317V6.84882Z" fill="#303030"/>
-</g>
-<defs>
-<clipPath id="clip0_693_1607">
-<rect width="58.8135" height="16.4264" fill="white" transform="translate(0.0932617 0.786865)"/>
-</clipPath>
-</defs>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="59" height="17" viewBox="0 0 85 24" fill="none">
+  <path d="M37.3505 7.52204C38.232 7.52204 38.9742 7.61485 39.5309 7.84687C40.134 8.07889 40.5979 8.35731 40.9691 8.77494C41.3402 9.19258 41.5722 9.65661 41.7113 10.2135C41.8505 10.7703 41.9433 11.3736 41.9433 12.0696V18.9374C41.5258 19.0302 40.9227 19.123 40.0876 19.2622C39.2526 19.4014 38.3247 19.4478 37.3041 19.4478C36.6546 19.4478 36.0052 19.4014 35.4485 19.2622C34.8918 19.123 34.4278 18.9374 34.0103 18.6125C33.5928 18.3341 33.3144 17.9629 33.0825 17.4988C32.8505 17.0348 32.7577 16.478 32.7577 15.7819C32.7577 15.1323 32.8969 14.5754 33.1289 14.1114C33.4072 13.6473 33.732 13.2761 34.1495 12.9977C34.567 12.7193 35.0773 12.4872 35.6804 12.3944C36.2371 12.2552 36.8402 12.2088 37.4897 12.2088C37.768 12.2088 38.0928 12.2088 38.4175 12.2552C38.7423 12.3016 39.067 12.348 39.4381 12.4408V12.0232C39.4381 11.7448 39.3918 11.42 39.3454 11.1415C39.2526 10.8631 39.1598 10.6311 38.9742 10.3991C38.7887 10.1671 38.5567 10.0278 38.232 9.88863C37.9536 9.74942 37.5825 9.70302 37.1186 9.70302C36.5155 9.70302 35.9588 9.74942 35.4485 9.84223C34.9381 9.93504 34.5206 10.0278 34.1959 10.1207L33.8711 7.98608C34.1959 7.84687 34.7062 7.75406 35.3093 7.61485C35.9588 7.61485 36.6082 7.52204 37.3505 7.52204ZM37.5825 17.3596C38.4175 17.3596 39.0206 17.3132 39.4381 17.2204V14.297C39.299 14.2506 39.067 14.2042 38.7887 14.1578C38.5103 14.1114 38.1856 14.1114 37.8608 14.1114C37.5825 14.1114 37.2577 14.1114 36.9794 14.1578C36.701 14.2042 36.4227 14.297 36.1907 14.3898C35.9588 14.529 35.7732 14.6682 35.5876 14.9002C35.4485 15.1323 35.3557 15.3643 35.3557 15.6891C35.3557 16.3387 35.5412 16.7564 35.9588 16.9884C36.3763 17.2204 36.8866 17.3596 37.5825 17.3596ZM47.6959 4.5058C47.6959 5.01624 47.5567 5.38747 47.232 5.7123C46.9072 6.03712 46.5361 6.08353 46.0722 6.08353C45.6082 6.08353 45.2371 5.94432 44.9124 5.66589C44.5876 5.38747 44.4485 5.01624 44.4485 4.4594C44.4485 3.90255 44.5876 3.57773 44.9124 3.2529C45.2371 2.97448 45.6082 2.83527 46.0722 2.83527C46.4897 2.83527 46.9072 2.97448 47.1856 3.2529C47.5103 3.57773 47.6959 3.99536 47.6959 4.5058ZM47.4175 19.2158H44.7732V7.84687H47.4175V19.2158ZM53.6804 19.2158C52.9381 17.7309 52.1959 16.0139 51.4536 14.065C50.7113 12.116 50.0155 10.0278 49.366 7.84687H52.1959C52.335 8.49652 52.567 9.19258 52.7526 9.88863C52.9845 10.6311 53.1701 11.3736 53.4021 12.0696C53.634 12.8121 53.9124 13.5081 54.1443 14.2042C54.4227 14.9002 54.6546 15.5035 54.8402 16.0603C55.0722 15.5035 55.3041 14.9002 55.5361 14.2042C55.768 13.5081 56.0464 12.8121 56.2784 12.0696C56.5103 11.3271 56.7423 10.5847 56.9742 9.88863C57.2062 9.14617 57.3918 8.49652 57.5309 7.84687H60.2216C59.5722 10.0742 58.8763 12.1624 58.134 14.065C57.3918 16.0139 56.6031 17.7309 55.9072 19.2158C55.9536 19.2158 53.6804 19.2158 53.6804 19.2158ZM60.8711 13.5545C60.8711 12.58 61.0103 11.6984 61.3351 10.9095C61.6134 10.1671 62.0309 9.5174 62.5412 9.00696C63.0515 8.49652 63.6082 8.12529 64.2577 7.89327C64.9072 7.61485 65.5567 7.52204 66.2062 7.52204C67.7835 7.52204 68.9897 8.03248 69.8711 8.96056C70.7526 9.93504 71.2165 11.3736 71.2165 13.3225C71.2165 13.4617 71.2165 13.6009 71.2165 13.8329C71.2165 14.0186 71.2165 14.1578 71.1701 14.3434H63.6546C63.7474 15.2715 64.0722 15.9675 64.6289 16.478C65.1856 16.9884 66.0206 17.2204 67.0876 17.2204C67.7371 17.2204 68.2938 17.174 68.8505 17.0348C69.3608 16.8956 69.8247 16.8028 70.1031 16.6636L70.4742 18.7981C70.3351 18.891 70.1495 18.9374 69.8711 19.0302C69.5928 19.123 69.3608 19.1694 68.9897 19.2622C68.6649 19.3086 68.3402 19.4014 67.9227 19.4478C67.5516 19.4942 67.1804 19.4942 66.7629 19.4942C65.7887 19.4942 64.9072 19.355 64.1649 19.0302C63.4227 18.7517 62.8196 18.3341 62.3557 17.7773C61.8918 17.2668 61.5206 16.6172 61.2887 15.9211C60.9639 15.2251 60.8711 14.4362 60.8711 13.5545ZM68.4794 12.3944C68.4794 12.0232 68.433 11.6984 68.3402 11.3736C68.2474 11.0487 68.1082 10.7703 67.8763 10.5383C67.6907 10.3063 67.4588 10.1207 67.134 9.98144C66.8557 9.84223 66.5309 9.79582 66.1134 9.79582C65.6959 9.79582 65.3711 9.88863 65.0464 10.0278C64.768 10.1671 64.4897 10.3991 64.3041 10.6311C64.0722 10.8631 63.933 11.1415 63.7938 11.4664C63.6546 11.7912 63.6082 12.116 63.5619 12.4408C63.6082 12.3944 68.4794 12.3944 68.4794 12.3944ZM73.4897 8.17169C74 8.03248 74.6495 7.89327 75.4845 7.75406C76.3196 7.61485 77.201 7.56845 78.1753 7.56845C79.1031 7.56845 79.8918 7.70766 80.4948 7.93968C81.1443 8.2181 81.6082 8.54292 81.9794 9.00696C82.3505 9.471 82.6289 10.0278 82.768 10.6775C82.9072 11.3271 83 12.0232 83 12.8121V19.2158H80.3557V13.2297C80.3557 12.6265 80.3093 12.116 80.2165 11.652C80.1237 11.2343 79.9845 10.8631 79.799 10.6311C79.6134 10.3527 79.3814 10.1671 79.0567 10.0278C78.7784 9.88863 78.3608 9.84223 77.9433 9.84223C77.6186 9.84223 77.2938 9.84223 76.9227 9.88863C76.5515 9.93504 76.2732 9.98144 76.134 9.98144V19.1694H73.4897V8.17169Z" fill="currentColor"/>
+  <path d="M20.8814 15.5035C21.299 15.5035 21.7165 15.5963 22.0876 15.7355C22.6907 15.0394 23.0155 14.2506 23.0155 13.4617C23.0155 12.1624 22.134 10.9095 20.5567 9.93504C18.8402 8.91415 16.5206 8.31091 14.1082 8.31091C11.6495 8.31091 9.37629 8.86775 7.65979 9.93504C6.03608 10.9095 5.20103 12.1624 5.20103 13.4617C5.20103 14.2506 5.52577 15.0394 6.12887 15.7355C6.54639 15.5963 6.91753 15.5035 7.33505 15.5035C8.30928 15.5035 9.19072 15.8747 9.8866 16.5708C10.3505 17.0348 10.6753 17.6381 10.8608 18.2413C11.8814 18.4733 12.9948 18.6125 14.1546 18.6125C15.3144 18.6125 16.3814 18.4733 17.4485 18.2413C17.5876 17.5916 17.9124 17.0348 18.4227 16.5708C19.0258 15.9211 19.9072 15.5035 20.8814 15.5035ZM14.1082 12.5336C12.9948 12.5336 12.1134 11.652 12.1134 10.5383H16.1031C16.1031 11.6056 15.2216 12.5336 14.1082 12.5336Z" fill="currentColor"/>
+  <path d="M7.14948 8.96056C7.33505 8.82135 7.56701 8.72854 7.75258 8.63573C7.24227 8.2645 6.63918 8.07889 6.08247 8.07889C5.20103 8.07889 4.36598 8.45012 3.80928 9.19258L3.57732 9.471L5.15464 10.6775C5.61856 10.0742 6.31443 9.471 7.14948 8.96056Z" fill="currentColor"/>
+  <path d="M5.15464 16.2459C4.64433 15.5499 4.2732 14.8074 4.18041 14.0186C4.13402 13.8329 4.13402 13.6473 4.13402 13.4617C4.13402 12.5336 4.41237 11.652 5.01546 10.8631H4.8299C3.25258 10.8631 2 12.116 2 13.6937V14.1114H4.08763C3.53093 14.5754 3.20619 15.2251 3.1134 15.9211C3.02062 16.6636 3.20619 17.406 3.6701 18.0093L3.85567 18.1949C4.04124 17.5916 4.31959 17.0348 4.78351 16.5708C4.87629 16.478 5.01546 16.3387 5.15464 16.2459Z" fill="currentColor"/>
+  <path d="M23.0619 10.7239L24.6392 9.5174L24.4072 9.19258C23.8505 8.45012 23.0155 8.07889 22.134 8.07889C21.5309 8.07889 20.9278 8.2645 20.4639 8.63573C20.6495 8.72854 20.8814 8.86775 21.067 8.96056C21.9021 9.471 22.5515 10.0742 23.0619 10.7239Z" fill="currentColor"/>
+  <path d="M26.1701 13.6937C26.1701 12.116 24.9175 10.8631 23.3402 10.8631H23.1546C23.7113 11.652 24.0361 12.5336 24.0361 13.4617C24.0361 13.6473 24.0361 13.8329 23.9897 14.0186C23.8969 14.8074 23.5722 15.5499 23.0155 16.2459C23.1546 16.3387 23.2938 16.478 23.433 16.5708C23.8969 17.0348 24.2216 17.5916 24.3608 18.1949L24.5464 17.9629C25.0103 17.3596 25.1959 16.6172 25.1031 15.8747C25.0103 15.1787 24.6392 14.529 24.1289 14.065H26.2165L26.1701 13.6937Z" fill="currentColor"/>
+  <path d="M10.6753 7.66125C12.2526 7.66125 13.5052 6.40835 13.5052 4.83063C13.5052 3.2529 12.2526 2 10.6753 2C9.09794 2 7.84536 3.2529 7.84536 4.83063C7.84536 6.40835 9.14433 7.66125 10.6753 7.66125ZM10.6753 3.2993C10.7217 3.2993 10.7217 3.2993 10.6753 3.2993C10.4897 3.48492 10.3505 3.76334 10.3505 4.08817C10.3505 4.69142 10.8608 5.20186 11.4639 5.20186C11.7423 5.20186 12.0206 5.06265 12.2526 4.87703C12.2526 5.7587 11.5567 6.45476 10.6753 6.45476C9.79381 6.45476 9.09794 5.7587 9.09794 4.87703C9.14433 3.94896 9.84021 3.2993 10.6753 3.2993Z" fill="currentColor"/>
+  <path d="M17.4948 7.66125C19.0722 7.66125 20.3247 6.40835 20.3247 4.83063C20.3247 3.2529 19.0258 2 17.4948 2C15.9175 2 14.6649 3.2529 14.6649 4.83063C14.6649 6.40835 15.9175 7.66125 17.4948 7.66125ZM17.4948 3.2993C17.3093 3.48492 17.1701 3.76334 17.1701 4.08817C17.1701 4.69142 17.6804 5.20186 18.2835 5.20186C18.5619 5.20186 18.8402 5.06265 19.0722 4.87703C19.0722 5.7587 18.3763 6.45476 17.4948 6.45476C16.6134 6.40835 15.9175 5.7123 15.9175 4.83063C15.9175 3.94896 16.6134 3.2993 17.4948 3.2993Z" fill="currentColor"/>
+  <path d="M7.28866 16.2923C5.71134 16.2923 4.45876 17.5452 4.45876 19.123C4.45876 20.7007 5.71134 21.9536 7.28866 21.9536C7.6134 21.9536 7.93814 21.9072 8.21649 21.768L8.12371 21.6752C7.28866 20.8399 7.01031 19.819 7.52062 19.3086C8.03093 18.7981 9.05155 19.123 9.8866 19.9118L9.97938 20.0046C10.0722 19.7262 10.1649 19.4014 10.1649 19.0766C10.1186 17.5916 8.86598 16.2923 7.28866 16.2923Z" fill="currentColor"/>
+  <path d="M20.8814 16.2923C19.3041 16.2923 18.0515 17.5452 18.0515 19.123C18.0515 19.4478 18.0979 19.7726 18.2371 20.051L18.3299 19.9582C19.1649 19.123 20.1856 18.8445 20.6959 19.355C21.2062 19.8654 20.8814 20.8863 20.0928 21.7216L20 21.8144C20.2784 21.9072 20.6031 22 20.9278 22C22.5052 22 23.7577 20.7471 23.7577 19.1694C23.7113 17.5916 22.4124 16.2923 20.8814 16.2923Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/divider-vertical.svg b/packages/manager/src/assets/icons/divider-vertical.svg
index 79add159022..8bb38120b04 100644
--- a/packages/manager/src/assets/icons/divider-vertical.svg
+++ b/packages/manager/src/assets/icons/divider-vertical.svg
@@ -1,3 +1,3 @@
 <svg width="2" height="16" viewBox="0 0 2 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<line x1="1" y1="4.37114e-08" x2="0.999999" y2="16" stroke="#CCCCCC" stroke-width="2"/>
+<line x1="1" y1="4.37114e-08" x2="0.999999" y2="16" stroke="currentColor" stroke-width="2"/>
 </svg>
diff --git a/packages/manager/src/assets/icons/docs.svg b/packages/manager/src/assets/icons/docs.svg
index 142cff7eaf0..85969006671 100644
--- a/packages/manager/src/assets/icons/docs.svg
+++ b/packages/manager/src/assets/icons/docs.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4.22023 2.88685C4.06356 3.04352 3.99834 3.21624 3.99834 3.33329V11.3725C4.02276 11.3675 4.04596 11.3633 4.06776 11.3596C4.13799 11.3479 4.19796 11.3418 4.24299 11.3386C4.26561 11.337 4.28478 11.3361 4.29995 11.3356L4.31974 11.3351L4.32733 11.335L4.33054 11.335L4.33199 11.335C4.33232 11.335 4.33333 11.335 4.33333 11.9946V11.335H12.0017L12.0017 3.3333C12.0017 3.21624 11.9364 3.04352 11.7798 2.88685C11.6231 2.73018 11.4504 2.66496 11.3333 2.66496H4.66667C4.54961 2.66496 4.3769 2.73018 4.22023 2.88685ZM13.3317 11.9999V3.33329C13.3317 2.78368 13.0636 2.28973 12.7202 1.9464C12.3769 1.60307 11.8829 1.33496 11.3333 1.33496H4.66667C4.11706 1.33496 3.62311 1.60307 3.27978 1.9464C2.93645 2.28973 2.66833 2.78368 2.66833 3.33329V13C2.66833 13.3663 2.76184 13.6853 2.93627 13.947C3.10793 14.2045 3.33205 14.3678 3.53594 14.4698C3.73722 14.5704 3.93046 14.6174 4.06776 14.6403C4.13799 14.652 4.19796 14.6581 4.24299 14.6613C4.26561 14.6629 4.28478 14.6638 4.29995 14.6643L4.31974 14.6648L4.32733 14.6649L4.33054 14.665L4.33199 14.665C4.33232 14.665 4.33334 14.665 4.33333 14L4.33338 14.665H12.6667C13.0339 14.665 13.3317 14.3672 13.3317 14C13.3317 13.6327 13.0339 13.335 12.6667 13.335H12.6653L12.665 12.665H12.6667C13.0339 12.665 13.3317 12.3672 13.3317 11.9999ZM11.335 13.335H4.3425L4.33774 13.3347C4.32808 13.334 4.30993 13.3323 4.28641 13.3284C4.23621 13.32 4.17945 13.3045 4.13073 13.2802C4.08462 13.2571 4.05874 13.233 4.0429 13.2092C4.02983 13.1896 3.99834 13.1336 3.99834 13C3.99834 12.8663 4.02983 12.8103 4.0429 12.7907C4.05874 12.767 4.08462 12.7428 4.13073 12.7198C4.17945 12.6954 4.23621 12.6799 4.28641 12.6715C4.30993 12.6676 4.32808 12.6659 4.33774 12.6652L4.34181 12.665H11.335V13.335ZM5.33331 5.33504C5.33331 4.96777 5.63104 4.67004 5.99831 4.67004H10.0016C10.3689 4.67004 10.6666 4.96777 10.6666 5.33504C10.6666 5.70231 10.3689 6.00004 10.0016 6.00004H5.99831C5.63104 6.00004 5.33331 5.70231 5.33331 5.33504ZM6.665 6.67004C6.29773 6.67004 6 6.96777 6 7.33504C6 7.70231 6.29773 8.00004 6.665 8.00004H9.335C9.70227 8.00004 10 7.70231 10 7.33504C10 6.96777 9.70227 6.67004 9.335 6.67004H6.665Z" fill="  currentColor"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M4.22023 2.88685C4.06356 3.04352 3.99834 3.21624 3.99834 3.33329V11.3725C4.02276 11.3675 4.04596 11.3633 4.06776 11.3596C4.13799 11.3479 4.19796 11.3418 4.24299 11.3386C4.26561 11.337 4.28478 11.3361 4.29995 11.3356L4.31974 11.3351L4.32733 11.335L4.33054 11.335L4.33199 11.335C4.33232 11.335 4.33333 11.335 4.33333 11.9946V11.335H12.0017L12.0017 3.3333C12.0017 3.21624 11.9364 3.04352 11.7798 2.88685C11.6231 2.73018 11.4504 2.66496 11.3333 2.66496H4.66667C4.54961 2.66496 4.3769 2.73018 4.22023 2.88685ZM13.3317 11.9999V3.33329C13.3317 2.78368 13.0636 2.28973 12.7202 1.9464C12.3769 1.60307 11.8829 1.33496 11.3333 1.33496H4.66667C4.11706 1.33496 3.62311 1.60307 3.27978 1.9464C2.93645 2.28973 2.66833 2.78368 2.66833 3.33329V13C2.66833 13.3663 2.76184 13.6853 2.93627 13.947C3.10793 14.2045 3.33205 14.3678 3.53594 14.4698C3.73722 14.5704 3.93046 14.6174 4.06776 14.6403C4.13799 14.652 4.19796 14.6581 4.24299 14.6613C4.26561 14.6629 4.28478 14.6638 4.29995 14.6643L4.31974 14.6648L4.32733 14.6649L4.33054 14.665L4.33199 14.665C4.33232 14.665 4.33334 14.665 4.33333 14L4.33338 14.665H12.6667C13.0339 14.665 13.3317 14.3672 13.3317 14C13.3317 13.6327 13.0339 13.335 12.6667 13.335H12.6653L12.665 12.665H12.6667C13.0339 12.665 13.3317 12.3672 13.3317 11.9999ZM11.335 13.335H4.3425L4.33774 13.3347C4.32808 13.334 4.30993 13.3323 4.28641 13.3284C4.23621 13.32 4.17945 13.3045 4.13073 13.2802C4.08462 13.2571 4.05874 13.233 4.0429 13.2092C4.02983 13.1896 3.99834 13.1336 3.99834 13C3.99834 12.8663 4.02983 12.8103 4.0429 12.7907C4.05874 12.767 4.08462 12.7428 4.13073 12.7198C4.17945 12.6954 4.23621 12.6799 4.28641 12.6715C4.30993 12.6676 4.32808 12.6659 4.33774 12.6652L4.34181 12.665H11.335V13.335ZM5.33331 5.33504C5.33331 4.96777 5.63104 4.67004 5.99831 4.67004H10.0016C10.3689 4.67004 10.6666 4.96777 10.6666 5.33504C10.6666 5.70231 10.3689 6.00004 10.0016 6.00004H5.99831C5.63104 6.00004 5.33331 5.70231 5.33331 5.33504ZM6.665 6.67004C6.29773 6.67004 6 6.96777 6 7.33504C6 7.70231 6.29773 8.00004 6.665 8.00004H9.335C9.70227 8.00004 10 7.70231 10 7.33504C10 6.96777 9.70227 6.67004 9.335 6.67004H6.665Z" fill="currentColor"/>
 </svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/document.svg b/packages/manager/src/assets/icons/document.svg
index 045accc3d63..85969006671 100644
--- a/packages/manager/src/assets/icons/document.svg
+++ b/packages/manager/src/assets/icons/document.svg
@@ -1,11 +1,3 @@
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" 
-style="enable-background:new 0 0 64 64;" xml:space="preserve" fill="none">
-	<desc>Guides and Tutorials</desc>
-	<circle id="background" class="outerCircle" stroke-width="2" cx="31.9" cy="31.9" r="29.9"></circle>
-	<g id="doc" class="insidePath" transform="translate(17.000000, 15.000000)">
-		<polygon id="Stroke-8592" points="26.3,25.9 8.2,25.9 8.2,2.7 19.4,2.7 26.3,9.5"/>
-		<polyline id="Stroke-8593" points="23.5,25.9 23.5,28.6 5.5,28.6 5.5,5.4 8.2,5.4"/>
-		<polyline id="Stroke-8594" points="20.8,28.6 20.8,31.3 2.7,31.3 2.7,8.1 5.5,8.1"/>
-		<polyline id="Stroke-8595" points="19.4,2.7 19.4,9.5 26.3,9.5"/>
-	</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M4.22023 2.88685C4.06356 3.04352 3.99834 3.21624 3.99834 3.33329V11.3725C4.02276 11.3675 4.04596 11.3633 4.06776 11.3596C4.13799 11.3479 4.19796 11.3418 4.24299 11.3386C4.26561 11.337 4.28478 11.3361 4.29995 11.3356L4.31974 11.3351L4.32733 11.335L4.33054 11.335L4.33199 11.335C4.33232 11.335 4.33333 11.335 4.33333 11.9946V11.335H12.0017L12.0017 3.3333C12.0017 3.21624 11.9364 3.04352 11.7798 2.88685C11.6231 2.73018 11.4504 2.66496 11.3333 2.66496H4.66667C4.54961 2.66496 4.3769 2.73018 4.22023 2.88685ZM13.3317 11.9999V3.33329C13.3317 2.78368 13.0636 2.28973 12.7202 1.9464C12.3769 1.60307 11.8829 1.33496 11.3333 1.33496H4.66667C4.11706 1.33496 3.62311 1.60307 3.27978 1.9464C2.93645 2.28973 2.66833 2.78368 2.66833 3.33329V13C2.66833 13.3663 2.76184 13.6853 2.93627 13.947C3.10793 14.2045 3.33205 14.3678 3.53594 14.4698C3.73722 14.5704 3.93046 14.6174 4.06776 14.6403C4.13799 14.652 4.19796 14.6581 4.24299 14.6613C4.26561 14.6629 4.28478 14.6638 4.29995 14.6643L4.31974 14.6648L4.32733 14.6649L4.33054 14.665L4.33199 14.665C4.33232 14.665 4.33334 14.665 4.33333 14L4.33338 14.665H12.6667C13.0339 14.665 13.3317 14.3672 13.3317 14C13.3317 13.6327 13.0339 13.335 12.6667 13.335H12.6653L12.665 12.665H12.6667C13.0339 12.665 13.3317 12.3672 13.3317 11.9999ZM11.335 13.335H4.3425L4.33774 13.3347C4.32808 13.334 4.30993 13.3323 4.28641 13.3284C4.23621 13.32 4.17945 13.3045 4.13073 13.2802C4.08462 13.2571 4.05874 13.233 4.0429 13.2092C4.02983 13.1896 3.99834 13.1336 3.99834 13C3.99834 12.8663 4.02983 12.8103 4.0429 12.7907C4.05874 12.767 4.08462 12.7428 4.13073 12.7198C4.17945 12.6954 4.23621 12.6799 4.28641 12.6715C4.30993 12.6676 4.32808 12.6659 4.33774 12.6652L4.34181 12.665H11.335V13.335ZM5.33331 5.33504C5.33331 4.96777 5.63104 4.67004 5.99831 4.67004H10.0016C10.3689 4.67004 10.6666 4.96777 10.6666 5.33504C10.6666 5.70231 10.3689 6.00004 10.0016 6.00004H5.99831C5.63104 6.00004 5.33331 5.70231 5.33331 5.33504ZM6.665 6.67004C6.29773 6.67004 6 6.96777 6 7.33504C6 7.70231 6.29773 8.00004 6.665 8.00004H9.335C9.70227 8.00004 10 7.70231 10 7.33504C10 6.96777 9.70227 6.67004 9.335 6.67004H6.665Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/download.svg b/packages/manager/src/assets/icons/download.svg
index 544a5e4dd57..75456d089ae 100644
--- a/packages/manager/src/assets/icons/download.svg
+++ b/packages/manager/src/assets/icons/download.svg
@@ -1,10 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="17px" viewBox="0 0 14 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="Page-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Personal-Access-Token-modal" transform="translate(-851.000000, -404.000000)" fill="currentColor" fill-rule="nonzero">
-            <g id="get_app-24px" transform="translate(846.000000, 401.000000)">
-                <path d="M19,9 L15,9 L15,3 L9,3 L9,9 L5,9 L12,16 L19,9 Z M5,18 L5,20 L19,20 L19,18 L5,18 Z" id="Shape"></path>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="20" viewBox="0 0 16 20" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M8 0C8.55228 0 9 0.447715 9 1V10.5858L12.2929 7.29289C12.6834 6.90237 13.3166 6.90237 13.7071 7.29289C14.0976 7.68342 14.0976 8.31658 13.7071 8.70711L8.70711 13.7071C8.31658 14.0976 7.68342 14.0976 7.29289 13.7071L2.29289 8.70711C1.90237 8.31658 1.90237 7.68342 2.29289 7.29289C2.68342 6.90237 3.31658 6.90237 3.70711 7.29289L7 10.5858V1C7 0.447715 7.44772 0 8 0ZM0 19C0 18.4477 0.447715 18 1 18H15C15.5523 18 16 18.4477 16 19C16 19.5523 15.5523 20 15 20H1C0.447715 20 0 19.5523 0 19Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/drag-indicator.svg b/packages/manager/src/assets/icons/drag-indicator.svg
index edf19fc2e9e..08e721e58ac 100644
--- a/packages/manager/src/assets/icons/drag-indicator.svg
+++ b/packages/manager/src/assets/icons/drag-indicator.svg
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="drag_indicator-24px-copy" transform="translate(-212.000000, -318.000000)">
-            <g transform="translate(205.000000, 314.000000)">
-                <path d="M11,18 C11,19.1 10.1,20 9,20 C7.9,20 7,19.1 7,18 C7,16.9 7.9,16 9,16 C10.1,16 11,16.9 11,18 Z M9,10 C7.9,10 7,10.9 7,12 C7,13.1 7.9,14 9,14 C10.1,14 11,13.1 11,12 C11,10.9 10.1,10 9,10 Z M9,4 C7.9,4 7,4.9 7,6 C7,7.1 7.9,8 9,8 C10.1,8 11,7.1 11,6 C11,4.9 10.1,4 9,4 Z M15,8 C16.1,8 17,7.1 17,6 C17,4.9 16.1,4 15,4 C13.9,4 13,4.9 13,6 C13,7.1 13.9,8 15,8 Z M15,10 C13.9,10 13,10.9 13,12 C13,13.1 13.9,14 15,14 C16.1,14 17,13.1 17,12 C17,10.9 16.1,10 15,10 Z M15,16 C13.9,16 13,16.9 13,18 C13,19.1 13.9,20 15,20 C16.1,20 17,19.1 17,18 C17,16.9 16.1,16 15,16 Z" id="Shape" fill="currentColor" fill-rule="nonzero"></path>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
+  <path d="M7.33325 3C7.33325 3.55228 6.88554 4 6.33325 4C5.78097 4 5.33325 3.55228 5.33325 3C5.33325 2.44772 5.78097 2 6.33325 2C6.88554 2 7.33325 2.44772 7.33325 3Z" fill="currentColor"/>
+  <path d="M7.33325 6.33337C7.33325 6.88566 6.88554 7.33337 6.33325 7.33337C5.78097 7.33337 5.33325 6.88566 5.33325 6.33337C5.33325 5.78109 5.78097 5.33337 6.33325 5.33337C6.88554 5.33337 7.33325 5.78109 7.33325 6.33337Z" fill="currentColor"/>
+  <path d="M7.33325 9.66663C7.33325 10.2189 6.88554 10.6666 6.33325 10.6666C5.78097 10.6666 5.33325 10.2189 5.33325 9.66663C5.33325 9.11434 5.78097 8.66663 6.33325 8.66663C6.88554 8.66663 7.33325 9.11434 7.33325 9.66663Z" fill="currentColor"/>
+  <path d="M7.33325 13C7.33325 13.5523 6.88554 14 6.33325 14C5.78097 14 5.33325 13.5523 5.33325 13C5.33325 12.4477 5.78097 12 6.33325 12C6.88554 12 7.33325 12.4477 7.33325 13Z" fill="currentColor"/>
+  <path d="M10.6667 3C10.6667 3.55228 10.219 4 9.66675 4C9.11446 4 8.66675 3.55228 8.66675 3C8.66675 2.44772 9.11446 2 9.66675 2C10.219 2 10.6667 2.44772 10.6667 3Z" fill="currentColor"/>
+  <path d="M10.6667 6.33337C10.6667 6.88566 10.219 7.33337 9.66675 7.33337C9.11446 7.33337 8.66675 6.88566 8.66675 6.33337C8.66675 5.78109 9.11446 5.33337 9.66675 5.33337C10.219 5.33337 10.6667 5.78109 10.6667 6.33337Z" fill="currentColor"/>
+  <path d="M10.6667 9.66663C10.6667 10.2189 10.219 10.6666 9.66675 10.6666C9.11446 10.6666 8.66675 10.2189 8.66675 9.66663C8.66675 9.11434 9.11446 8.66663 9.66675 8.66663C10.219 8.66663 10.6667 9.11434 10.6667 9.66663Z" fill="currentColor"/>
+  <path d="M10.6667 13C10.6667 13.5523 10.219 14 9.66675 14C9.11446 14 8.66675 13.5523 8.66675 13C8.66675 12.4477 9.11446 12 9.66675 12C10.219 12 10.6667 12.4477 10.6667 13Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/error.svg b/packages/manager/src/assets/icons/error.svg
index bf6b870a888..35fa89b8079 100644
--- a/packages/manager/src/assets/icons/error.svg
+++ b/packages/manager/src/assets/icons/error.svg
@@ -1 +1,3 @@
-<svg height="512pt" viewBox="-64 0 512 512" width="512pt" xmlns="http://www.w3.org/2000/svg"><g fill-rule="evenodd" fill="currentColor"><path d="m10 401.996094c5.523438 0 10-4.476563 10-10v-371.996094h344.445312v20.003906c0 5.519532 4.476563 10 10 10 5.523438 0 10-4.480468 10-10v-30.003906c0-5.523438-4.476562-10-10-10h-364.445312c-5.523438 0-10 4.476562-10 10v381.996094c0 5.523437 4.476562 10 10 10zm0 0"/><path d="m374.445312 110.003906c-5.523437 0-10 4.476563-10 10v267.976563h-94.019531c-5.523437 0-10 4.476562-10 10v94.019531h-240.425781v-20.003906c0-5.519532-4.476562-10-10-10s-10 4.480468-10 10v30.003906c0 5.523438 4.476562 10 10 10h260.425781c.050781 0 .101563-.007812.15625-.007812.273438-.003907.546875-.015626.820313-.039063.167968-.015625.332031-.050781.496094-.074219.15625-.023437.316406-.039062.46875-.070312.167968-.03125.332031-.082032.5-.121094.148437-.039062.300781-.070312.449218-.113281.15625-.046875.304688-.109375.457032-.164063.15625-.054687.3125-.101562.464843-.164062.136719-.058594.269531-.128906.402344-.191406.164063-.074219.328125-.144532.484375-.226563.125-.066406.246094-.144531.367188-.21875.160156-.09375.320312-.179687.472656-.285156.144531-.09375.277344-.203125.414062-.304688.128906-.09375.257813-.179687.378906-.28125.257813-.207031.503907-.429687.738282-.667969l104.019531-104.019531c.316406-.316406.601563-.65625.867187-1.007812.070313-.085938.136719-.175781.199219-.265625.25-.355469.488281-.714844.691407-1.097656.011718-.023438.019531-.046876.03125-.070313.1875-.363281.351562-.738281.492187-1.121094.039063-.101562.078125-.207031.113281-.3125.136719-.40625.257813-.816406.34375-1.238281 0-.007812 0-.015625.003906-.027344.078126-.410156.125-.832031.152344-1.253906.011719-.113281.015625-.226562.019532-.339844.003906-.113281.015624-.222656.015624-.335937v-277.976563c0-5.523437-4.476562-10-10-10zm-94.019531 367.855469v-69.878906h69.875zm0 0"/><path d="m94.222656 308.785156c25.007813-20.148437 60.726563-31.707031 98-31.707031 37.273438 0 72.992188 11.558594 98 31.707031 1.847656 1.492188 4.066406 2.214844 6.269532 2.214844 2.917968 0 5.816406-1.273438 7.792968-3.726562 3.464844-4.300782 2.785156-10.597657-1.515625-14.0625-28.496093-22.960938-68.792969-36.132813-110.546875-36.132813s-82.050781 13.171875-110.546875 36.132813c-4.304687 3.464843-4.980469 9.761718-1.515625 14.0625 3.464844 4.296874 9.761719 4.980468 14.0625 1.511718zm0 0"/><path d="m303.566406 107.925781c-3.902344-3.90625-10.234375-3.90625-14.140625 0l-22.597656 22.597657-22.601563-22.597657c-3.902343-3.90625-10.234374-3.90625-14.140624 0-3.90625 3.902344-3.90625 10.234375 0 14.140625l22.597656 22.597656-22.597656 22.601563c-3.90625 3.902344-3.90625 10.234375 0 14.140625 3.902343 3.90625 10.234374 3.90625 14.140624 0l22.601563-22.597656 22.597656 22.597656c1.953125 1.953125 4.511719 2.929688 7.070313 2.929688s5.117187-.976563 7.070312-2.929688c3.90625-3.90625 3.90625-10.238281 0-14.140625l-22.597656-22.601563 22.597656-22.597656c3.90625-3.90625 3.90625-10.238281 0-14.140625zm0 0"/><path d="m80.878906 181.40625c3.902344 3.902344 10.234375 3.902344 14.140625-.003906l22.597657-22.597656 22.597656 22.597656c1.953125 1.953125 4.511718 2.929687 7.070312 2.929687s5.121094-.976562 7.070313-2.929687c3.90625-3.902344 3.90625-10.234375.003906-14.140625l-22.597656-22.597657 22.597656-22.601562c3.902344-3.902344 3.902344-10.234375-.003906-14.140625-3.902344-3.902344-10.234375-3.90625-14.140625 0l-22.597656 22.597656-22.597657-22.597656c-3.90625-3.90625-10.238281-3.90625-14.140625 0-3.90625 3.90625-3.90625 10.238281 0 14.140625l22.597656 22.601562-22.597656 22.597657c-3.90625 3.90625-3.90625 10.238281 0 14.144531zm0 0"/><path d="m10 441.996094c5.507812 0 10-4.488282 10-10 0-5.507813-4.492188-10-10-10s-10 4.492187-10 10c0 5.511718 4.492188 10 10 10zm0 0"/><path d="m374.445312 70.003906c-5.507812 0-10 4.488282-10 10 0 5.507813 4.492188 10 10 10 5.507813 0 10-4.492187 10-10 0-5.511718-4.492187-10-10-10zm0 0"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path d="M19.2002 9.4502C19.4339 9.45029 19.6255 9.62844 19.6475 9.85645L19.6504 9.90039V20.4189C19.6504 20.9704 19.2146 21.419 18.6689 21.4482L18.6123 21.4502H5.3877C4.83487 21.4502 4.3812 21.0195 4.35156 20.4756L4.34961 20.4189V9.90039C4.34961 9.65193 4.55137 9.4503 4.7998 9.4502C5.03364 9.4502 5.22615 9.62835 5.24805 9.85645L5.25 9.90039V20.4189C5.25 20.4819 5.29758 20.5364 5.3623 20.5479L5.3877 20.5498H18.6123C18.681 20.5498 18.7366 20.5027 18.748 20.4424L18.75 20.4189V9.90039C18.75 9.65186 18.9517 9.4502 19.2002 9.4502ZM21.9004 10.3584C22.1341 10.3586 22.3259 10.5376 22.3477 10.7656L22.3496 10.8086V16.5332C22.3496 16.7816 22.1487 16.9832 21.9004 16.9834C21.6665 16.9834 21.474 16.8044 21.4521 16.5762L21.4502 16.5332V10.8086C21.4503 10.5602 21.652 10.3584 21.9004 10.3584ZM12.2051 13.3242C13.1924 13.3242 13.993 14.124 13.9932 15.1113C13.9932 16.0988 13.1925 16.8994 12.2051 16.8994C11.2176 16.8994 10.417 16.0988 10.417 15.1113C10.4172 14.124 11.2177 13.3242 12.2051 13.3242ZM12.2051 14.2236C11.7148 14.2236 11.3176 14.6211 11.3174 15.1113C11.3174 15.6017 11.7147 16 12.2051 16C12.6955 16 13.0928 15.6017 13.0928 15.1113C13.0926 14.6211 12.6953 14.2236 12.2051 14.2236ZM9.4502 10.7998C9.86425 10.7999 10.2001 11.1357 10.2002 11.5498C10.2002 11.964 9.86432 12.2997 9.4502 12.2998C9.03598 12.2998 8.7002 11.964 8.7002 11.5498C8.7003 11.1357 9.03605 10.7998 9.4502 10.7998ZM14.5498 10.7998C14.964 10.7998 15.2997 11.1357 15.2998 11.5498C15.2998 11.964 14.964 12.2998 14.5498 12.2998C14.1357 12.2997 13.7998 11.964 13.7998 11.5498C13.7999 11.1357 14.1357 10.7999 14.5498 10.7998ZM2.25 4.05957C2.48391 4.05957 2.67644 4.2386 2.69824 4.4668L2.7002 4.50977V8.12207C2.7002 8.3706 2.49853 8.57227 2.25 8.57227C2.01622 8.57227 1.82374 8.39403 1.80176 8.16602L1.7998 8.12207V4.50977C1.79995 4.26136 2.00156 4.05957 2.25 4.05957ZM4.7998 7.2002C5.13111 7.2002 5.40029 7.46852 5.40039 7.7998C5.40039 8.13118 5.13118 8.40039 4.7998 8.40039C4.46852 8.40029 4.2002 8.13111 4.2002 7.7998C4.2003 7.46859 4.46859 7.2003 4.7998 7.2002ZM14.4844 2.5498C14.7105 2.54986 14.9299 2.62329 15.0986 2.74902L15.1475 2.78906L19.291 6.05176C19.5026 6.23337 19.6312 6.49172 19.6484 6.76758L19.6504 6.83203V7.7998C19.6504 8.04827 19.4486 8.24989 19.2002 8.25C18.9664 8.25 18.7739 8.07176 18.752 7.84375L18.75 7.7998V6.83203C18.75 6.80272 18.7391 6.77368 18.7275 6.75684L18.7188 6.74707L14.5762 3.4834C14.5574 3.4674 14.5344 3.45658 14.5098 3.45215L14.4844 3.4502L5.25 3.44922V5.79785C5.25 6.04638 5.04833 6.24805 4.7998 6.24805C4.56606 6.24795 4.37444 6.06983 4.35254 5.8418L4.34961 5.79785V3.2998C4.34971 2.90225 4.65962 2.57715 5.05078 2.55176L5.09961 2.5498H14.4844ZM12 7.0498C12.2485 7.0498 12.4502 7.25147 12.4502 7.5C12.4502 7.73391 12.2712 7.92644 12.043 7.94824L12 7.9502H8.09961C7.85126 7.94998 7.65039 7.7484 7.65039 7.5C7.65039 7.26609 7.82844 7.07356 8.05664 7.05176L8.09961 7.0498H12Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/fileUploadComplete.svg b/packages/manager/src/assets/icons/fileUploadComplete.svg
index 39c8d4a518e..7b8a33409c1 100644
--- a/packages/manager/src/assets/icons/fileUploadComplete.svg
+++ b/packages/manager/src/assets/icons/fileUploadComplete.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-  <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M5.625 14.3741667L19.9555822.0435844341M5.625 14.3741667L.133252532 8.8824192" transform="translate(2 5)"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M17.2559 4.41076C17.5814 4.7362 17.5814 5.26384 17.2559 5.58928L8.08926 14.7559C7.76382 15.0814 7.23618 15.0814 6.91074 14.7559L2.74408 10.5893C2.41864 10.2638 2.41864 9.7362 2.74408 9.41076C3.06951 9.08533 3.59715 9.08533 3.92259 9.41076L7.5 12.9882L16.0774 4.41076C16.4028 4.08533 16.9305 4.08533 17.2559 4.41076Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/flag.svg b/packages/manager/src/assets/icons/flag.svg
index 72902081752..d2e002fce75 100644
--- a/packages/manager/src/assets/icons/flag.svg
+++ b/packages/manager/src/assets/icons/flag.svg
@@ -1,17 +1,3 @@
-<svg 
-  version="1.1"
-  xmlns="http://www.w3.org/2000/svg"
-  xmlns:xlink="http://www.w3.org/1999/xlink"
-  x="0px"
-  y="0px"
-  viewBox="0 0 60 60" style="enable-background:new 0 0 60 60;" 
-  xml:space="preserve"
-  width="24px"
-  height="24px"
-  >
-  <rect x="16.5" y="31" style="fill:#606469;" width="10" height="6"/>
-  <path style="fill:#606469;" d="M3.5,0c-0.552,0-1,0.447-1,1v3v55c0,0.553,0.448,1,1,1s1-0.447,1-1V4V1C4.5,0.447,4.052,0,3.5,0z"/>
-  <rect x="4.5" y="4" style="fill:#4D99F1;" width="22" height="29"/>
-  <path style="fill:#3683DC;" d="M26.5,9v24h-6c-2.209,0-4,1.791-4,4c0,2.209,1.791,4,4,4h4h33l-11-16l11-16H26.5z"/>
-  <path style="fill:#5F88EA;" d="M16.5,37c0,2.209,1.791,4,4,4h4h2v-8h-6C18.291,33,16.5,34.791,16.5,37z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="20" viewBox="0 0 18 20" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M1.50453 0.571552C2.2605 0.269157 3.3883 0 5.00089 0C6.69435 0 8.0976 0.561495 9.31626 1.04913L9.37205 1.07145C10.6399 1.5786 11.7191 1.9996 12.9991 1.9996C14.3859 1.9996 15.2576 1.76886 15.7514 1.57135C15.9991 1.47225 16.1563 1.3797 16.2395 1.32427C16.2808 1.29672 16.3044 1.27792 16.3123 1.27144C16.5986 1.00244 17.0169 0.925 17.3816 1.07606C17.7559 1.23112 18 1.59641 18 2.0016V12.9994C18 13.2651 17.8945 13.5199 17.7066 13.7078L16.9983 12.9995C17.7066 13.7078 17.7061 13.7083 17.7055 13.7088L17.7045 13.7099L17.7022 13.7121L17.6975 13.7168L17.6867 13.7272L17.6743 13.7388L17.6601 13.7519C17.6401 13.7701 17.6156 13.7915 17.5862 13.8157C17.5275 13.8641 17.4497 13.9233 17.3508 13.9892C17.1528 14.1212 16.8726 14.2786 16.4955 14.4294C15.7395 14.7318 14.6117 15.001 12.9991 15.001C11.3056 15.001 9.9024 14.4395 8.68374 13.9519L8.62795 13.9295C7.3601 13.4224 6.28086 13.0014 5.00089 13.0014C3.61414 13.0014 2.74238 13.2321 2.24863 13.4296C2.15405 13.4675 2.07266 13.5044 2.00355 13.5386V18.9982C2.00355 19.5515 1.55504 20 1.00178 20C0.448511 20 0 19.5515 0 18.9982V12.9994V2.0016C0 1.73591 0.105544 1.48109 0.293414 1.29322L1.00149 2.00131C0.293414 1.29322 0.293937 1.2927 0.294464 1.29217L0.29554 1.2911L0.297768 1.28889L0.302532 1.28421L0.313299 1.27382C0.321032 1.26644 0.329879 1.25818 0.339869 1.2491C0.359854 1.23093 0.3844 1.2095 0.413757 1.18532C0.472506 1.13694 0.550329 1.07773 0.649171 1.01183C0.847218 0.879799 1.12743 0.722395 1.50453 0.571552Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/grid-view.svg b/packages/manager/src/assets/icons/grid-view.svg
index f3d7bdaea11..30f513954bd 100644
--- a/packages/manager/src/assets/icons/grid-view.svg
+++ b/packages/manager/src/assets/icons/grid-view.svg
@@ -1 +1,3 @@
-<svg enable-background="new 0 0 15.2 15.5" width="20" height="20" viewBox="0 0 15.2 15.5" xmlns="http://www.w3.org/2000/svg"><path d="m15.2 1.2v1.5c0 .7-.5 1.2-1.2 1.2h-12.8c-.6.1-1.2-.5-1.2-1.2v-1.5c0-.7.6-1.2 1.2-1.2h12.8c.7 0 1.2.5 1.2 1.2zm-1.2 4.6h-12.8c-.6 0-1.2.5-1.2 1.2v1.5c0 .7.6 1.2 1.2 1.2h12.8c.7 0 1.2-.5 1.2-1.2v-1.5c0-.7-.5-1.2-1.2-1.2zm0 5.8h-12.8c-.7 0-1.2.5-1.2 1.2v1.6c0 .7.6 1.2 1.2 1.2h12.8c.6 0 1.2-.5 1.2-1.2v-1.6c0-.7-.5-1.2-1.2-1.2z" fill="currentColor"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M1.66499 5.00004C1.66499 4.53888 2.03884 4.16504 2.49999 4.16504H2.50833C2.96948 4.16504 3.34333 4.53888 3.34333 5.00004C3.34333 5.4612 2.96948 5.83504 2.50833 5.83504H2.49999C2.03884 5.83504 1.66499 5.4612 1.66499 5.00004ZM5.83162 5.00004C5.83162 4.53888 6.20546 4.16504 6.66662 4.16504H17.5C17.9611 4.16504 18.335 4.53888 18.335 5.00004C18.335 5.4612 17.9611 5.83504 17.5 5.83504H6.66662C6.20546 5.83504 5.83162 5.4612 5.83162 5.00004ZM1.66499 10C1.66499 9.53888 2.03884 9.16504 2.49999 9.16504H2.50833C2.96948 9.16504 3.34333 9.53888 3.34333 10C3.34333 10.4612 2.96948 10.835 2.50833 10.835H2.49999C2.03884 10.835 1.66499 10.4612 1.66499 10ZM5.83162 10C5.83162 9.53888 6.20546 9.16504 6.66662 9.16504H17.5C17.9611 9.16504 18.335 9.53888 18.335 10C18.335 10.4612 17.9611 10.835 17.5 10.835H6.66662C6.20546 10.835 5.83162 10.4612 5.83162 10ZM1.66499 15C1.66499 14.5389 2.03884 14.165 2.49999 14.165H2.50833C2.96948 14.165 3.34333 14.5389 3.34333 15C3.34333 15.4612 2.96948 15.835 2.50833 15.835H2.49999C2.03884 15.835 1.66499 15.4612 1.66499 15ZM5.83162 15C5.83162 14.5389 6.20546 14.165 6.66662 14.165H17.5C17.9611 14.165 18.335 14.5389 18.335 15C18.335 15.4612 17.9611 15.835 17.5 15.835H6.66662C6.20546 15.835 5.83162 15.4612 5.83162 15Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/group-by-tag.svg b/packages/manager/src/assets/icons/group-by-tag.svg
index 8c81e0f20b6..d47ec90845d 100644
--- a/packages/manager/src/assets/icons/group-by-tag.svg
+++ b/packages/manager/src/assets/icons/group-by-tag.svg
@@ -1 +1,3 @@
-<svg enable-background="new 0 0 15.4 16.9" width="20" height="20" viewBox="0 0 15.4 16.9" xmlns="http://www.w3.org/2000/svg"><path d="m13.8 11.5-8.4-8.4c-.1-.1-.2-.1-.3-.1l-4.2.3c-.3 0-.5.2-.6.6l-.3 4.1c0 .1 0 .3.1.4l8.4 8.4c.2.2.5.2.7 0l4.6-4.6c.2-.2.2-.5 0-.7zm-10.1-4.8c-.4.4-1 .4-1.3 0s-.4-1 0-1.3c.4-.4 1-.4 1.3 0 .4.3.4.9 0 1.3zm11.7 2c0 .3-.1.6-.3.8l-1.1 1.1-.5-.5 1.1-1.1c.1-.1.1-.2.1-.3s0-.2-.1-.3l-7.6-7.6c-.1-.1-.2-.1-.3-.1l-3.7.3c-.3 0-.5.2-.5.5l-.1.9h-.7l.1-1c.1-.6.5-1 1.1-1.1l3.7-.3c.4 0 .7.1.9.3l7.6 7.6c.2.2.3.5.3.8z" fill="currentColor"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M2.50004 1.66498C2.03888 1.66498 1.66504 2.03882 1.66504 2.49998V9.99998C1.66504 10.2285 1.7587 10.447 1.92418 10.6046L10.6742 18.938C11.0024 19.2505 11.52 19.2442 11.8405 18.9237L18.9238 11.8404C19.2443 11.5199 19.2506 11.0023 18.938 10.6741L10.6047 1.92412C10.4471 1.75864 10.2286 1.66498 10 1.66498H2.50004ZM3.33504 9.64212V3.33498H9.64218L17.1667 11.2358L11.2358 17.1667L3.33504 9.64212ZM7.83667 7.08333C7.83667 7.49939 7.49939 7.83667 7.08333 7.83667C6.66728 7.83667 6.33 7.49939 6.33 7.08333C6.33 6.66728 6.66728 6.33 7.08333 6.33C7.49939 6.33 7.83667 6.66728 7.83667 7.08333ZM9.16667 7.08333C9.16667 8.23393 8.23393 9.16667 7.08333 9.16667C5.93274 9.16667 5 8.23393 5 7.08333C5 5.93274 5.93274 5 7.08333 5C8.23393 5 9.16667 5.93274 9.16667 7.08333Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/icon-feedback.svg b/packages/manager/src/assets/icons/icon-feedback.svg
index aa987d40471..0704d80a68e 100644
--- a/packages/manager/src/assets/icons/icon-feedback.svg
+++ b/packages/manager/src/assets/icons/icon-feedback.svg
@@ -1,5 +1,3 @@
-<svg width="18" height="18" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
-    <g fill="currentColor">
-        <path d="M3.77946 16.3L6.45731 13.8712C6.55137 13.7782 6.67807 13.7256 6.81035 13.7247H16.5051C16.5816 13.7247 16.655 13.6949 16.7097 13.6415C16.7645 13.5881 16.7962 13.5155 16.7981 13.4391V1.30377C16.7962 1.22734 16.7645 1.15469 16.7097 1.10132C16.655 1.04795 16.5816 1.01809 16.5051 1.01811H1.30377C1.22928 1.02002 1.15849 1.05096 1.1065 1.10432C1.0545 1.15769 1.02541 1.22926 1.02544 1.30377V13.442C1.02542 13.4801 1.03305 13.5179 1.04786 13.553C1.06267 13.5882 1.08437 13.62 1.11167 13.6466C1.13898 13.6732 1.17134 13.6941 1.20685 13.708C1.24236 13.722 1.28029 13.7286 1.31842 13.7276H3.27114C3.40609 13.728 3.53538 13.7819 3.63067 13.8775C3.72595 13.973 3.77946 14.1025 3.77946 14.2374V16.3ZM3.95086 9.70794C3.81487 9.70794 3.68446 9.76196 3.58831 9.85811C3.49216 9.95427 3.43814 10.0847 3.43814 10.2207C3.43814 10.3566 3.49216 10.4871 3.58831 10.5832C3.68446 10.6794 3.81487 10.7334 3.95086 10.7334H9.96137C10.0974 10.7334 10.2278 10.6794 10.3239 10.5832C10.4201 10.4871 10.4741 10.3566 10.4741 10.2207C10.4741 10.0847 10.4201 9.95427 10.3239 9.85811C10.2278 9.76196 10.0974 9.70794 9.96137 9.70794H3.95086ZM3.95086 3.86882C3.81487 3.86882 3.68446 3.92284 3.58831 4.01899C3.49216 4.11515 3.43814 4.24556 3.43814 4.38154C3.43814 4.51752 3.49216 4.64793 3.58831 4.74408C3.68446 4.84024 3.81487 4.89426 3.95086 4.89426H13.8712C13.9404 4.89797 14.0095 4.88755 14.0745 4.86364C14.1395 4.83974 14.1989 4.80284 14.2492 4.75521C14.2995 4.70757 14.3395 4.6502 14.3669 4.58658C14.3942 4.52297 14.4083 4.45445 14.4083 4.3852C14.4083 4.31595 14.3942 4.24743 14.3669 4.18382C14.3395 4.1202 14.2995 4.06283 14.2492 4.01519C14.1989 3.96756 14.1395 3.93066 14.0745 3.90676C14.0095 3.88285 13.9404 3.87243 13.8712 3.87614L3.95086 3.86882ZM3.95086 6.78838C3.82057 6.79537 3.69792 6.85205 3.60817 6.94675C3.51841 7.04145 3.46839 7.16696 3.46839 7.29744C3.46839 7.42791 3.51841 7.55342 3.60817 7.64812C3.69792 7.74282 3.82057 7.7995 3.95086 7.80649H12.8414C12.9717 7.7995 13.0943 7.74282 13.1841 7.64812C13.2738 7.55342 13.3238 7.42791 13.3238 7.29744C13.3238 7.16696 13.2738 7.04145 13.1841 6.94675C13.0943 6.85205 12.9717 6.79537 12.8414 6.78838H3.95086ZM7.01251 14.7458L3.64322 17.8323C3.57424 17.9085 3.48383 17.9621 3.38385 17.986C3.28388 18.0099 3.17901 18.0031 3.08301 17.9663C2.98701 17.9296 2.90436 17.8646 2.84591 17.7801C2.78746 17.6955 2.75594 17.5953 2.75549 17.4925V14.7458H1.30377C0.958106 14.7454 0.626713 14.6079 0.382293 14.3635C0.137873 14.119 0.000387731 13.7877 0 13.442L0 1.30377C0.000387731 0.958106 0.137873 0.626713 0.382293 0.382293C0.626713 0.137873 0.958106 0.000387731 1.30377 0L16.5051 0C16.8508 0.00077225 17.1821 0.138335 17.4267 0.382629C17.6712 0.626924 17.8092 0.95809 17.8103 1.30377V13.442C17.8092 13.7877 17.6712 14.1188 17.4267 14.3631C17.1821 14.6074 16.8508 14.745 16.5051 14.7458H7.01251Z"/>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M3 3C2.44772 3 2 3.44772 2 4V20C2 20.3788 2.214 20.725 2.55279 20.8944C2.89157 21.0638 3.29698 21.0273 3.6 20.8L7.33333 18H21C21.5523 18 22 17.5523 22 17V4C22 3.44772 21.5523 3 21 3H3ZM4 18V5H20V16H7C6.78363 16 6.5731 16.0702 6.4 16.2L4 18ZM7.5 12C8.32843 12 9 11.3284 9 10.5C9 9.67157 8.32843 9 7.5 9C6.67157 9 6 9.67157 6 10.5C6 11.3284 6.67157 12 7.5 12ZM13.5 10.5C13.5 11.3284 12.8284 12 12 12C11.1716 12 10.5 11.3284 10.5 10.5C10.5 9.67157 11.1716 9 12 9C12.8284 9 13.5 9.67157 13.5 10.5ZM16.5 12C17.3284 12 18 11.3284 18 10.5C18 9.67157 17.3284 9 16.5 9C15.6716 9 15 9.67157 15 10.5C15 11.3284 15.6716 12 16.5 12Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/kebab.svg b/packages/manager/src/assets/icons/kebab.svg
index 7a41c5e6c9a..aca1bd7b88b 100644
--- a/packages/manager/src/assets/icons/kebab.svg
+++ b/packages/manager/src/assets/icons/kebab.svg
@@ -1,5 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-    <g fill="none" fill-rule="evenodd">
-        <path fill="currentColor" d="M10 8c.54 0 1.008.198 1.405.595.397.397.595.865.595 1.405s-.198 1.008-.595 1.405c-.397.397-.865.595-1.405.595s-1.008-.198-1.405-.595C8.198 11.008 8 10.54 8 10s.198-1.008.595-1.405C8.992 8.198 9.46 8 10 8zm8 0c.54 0 1.008.198 1.405.595.397.397.595.865.595 1.405s-.198 1.008-.595 1.405c-.397.397-.865.595-1.405.595s-1.008-.198-1.405-.595C16.198 11.008 16 10.54 16 10s.198-1.008.595-1.405C16.992 8.198 17.46 8 18 8zM2 8c.54 0 1.008.198 1.405.595C3.802 8.992 4 9.46 4 10s-.198 1.008-.595 1.405C3.008 11.802 2.54 12 2 12s-1.008-.198-1.405-.595C.198 11.008 0 10.54 0 10s.198-1.008.595-1.405C.992 8.198 1.46 8 2 8z"/>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M5 10C3.89543 10 3 10.8954 3 12C3 13.1046 3.89543 14 5 14C6.10457 14 7 13.1046 7 12C7 10.8954 6.10457 10 5 10ZM10 12C10 10.8954 10.8954 10 12 10C13.1046 10 14 10.8954 14 12C14 13.1046 13.1046 14 12 14C10.8954 14 10 13.1046 10 12ZM17 12C17 10.8954 17.8954 10 19 10C20.1046 10 21 10.8954 21 12C21 13.1046 20.1046 14 19 14C17.8954 14 17 13.1046 17 12Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/lke-download.svg b/packages/manager/src/assets/icons/lke-download.svg
index 3422a506036..89fa98bc4f9 100755
--- a/packages/manager/src/assets/icons/lke-download.svg
+++ b/packages/manager/src/assets/icons/lke-download.svg
@@ -1,5 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-    <g fill="none" fill-rule="evenodd" stroke="#3683DC" stroke-linecap="round" stroke-linejoin="round">
-        <path d="M8.1.4L8.1 11.4M5.1 7.4L8.1 11.4 11.1 7.4M15.6 11.4v1.333c0 1.473-.895 2.667-2 2.667h-11c-1.105 0-2-1.194-2-2.667V11.4" transform="translate(-.1 .1)"/>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M10.8351 2.50004C10.8351 2.03888 10.4613 1.66504 10.0001 1.66504C9.53894 1.66504 9.1651 2.03888 9.1651 2.50004V10.4842L6.42385 7.74298C6.09776 7.41689 5.56907 7.41689 5.24298 7.74298C4.91689 8.06907 4.91689 8.59776 5.24298 8.92385L9.40965 13.0905C9.50504 13.1859 9.61777 13.2534 9.73769 13.293C9.79196 13.3109 9.84871 13.3235 9.90728 13.3299C9.96724 13.3366 10.0278 13.3368 10.0878 13.3305C10.2714 13.3112 10.4498 13.2312 10.5905 13.0905L14.7572 8.92385C15.0833 8.59776 15.0833 8.06907 14.7572 7.74298C14.4311 7.41689 13.9024 7.41689 13.5763 7.74298L10.8351 10.4842V2.50004ZM3.33179 17.5C3.33179 17.0389 3.70563 16.665 4.16679 16.665H15.8335C16.2946 16.665 16.6685 17.0389 16.6685 17.5C16.6685 17.9612 16.2946 18.335 15.8335 18.335H4.16679C3.70563 18.335 3.33179 17.9612 3.33179 17.5Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/lock.svg b/packages/manager/src/assets/icons/lock.svg
index 62caf228e55..ac2ba9d0a35 100644
--- a/packages/manager/src/assets/icons/lock.svg
+++ b/packages/manager/src/assets/icons/lock.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <title>Encrypted</title>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.11325 3.4465C6.61366 2.94609 7.29236 2.66496 8.00004 2.66496C8.70773 2.66496 9.38643 2.94609 9.88684 3.4465C10.3872 3.94691 10.6684 4.62561 10.6684 5.33329V6.66827H5.33171V5.33329C5.33171 4.62561 5.61284 3.94691 6.11325 3.4465ZM4.66149 7.99827C4.66323 7.99829 4.66497 7.99829 4.66671 7.99829C4.66845 7.99829 4.67019 7.99829 4.67192 7.99827H11.3282C11.3299 7.99829 11.3316 7.99829 11.3334 7.99829C11.3351 7.99829 11.3369 7.99829 11.3386 7.99827H12.6666C13.0357 7.99827 13.335 8.2975 13.335 8.66661V12.6666C13.335 13.0357 13.0357 13.3349 12.6666 13.3349H3.33329C2.96418 13.3349 2.66496 13.0357 2.66496 12.6666V8.66661C2.66496 8.2975 2.96418 7.99827 3.33329 7.99827H4.66149ZM4.00171 6.66827V5.33329C4.00171 4.27287 4.42296 3.25588 5.17279 2.50605C5.92263 1.75621 6.93962 1.33496 8.00004 1.33496C9.06047 1.33496 10.0775 1.75621 10.8273 2.50605C11.5771 3.25588 11.9984 4.27287 11.9984 5.33329V6.66827H12.6666C13.7703 6.66827 14.665 7.56296 14.665 8.66661V12.6666C14.665 13.7703 13.7703 14.6649 12.6666 14.6649H3.33329C2.22965 14.6649 1.33496 13.7703 1.33496 12.6666V8.66661C1.33496 7.56296 2.22965 6.66827 3.33329 6.66827H4.00171Z" fill="#888F91"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.11325 3.4465C6.61366 2.94609 7.29236 2.66496 8.00004 2.66496C8.70773 2.66496 9.38643 2.94609 9.88684 3.4465C10.3872 3.94691 10.6684 4.62561 10.6684 5.33329V6.66827H5.33171V5.33329C5.33171 4.62561 5.61284 3.94691 6.11325 3.4465ZM4.66149 7.99827C4.66323 7.99829 4.66497 7.99829 4.66671 7.99829C4.66845 7.99829 4.67019 7.99829 4.67192 7.99827H11.3282C11.3299 7.99829 11.3316 7.99829 11.3334 7.99829C11.3351 7.99829 11.3369 7.99829 11.3386 7.99827H12.6666C13.0357 7.99827 13.335 8.2975 13.335 8.66661V12.6666C13.335 13.0357 13.0357 13.3349 12.6666 13.3349H3.33329C2.96418 13.3349 2.66496 13.0357 2.66496 12.6666V8.66661C2.66496 8.2975 2.96418 7.99827 3.33329 7.99827H4.66149ZM4.00171 6.66827V5.33329C4.00171 4.27287 4.42296 3.25588 5.17279 2.50605C5.92263 1.75621 6.93962 1.33496 8.00004 1.33496C9.06047 1.33496 10.0775 1.75621 10.8273 2.50605C11.5771 3.25588 11.9984 4.27287 11.9984 5.33329V6.66827H12.6666C13.7703 6.66827 14.665 7.56296 14.665 8.66661V12.6666C14.665 13.7703 13.7703 14.6649 12.6666 14.6649H3.33329C2.22965 14.6649 1.33496 13.7703 1.33496 12.6666V8.66661C1.33496 7.56296 2.22965 6.66827 3.33329 6.66827H4.00171Z" fill="currentColor"/>
 </svg>
diff --git a/packages/manager/src/assets/icons/marketplace.svg b/packages/manager/src/assets/icons/marketplace.svg
index 60ba66381ad..3bbff41afbf 100644
--- a/packages/manager/src/assets/icons/marketplace.svg
+++ b/packages/manager/src/assets/icons/marketplace.svg
@@ -1,11 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="17px" height="18px" viewBox="0 0 17 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Fill 1</title>
-    <g id="Final-Options" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Linodes-landing-22" transform="translate(-525.000000, -670.000000)" stroke="currentColor">
-            <g id="Group-14" transform="translate(525.500000, 670.000000)">
-                <path d="M12,5 C12,2.23857625 10.209139,0.5 8,0.5 C5.790861,0.5 4,2.23857625 4,5 M0,17.5 L16,17.5 L16,4.5 L0,4.5 L0,17.5 Z" id="Fill-1"></path>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M3.10454 4.21111L5.34187 17.1293C5.53092 18.2222 6.48773 19.0001 7.58218 19H16C16.5523 19 17 18.5523 17 18C17 17.4477 16.5523 17 16 17H7.58218C7.43525 17 7.33154 16.8979 7.31267 16.7887L5.07515 3.86952C4.88561 2.777 3.92897 1.99987 2.83491 2H2.5C1.94772 2 1.5 2.44772 1.5 3C1.5 3.55228 1.94771 4 2.5 4H2.83491C2.98169 3.99997 3.08552 4.10205 3.10454 4.21111Z" fill="currentColor"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M19.8833 8H4.99997C4.44768 8 3.99997 7.55228 3.99997 7C3.99997 6.44772 4.44768 6 4.99997 6H20.3851C20.8589 5.9999 21.3272 6.2025 21.6451 6.58185C21.9673 6.96631 22.092 7.4856 21.9584 7.98362L20.749 12.4927C20.3424 14.008 18.9134 14.9998 17.3562 15H6.2769C5.72462 15 5.2769 14.5523 5.2769 14C5.2769 13.4477 5.72462 13 6.2769 13H17.356C18.0945 12.9999 18.6668 12.5353 18.8173 11.9746L19.8833 8Z" fill="currentColor"/>
+  <path d="M9.5 20.5C9.5 21.1904 8.94036 21.75 8.25 21.75C7.55964 21.75 7 21.1904 7 20.5C7 19.8096 7.55964 19.25 8.25 19.25C8.94036 19.25 9.5 19.8096 9.5 20.5Z" fill="currentColor"/>
+  <path d="M16.5 20.5C16.5 21.1904 15.9404 21.75 15.25 21.75C14.5596 21.75 14 21.1904 14 20.5C14 19.8096 14.5596 19.25 15.25 19.25C15.9404 19.25 16.5 19.8096 16.5 20.5Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/mongodb.svg b/packages/manager/src/assets/icons/mongodb.svg
index c3b4e2d16d0..df7f08f4bad 100644
--- a/packages/manager/src/assets/icons/mongodb.svg
+++ b/packages/manager/src/assets/icons/mongodb.svg
@@ -1,9 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="31px" viewBox="0 0 14 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Path</title>
-    <g id="Databases-multi-engine-options" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Create-Database-Copy-9" transform="translate(-230.000000, -522.000000)" fill="#4FAA41">
-            <path d="M238.872847,525.11225 C238.39404,524.60963 237.861817,524.149164 237.52781,523.523947 C237.316723,523.128158 237.11561,522.726899 236.909994,522.328537 L236.779351,522 L236.74299,522.129355 C236.725936,522.77935 236.35782,523.219865 235.899606,523.631421 C235.383472,524.09414 234.903378,524.596759 234.407837,525.082324 L232.883891,527.086688 L231.651798,529.352658 L230.827721,531.577762 L230.802944,531.612192 C230.349557,533.101708 230.12592,534.633378 230.016193,536.179849 C229.974684,536.761305 230.022307,537.350804 230.054807,537.935156 C230.101465,538.770495 230.246587,539.591354 230.46411,540.399985 C231.254722,543.336543 232.859435,545.772091 235.053649,547.841776 C235.461021,548.226302 235.901537,548.576076 236.326608,548.941617 L236.514848,549.58775 L236.689896,550.590415 L236.773559,551.637163 C236.772594,551.849537 236.763906,552.062877 236.776455,552.274608 C236.779995,552.328988 236.850786,552.379186 236.890687,552.431314 L237.245931,552.556165 L237.615656,552.7 L237.552265,551.769736 L237.549369,550.853308 L237.677115,549.45743 L237.769788,549.15367 L238.035256,548.68355 C238.362827,548.420335 238.713888,548.180931 239.012178,547.88779 C239.551802,547.35782 240.09046,546.820448 240.573451,546.239637 C241.199955,545.486351 241.739258,544.664205 242.172373,543.78253 C242.461652,543.192708 242.734521,542.590981 242.960088,541.974773 C243.158948,541.43161 243.282189,540.860452 243.438896,540.301521 L243.480084,540.180854 C243.803472,538.672352 243.857853,537.148405 243.739116,535.614805 C243.643548,534.378851 243.352981,533.186015 242.948826,532.017312 C242.110913,529.408325 240.76684,527.099237 238.872847,525.11225 Z" id="Path"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="10" height="22" viewBox="0 0 10 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.58778 8.65312C8.44168 3.6 6.05106 2.25469 5.44637 1.30312C5.1159 0.785156 4.78075 0 4.78075 0C4.74793 0.447656 4.68934 0.73125 4.30731 1.07344C3.53856 1.75547 0.285434 4.40625 0.0112148 10.1484C-0.244254 15.5016 3.94403 18.8039 4.50184 19.1461C4.92606 19.3547 5.44872 19.1508 5.69715 18.9586C7.71512 17.5711 10.4784 13.875 9.58543 8.65312" fill="#10AA50"/>
+<path d="M4.95205 16.2939C4.84658 17.6205 4.77158 18.3916 4.50439 19.1463C4.50439 19.1463 4.68018 20.4072 4.80205 21.7432H5.23799C5.34111 20.801 5.50049 19.8682 5.71377 18.9447C5.15127 18.6682 4.97314 17.4564 4.95205 16.2939Z" fill="#B8C4C2"/>
+<path d="M5.71602 18.9473C5.14414 18.6824 4.98008 17.4473 4.9543 16.2941C5.09492 14.3934 5.13476 12.4855 5.07617 10.5824C5.0457 9.58398 5.09023 1.32461 4.83008 0.115234C4.93555 0.351953 5.19102 0.907422 5.44648 1.30352C6.05586 2.25508 8.44414 3.60039 9.58789 8.65351C10.4785 13.8613 7.73164 17.5527 5.71602 18.9473Z" fill="#12924F"/>
+</svg>
diff --git a/packages/manager/src/assets/icons/monitor-disabled.svg b/packages/manager/src/assets/icons/monitor-disabled.svg
index 7be1239b37c..a4a9370738e 100644
--- a/packages/manager/src/assets/icons/monitor-disabled.svg
+++ b/packages/manager/src/assets/icons/monitor-disabled.svg
@@ -1,6 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-  <g fill="none" fill-rule="evenodd">
-    <circle cx="32" cy="32" r="32" fill="#E5E5EA"/>
-    <rect width="4" height="35" x="16" y="-14.501" fill="#FFF" rx="2" transform="rotate(90 10.5 24.499)"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path d="M2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12ZM3.5 12C3.5 16.6944 7.30558 20.5 12 20.5C16.6944 20.5 20.5 16.6944 20.5 12C20.5 7.30558 16.6944 3.5 12 3.5C7.30558 3.5 3.5 7.30558 3.5 12ZM17.5303 7.70801C18.4515 8.89328 19 10.3826 19 12C19 15.866 15.866 19 12 19C10.3826 19 8.89328 18.4515 7.70801 17.5303L17.5303 7.70801ZM5 12C5 8.13401 8.13401 5 12 5C13.6174 5 15.1067 5.54852 16.292 6.46973L6.46973 16.292C5.54852 15.1067 5 13.6174 5 12Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/monitor-failed.svg b/packages/manager/src/assets/icons/monitor-failed.svg
index 9916b7e2e53..e10a915ca57 100644
--- a/packages/manager/src/assets/icons/monitor-failed.svg
+++ b/packages/manager/src/assets/icons/monitor-failed.svg
@@ -1,9 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-  <g fill="none" fill-rule="evenodd">
-    <circle cx="32" cy="32" r="32" fill="#CF1E1E"/>
-    <g fill="#FFF" transform="translate(18 18)">
-      <rect width="4" height="35" x="12" y="-3.501" rx="2" transform="rotate(45 14 13.999)"/>
-      <rect width="4" height="35" x="12" y="-3.501" rx="2" transform="rotate(-45 14 13.999)"/>
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12ZM9.70711 8.29289C9.31658 7.90237 8.68342 7.90237 8.29289 8.29289C7.90237 8.68342 7.90237 9.31658 8.29289 9.70711L10.5858 12L8.29289 14.2929C7.90237 14.6834 7.90237 15.3166 8.29289 15.7071C8.68342 16.0976 9.31658 16.0976 9.70711 15.7071L12 13.4142L14.2929 15.7071C14.6834 16.0976 15.3166 16.0976 15.7071 15.7071C16.0976 15.3166 16.0976 14.6834 15.7071 14.2929L13.4142 12L15.7071 9.70711C16.0976 9.31658 16.0976 8.68342 15.7071 8.29289C15.3166 7.90237 14.6834 7.90237 14.2929 8.29289L12 10.5858L9.70711 8.29289Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/monitor-ok.svg b/packages/manager/src/assets/icons/monitor-ok.svg
index 99cf24a29ef..a7894d0300f 100644
--- a/packages/manager/src/assets/icons/monitor-ok.svg
+++ b/packages/manager/src/assets/icons/monitor-ok.svg
@@ -1,9 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-  <g fill="none" fill-rule="evenodd">
-    <circle cx="32" cy="32" r="32" fill="#00B159"/>
-    <g fill="#FFF" transform="translate(14 18)">
-      <rect width="4" height="35" x="21" y="-3" rx="2" transform="rotate(45 23 14.5)"/>
-      <rect width="4" height="16" x="5.571" y="13.221" rx="2" transform="rotate(-45 7.571 21.221)"/>
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22ZM16.8222 9.56921C17.1366 9.11513 17.0233 8.49217 16.5692 8.17781C16.1151 7.86344 15.4922 7.97671 15.1778 8.43079L11.3089 14.0192L8.65079 11.7407C8.23147 11.3813 7.60017 11.4299 7.24074 11.8492C6.88132 12.2685 6.92988 12.8998 7.34921 13.2593L10.8492 16.2593C11.0642 16.4435 11.3472 16.528 11.628 16.4918C11.9088 16.4556 12.161 16.302 12.3222 16.0692L16.8222 9.56921Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/mysql.svg b/packages/manager/src/assets/icons/mysql.svg
index 8144e0221a9..bc93f55a45a 100644
--- a/packages/manager/src/assets/icons/mysql.svg
+++ b/packages/manager/src/assets/icons/mysql.svg
@@ -1,12 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="26px" height="26px" viewBox="0 0 26 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>mysql-6</title>
-    <g id="Databases-multi-engine-options" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Create-Database-Copy-9" transform="translate(-223.000000, -453.000000)" fill="#00546B" fill-rule="nonzero">
-            <g id="mysql-6" transform="translate(223.000000, 453.000000)">
-                <path d="M23.9487082,19.7368503 C22.5340873,19.7015863 21.4377002,19.8430488 20.5181661,20.2319689 C20.2528865,20.3379641 19.8284393,20.3380657 19.7930687,20.6740391 C19.9345511,20.8155015 19.9522364,21.045378 20.0760335,21.2397873 C20.2884604,21.5933418 20.6595469,22.0707776 20.9955676,22.3184385 C21.3668573,22.6012618 21.7383503,22.8840851 22.1272237,23.1316444 C22.8169505,23.5560318 23.5951038,23.8034895 24.2670436,24.2278768 C24.6562219,24.4752329 25.0449937,24.7937267 25.4340703,25.0588672 C25.6286086,25.2001264 25.7523041,25.4302061 26,25.5185185 L26,25.4655717 C25.8761012,25.3063248 25.8407306,25.07655 25.7170352,24.8997219 C25.5403854,24.7228938 25.3633291,24.5637486 25.1864761,24.3869205 C24.673704,23.6974942 24.0371347,23.0962788 23.3475096,22.6012618 C22.7816815,22.2122401 21.5437103,21.6818575 21.3139031,21.0275936 C21.3139031,21.0275936 21.2961161,21.0100124 21.2785324,20.9923296 C21.6675075,20.956964 22.1272237,20.8155015 22.4987167,20.7094047 C23.0999153,20.5501578 23.6480581,20.585625 24.2670436,20.4264798 C24.5499068,20.3557486 24.8328717,20.2673345 25.1157349,20.1789205 L25.1157349,20.0198768 C24.7976027,19.7015863 24.5676938,19.2773006 24.231673,18.9766928 C23.3298243,18.1985477 22.3394473,17.4383902 21.3139031,16.8019108 C20.7656587,16.4482547 20.0582466,16.2183782 19.4747332,15.9178721 C19.2627129,15.8116736 18.9089052,15.7587268 18.7852097,15.5818987 C18.4667726,15.1929786 18.2899196,14.6802788 18.0601123,14.2205258 C17.5474418,13.2479714 17.0521517,12.1695234 16.6100192,11.1441239 C16.291887,10.4544944 16.0973487,9.76486489 15.708272,9.12848708 C13.8868891,6.12271472 11.9063386,4.30158882 8.86487309,2.51572691 C8.2105169,2.14448959 7.43246523,1.98534432 6.60135766,1.79093507 C6.15942837,1.77315064 5.71719417,1.73788665 5.27516325,1.72010221 C4.99219841,1.59632256 4.70923357,1.26045085 4.46163934,1.10130559 C3.45388202,0.464724524 0.854244201,-0.914229566 0.111563138,0.906896331 C-0.365940028,2.05607555 0.818975236,3.18757197 1.22553391,3.77120623 C1.52638733,4.17780917 1.91526071,4.63746053 2.12748434,5.09721352 C2.25128145,5.397618 2.28655042,5.71611178 2.41034754,6.03430068 C2.69341402,6.81203933 2.95849027,7.67859851 3.32998326,8.4035936 C3.52452159,8.77483093 3.73664358,9.16375106 3.98423781,9.4997244 C4.12572023,9.69413366 4.37321283,9.78264932 4.42637037,10.1008382 C4.17887778,10.4544944 4.16109084,10.9849786 4.01950678,11.4269471 C3.38293753,13.4249011 3.6306334,15.9001893 4.53238055,17.367659 C4.81524375,17.8095259 5.48728524,18.7822836 6.38913403,18.410843 C7.18497264,18.0926541 7.00811961,17.0848357 7.23782526,16.200797 C7.29108445,15.9884 7.25571385,15.8471408 7.36172402,15.7056784 L7.36172402,15.7411456 C7.60931826,16.236061 7.85681085,16.7135984 8.08671978,17.2086154 C8.63496416,18.0748697 9.58976721,18.9766928 10.3855042,19.5779083 C10.8100531,19.8959956 11.1459722,20.4441626 11.6765313,20.6386735 L11.6765313,20.5855234 L11.641059,20.5855234 C11.5349472,20.4263782 11.3757795,20.3557486 11.2343987,20.2318673 C10.9161649,19.91378 10.5623572,19.5247582 10.3148646,19.1711021 C9.57228519,18.1808649 8.91782736,17.0847341 8.33431402,15.953136 C8.05145082,15.4051723 7.80375494,14.8039568 7.57394765,14.2558914 C7.4677342,14.0434945 7.4677342,13.7254072 7.29098281,13.619412 C7.02570327,14.0083321 6.63672826,14.3443055 6.44218993,14.8216396 C6.10637247,15.5818987 6.07090022,16.5189859 5.94710311,17.491337 C5.8763619,17.5092231 5.91163086,17.491337 5.87626026,17.5269059 C5.31053386,17.3852402 5.11599553,16.8019108 4.90367026,16.3067922 C4.37311119,15.0515161 4.28468468,13.0358794 4.74460418,11.5860924 C4.8684013,11.2147535 5.39896037,10.0478914 5.18673674,9.69423528 C5.08062493,9.35826194 4.72681724,9.16375106 4.53238055,8.89861058 C4.30257326,8.56263724 4.05487738,8.13845312 3.8958113,7.76701254 C3.47136404,6.77687696 3.25914041,5.68064454 2.79942419,4.69050896 C2.58720056,4.23075597 2.21601249,3.75352342 1.91526071,3.32913605 C1.5793416,2.85180188 1.20795025,2.51572691 0.942670713,1.94997871 C0.854345841,1.75556945 0.730447084,1.43727892 0.871929503,1.22508524 C0.907300108,1.08362278 0.977939678,1.03067598 1.11952374,0.995310367 C1.34943267,0.800697862 2.00378886,1.04825716 2.23349451,1.15435401 C2.8878507,1.41939287 3.43599344,1.66715542 3.98423781,2.03839274 C4.23173041,2.21522082 4.49700994,2.55119415 4.81524375,2.63960819 L5.1866351,2.63960819 C5.75256478,2.76328622 6.38903239,2.67497381 6.91959146,2.83401745 C7.85691249,3.13452354 8.70560373,3.57659372 9.46607173,4.05402952 C11.7826431,5.52149927 13.6922492,7.60786728 14.9832763,10.1008382 C15.1954999,10.5073395 15.2838248,10.8788817 15.4783631,11.3030659 C15.8498561,12.1695234 16.3095723,13.0535622 16.6807604,13.9022353 C17.0521517,14.733124 17.4057561,15.5818987 17.9363152,16.2715282 C18.2015947,16.6426639 19.2625096,16.8372764 19.7400128,17.0317873 C20.0937188,17.1908309 20.6419632,17.332395 20.960197,17.5268043 C21.5613956,17.89794 22.1625943,18.3225306 22.728524,18.7290319 C23.0114888,18.9412256 23.8955506,19.3832958 23.9487082,19.7368503 Z" id="Path"></path>
-                <path d="M5.87597906,4.33333333 C5.56909429,4.33333333 5.35250027,4.37032455 5.13580247,4.42538861 L5.13580247,4.46216845 L5.17191877,4.46216845 C5.31648775,4.75640713 5.56909429,4.95869622 5.74957201,5.21604938 C5.89414099,5.51018238 6.02044426,5.80452675 6.16501324,6.09876543 C6.18296761,6.08026983 6.20102576,6.0619856 6.20102576,6.0619856 C6.45394365,5.87798073 6.58024691,5.58384774 6.58024691,5.14248971 C6.47189801,5.01386598 6.45383986,4.88513655 6.36354911,4.75640713 C6.25530399,4.57240226 6.02044426,4.48055836 5.87597906,4.33333333 L5.87597906,4.33333333 Z" id="Path"></path>
-            </g>
-        </g>
-    </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
+  <path d="M18.4185 15.4785C17.3271 15.4481 16.494 15.552 15.7811 15.858C15.5787 15.9453 15.2561 15.9471 15.223 16.2058C15.3343 16.3248 15.3513 16.5022 15.4401 16.6487C15.61 16.9285 15.8973 17.3048 16.1536 17.5025C16.4335 17.7174 16.7222 17.948 17.0223 18.1343C17.5566 18.4664 18.1527 18.6559 18.6662 18.988C18.9695 19.1842 19.2701 19.4309 19.5661 19.6522C19.7122 19.7614 19.8107 19.9313 20 20V19.9689C19.9003 19.8393 19.8747 19.661 19.783 19.5259L19.3795 19.1146C18.9851 18.5812 18.4845 18.1127 17.9527 17.7238C17.5285 17.413 16.5784 16.9935 16.4017 16.4908L16.3706 16.459C16.6714 16.4241 17.0236 16.3133 17.3017 16.2371C17.768 16.11 18.1851 16.1431 18.6662 16.016L19.3178 15.8266V15.7001C19.0745 15.4458 18.9009 15.1087 18.6356 14.8782C17.9406 14.2752 17.1826 13.6732 16.4019 13.171C15.969 12.8924 15.4341 12.7111 14.9751 12.475C14.8204 12.3959 14.5496 12.3541 14.4475 12.222C14.2067 11.9092 14.0753 11.5124 13.8895 11.1472C13.5001 10.3826 13.1179 9.5484 12.7725 8.74394C12.5371 8.19569 12.3838 7.65478 12.0903 7.16315C10.6818 4.80281 9.1658 3.37786 6.81704 1.97764C6.31699 1.67983 5.71544 1.5621 5.07959 1.40817L4.05558 1.34516C3.84712 1.25663 3.63068 0.996779 3.43505 0.870281C2.65709 0.368928 0.661084 -0.720879 0.0845353 0.712204C-0.279173 1.61634 0.628682 2.49861 0.953269 2.95722C1.18129 3.27817 1.47285 3.63882 1.63545 4.00029C1.74313 4.23829 1.76144 4.47628 1.85314 4.72752C2.0782 5.34691 2.27492 6.02103 2.56664 6.59304C2.7139 6.88272 2.8765 7.18755 3.06305 7.44677C3.17683 7.60565 3.37292 7.67616 3.40423 7.92101C3.2122 8.19458 3.20125 8.61888 3.09372 8.96471C2.60889 10.5232 2.79231 12.4597 3.49719 13.6125C3.71363 13.9671 4.22351 14.7259 4.92401 14.4349C5.53716 14.18 5.40027 13.3919 5.57563 12.6959C5.61545 12.5384 5.59099 12.4224 5.66862 12.3165V12.3482L6.22735 13.486C6.64068 14.1646 7.37352 14.8737 7.99535 15.3522C8.31753 15.6002 8.57127 16.0288 8.98819 16.174V16.1423H8.95705C8.87626 16.0138 8.74981 15.9609 8.64714 15.8581C8.40442 15.6153 8.13432 15.3136 7.93366 15.0357C7.36826 14.2537 6.86871 13.3974 6.4139 12.5066C6.19621 12.081 6.00733 11.6119 5.82387 11.1788C5.753 11.0118 5.75425 10.7588 5.60685 10.6728C5.40636 10.9899 5.11039 11.2467 4.95515 11.6211C4.70756 12.2199 4.67517 12.9508 4.58346 13.7079C4.529 13.7279 4.55295 13.7141 4.52117 13.7396C4.08892 13.6331 3.93743 13.1801 3.77654 12.7907C3.37058 11.8074 3.29483 10.2241 3.65244 9.09138C3.74478 8.79847 4.16295 7.87635 3.99361 7.60533C3.91285 7.33558 3.64633 7.17911 3.49719 6.97285C3.31252 6.71794 3.12863 6.38217 3.00077 6.08739C2.6682 5.32091 2.51358 4.45986 2.16317 3.68477C1.99572 3.31405 1.71324 2.93887 1.48099 2.60996C1.22354 2.24482 0.935741 1.97556 0.736355 1.5345C0.665466 1.37754 0.569529 1.1263 0.674072 0.965675C0.707718 0.856567 0.754826 0.811103 0.860462 0.775695C1.04013 0.634201 1.54155 0.823065 1.72857 0.902184C2.22624 1.11274 2.64128 1.31342 3.06305 1.59816C3.26478 1.73454 3.46964 1.99886 3.7141 2.07239H3.99345C4.42993 2.17464 4.919 2.1035 5.32732 2.22999C6.04864 2.45363 6.69485 2.80137 7.2817 3.17895C9.06923 4.32984 10.5316 5.96727 11.5316 7.92196C11.6924 8.23669 11.7621 8.53644 11.9039 8.87027C12.1894 9.5433 12.5495 10.2356 12.8337 10.8942C13.1179 11.5503 13.3943 12.2134 13.7959 12.7597C14.0068 13.047 14.8211 13.2009 15.1915 13.3604C15.4514 13.472 15.8769 13.5886 16.1225 13.7399C16.592 14.0285 17.0469 14.3724 17.4877 14.6883C17.7072 14.8465 18.3848 15.1932 18.4185 15.4785ZM4.55169 3.43194C4.3243 3.42763 4.16357 3.45682 3.99361 3.49495V3.52669H4.02412C4.13289 3.75352 4.3243 3.89995 4.45873 4.09552L4.7686 4.75974L4.79974 4.72863C4.99177 4.59033 5.07976 4.36973 5.07851 4.03267C5.00147 3.94972 4.99052 3.84699 4.92322 3.74793C4.83527 3.61649 4.66359 3.54217 4.55169 3.43194Z" fill="#00618A"/>
 </svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/objectStorage/folder.svg b/packages/manager/src/assets/icons/objectStorage/folder.svg
index a406989c05d..41698a831ee 100644
--- a/packages/manager/src/assets/icons/objectStorage/folder.svg
+++ b/packages/manager/src/assets/icons/objectStorage/folder.svg
@@ -1,7 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="21" viewBox="0 0 24 21">
-  <g fill="none" fill-rule="evenodd">
-    <path fill="#CCE4FF" stroke="#7DAEE8" stroke-linecap="round" stroke-linejoin="round" d="M23.5,5.1 C23.5,4.2536 22.8130667,3.56666667 21.9666667,3.56666667 L12.5540771,3.5 L10.8413086,1.31677246 C10.5520197,0.930372461 9.97553088,0.5 9.49304199,0.5 L2.03333333,0.5 C1.18693333,0.5 0.5,1.18693333 0.5,2.03333333 L0.5,18.9 C0.5,19.7464 1.18693333,20.4333333 2.03333333,20.4333333 L21.9666667,20.4333333 C22.8130667,20.4333333 23.5,19.7464 23.5,18.9 L23.5,5.1 Z"/>
-    <path fill="#B1CEF1" d="M1.05557251,1.45269775 C1.11981614,1.28196625 1.26795864,1.131067 1.5,1 C6.01889568,0.981807136 8.69024171,0.981807136 9.51403809,1 C9.96909938,1.01004965 10.130613,1.20034483 10.1570435,1.22824097 C10.5279541,1.61972046 11.0117391,2.2103068 11.6083984,3 L1,3 C0.972804709,2.13919667 0.991328879,1.62342925 1.05557251,1.45269775 Z"/>
-    <path stroke="#7DAEE8" stroke-linecap="square" d="M1.5,3.5 L12.5,3.5"/>
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M5.00009 5C4.73488 5 4.48052 5.10536 4.29298 5.2929C4.10545 5.48043 4.00009 5.73478 4.00009 6L4 18C4 18.2652 4.10536 18.5196 4.29289 18.7071C4.48043 18.8946 4.73479 19 5 19H18.9999C19.2651 19 19.5195 18.8946 19.707 18.7071C19.8946 18.5196 19.9999 18.2652 19.9999 18L20 9C20 8.73478 19.8946 8.48043 19.7071 8.2929C19.5196 8.10536 19.2652 8 19 8H11C10.6656 8 10.3534 7.83289 10.1679 7.55468L8.4649 5H5.00009ZM2.87878 3.87868C3.44138 3.31607 4.20444 3 5.00009 3H9.00009C9.33445 3 9.64669 3.16711 9.83216 3.44532L11.5352 6H19C19.7957 6 20.5587 6.31607 21.1213 6.87868C21.6839 7.44129 22 8.20436 22 9L21.9999 18C21.9999 18.7957 21.6838 19.5587 21.1212 20.1213C20.5586 20.6839 19.7956 21 18.9999 21H5C4.20435 21 3.44129 20.6839 2.87868 20.1213C2.31607 19.5587 2 18.7956 2 18L2.00009 6C2.00009 6 2.00009 6 2.00009 6C2.0001 5.20436 2.31616 4.44129 2.87878 3.87868Z" fill="currentColor"/>
 </svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/objectStorage/object.svg b/packages/manager/src/assets/icons/objectStorage/object.svg
index 65980b18464..1fed71e26a6 100644
--- a/packages/manager/src/assets/icons/objectStorage/object.svg
+++ b/packages/manager/src/assets/icons/objectStorage/object.svg
@@ -1,6 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-  <g fill="none" fill-rule="evenodd" stroke="#939598" stroke-linecap="round" stroke-linejoin="round" transform="matrix(1 0 0 -1 0 24)">
-    <path d="M13.629,23.25 L2.25,23.25 C1.422,23.25 0.75,22.578 0.75,21.75 L0.75,2.25 C0.75,1.422 1.422,0.75 2.25,0.75 L21.75,0.75 C22.578,0.75 23.25,1.422 23.25,2.25 L23.25,13.629 C23.25,14.027 23.092,14.408 22.811,14.689 L14.689,22.811 C14.408,23.092 14.027,23.25 13.629,23.25 Z"/>
-    <path d="M14.25,23.115 L14.25,15.75 C14.25,14.922 14.922,14.25 15.75,14.25 L23.115,14.25"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path d="M14.5 4L14.6233 4.00391C14.9095 4.02206 15.1786 4.10306 15.3838 4.23438L21.6338 8.23438C21.8682 8.3844 22 8.58783 22 8.8V19.2C22 19.6418 21.4404 20 20.75 20H3.25C2.55964 20 2 19.6418 2 19.2V4.8C2 4.35817 2.55964 4 3.25 4H14.5ZM4 18H20V10H16C15.661 10 15.3287 10 15 10C13.8954 10 13 9.10457 13 8V6.00052H4V18ZM15 8C15 8 15 8 15.5 8C16 8 15.7815 8 16 8H18.056L15 6.00052V8Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/parent-child.svg b/packages/manager/src/assets/icons/parent-child.svg
index 4edbab05ed4..14d2b660452 100644
--- a/packages/manager/src/assets/icons/parent-child.svg
+++ b/packages/manager/src/assets/icons/parent-child.svg
@@ -1 +1,6 @@
-<svg version="1.1" viewBox="0 0 640 512" xmlns="http://www.w3.org/2000/svg"><path d="M96 128a128 128 0 1 1 256 0A128 128 0 1 1 96 128zM0 482.3C0 383.8 79.8 304 178.3 304h91.4C368.2 304 448 383.8 448 482.3c0 16.4-13.3 29.7-29.7 29.7H29.7C13.3 512 0 498.7 0 482.3zM609.3 512H471.4c5.4-9.4 8.6-20.3 8.6-32v-8c0-60.7-27.1-115.2-69.8-151.8c2.4-.1 4.7-.2 7.1-.2h61.4C567.8 320 640 392.2 640 481.3c0 17-13.8 30.7-30.7 30.7zM432 256c-31 0-59-12.6-79.3-32.9C372.4 196.5 384 163.6 384 128c0-26.8-6.6-52.1-18.3-74.3C384.3 40.1 407.2 32 432 32c61.9 0 112 50.1 112 112s-50.1 112-112 112z" fill="currentColor"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M3.17579 14.5412C3.94911 13.5894 5.04788 13.0002 6.25 13.0002H12.75C13.9521 13.0002 15.0509 13.5894 15.8242 14.5412C16.5929 15.4873 17 16.7336 17 18.0002V20.0002C17 20.5525 16.5523 21.0002 16 21.0002C15.4477 21.0002 15 20.5525 15 20.0002V18.0002C15 17.1451 14.7223 16.3566 14.272 15.8024C13.8263 15.2539 13.2718 15.0002 12.75 15.0002H6.25C5.72821 15.0002 5.17369 15.2539 4.72802 15.8024C4.27775 16.3566 4 17.1451 4 18.0002V20.0002C4 20.5525 3.55228 21.0002 3 21.0002C2.44772 21.0002 2 20.5525 2 20.0002V18.0002C2 16.7336 2.40707 15.4873 3.17579 14.5412Z" fill="currentColor"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M9.5 5.00022C8.11929 5.00022 7 6.11951 7 7.50022C7 8.88093 8.11929 10.0002 9.5 10.0002C10.8807 10.0002 12 8.88093 12 7.50022C12 6.11951 10.8807 5.00022 9.5 5.00022ZM5 7.50022C5 5.01494 7.01472 3.00022 9.5 3.00022C11.9853 3.00022 14 5.01494 14 7.50022C14 9.9855 11.9853 12.0002 9.5 12.0002C7.01472 12.0002 5 9.9855 5 7.50022Z" fill="currentColor"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M17.0318 13.7502C17.1698 13.2155 17.7153 12.8939 18.25 13.032C19.3227 13.3089 20.273 13.9343 20.9517 14.8099C21.6304 15.6854 21.9992 16.7616 22 17.8695V19.8702C22 20.4225 21.5523 20.8702 21 20.8702C20.4477 20.8702 20 20.4225 20 19.8702V17.871C19.9994 17.2064 19.7782 16.5605 19.371 16.0352C18.9638 15.5099 18.3936 15.1346 17.75 14.9685C17.2153 14.8304 16.8937 14.285 17.0318 13.7502Z" fill="currentColor"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M14.0258 3.77435C14.1506 3.23634 14.6879 2.90132 15.2259 3.02607C16.2795 3.27037 17.2313 3.82918 17.9212 4.6341C18.6129 5.44106 19 6.44898 19 7.50022C19 8.55147 18.6129 9.55938 17.9212 10.3663C17.2313 11.1713 16.2795 11.7301 15.2259 11.9744C14.6879 12.0991 14.1506 11.7641 14.0258 11.2261C13.9011 10.6881 14.2361 10.1508 14.7741 10.0261C15.4368 9.8724 16.0063 9.52727 16.4027 9.06476C16.7974 8.60431 17 8.05341 17 7.50022C17 6.94703 16.7974 6.39614 16.4027 5.93568C16.0063 5.47318 15.4368 5.12804 14.7741 4.97438C14.2361 4.84963 13.9011 4.31236 14.0258 3.77435Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/payment/gPayButton.svg b/packages/manager/src/assets/icons/payment/gPayButton.svg
index aa74f3f0d0e..b38b70cde4d 100644
--- a/packages/manager/src/assets/icons/payment/gPayButton.svg
+++ b/packages/manager/src/assets/icons/payment/gPayButton.svg
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="81.56" height="32.001" data-name="Layer 1" version="1.1" viewBox="0 0 81.56 32.001" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><metadata><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><defs><style>.cls-1{fill:currentColor;}.cls-2{fill:#4285f4;}.cls-3{fill:#34a853;}.cls-4{fill:#fabb05;}.cls-5{fill:#e94235;}.cls-6{fill:none;}</style></defs><path class="cls-1" d="m38.07 15.561v9.44h-3v-23.3h7.94a7.16 7.16 0 0 1 5.13 2 6.73 6.73 0 0 1 0 9.86 7.17 7.17 0 0 1-5.13 2zm0-11v8.12h5a4 4 0 0 0 3-1.2 3.93 3.93 0 0 0 1.2-2.85 4.15 4.15 0 0 0-4.17-4h-5z"/><path class="cls-1" d="m58.12 8.5309a7.38 7.38 0 0 1 5.24 1.78 6.3 6.3 0 0 1 1.92 4.86v9.83h-2.86v-2.22h-0.12a5.67 5.67 0 0 1-4.94 2.73 6.41 6.41 0 0 1-4.42-1.51 5 5 0 0 1-1.77-3.9 4.71 4.71 0 0 1 1.87-3.93 7.84 7.84 0 0 1 5-1.46 8.77 8.77 0 0 1 4.38 1v-0.71a3.44 3.44 0 0 0-1.23-2.66 4.26 4.26 0 0 0-2.9-1.09 4.54 4.54 0 0 0-4 2.12l-2.64-1.65a7.32 7.32 0 0 1 6.44-3.15m-3.84 11.53a2.36 2.36 0 0 0 1 1.95 3.65 3.65 0 0 0 2.32 0.78 4.76 4.76 0 0 0 3.37-1.4 4.39 4.39 0 0 0 1.48-3.29 6.1 6.1 0 0 0-3.89-1.14 5.15 5.15 0 0 0-3 0.87 2.66 2.66 0 0 0-1.24 2.2"/><polygon class="cls-1" transform="translate(-204.22 -38.999)" points="269.84 48.05 273.1 48.05 277.84 59.49 277.9 59.49 282.52 48.05 285.78 48.05 275.8 71 272.71 71 276.42 62.97"/><path class="cls-2" d="m26.16 13.661a16 16 0 0 0-0.25-2.81h-12.55v5.15h7.23a6.24 6.24 0 0 1-2.69 4.15v3.33h4.31a13.07 13.07 0 0 0 3.95-9.82"/><path class="cls-3" d="m17.9 20.151a8.08 8.08 0 0 1-4.54 1.28 8 8 0 0 1-7.5-5.52h-4.44v3.44a13.35 13.35 0 0 0 11.94 7.36 12.72 12.72 0 0 0 8.85-3.23z"/><path class="cls-4" d="m5.4395 13.361a8.08 8.08 0 0 1 0.42-2.56v-3.44h-4.44a13.39 13.39 0 0 0 0 12l4.44-3.45a8 8 0 0 1-0.42-2.55"/><path class="cls-5" d="m13.36 5.2909a7.26 7.26 0 0 1 5.13 2l3.81-3.81a12.84 12.84 0 0 0-8.94-3.48 13.35 13.35 0 0 0-11.94 7.36l4.44 3.44a8 8 0 0 1 7.5-5.51"/><rect class="cls-6" x="-204.22" y="-38.999" width="490" height="110"/></svg>
+<svg width="81.56" height="32.001" data-name="Layer 1" version="1.1" viewBox="0 0 81.56 32.001" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><metadata><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><defs><style>.cls-1{fill:currentColor;}.cls-2{fill:#4285f4;}.cls-3{fill:#34a853;}.cls-4{fill:#fabb05;}.cls-5{fill:#e94235;}.cls-6{fill:none;}</style></defs><path class="cls-1" d="m38.07 15.561v9.44h-3v-23.3h7.94a7.16 7.16 0 0 1 5.13 2 6.73 6.73 0 0 1 0 9.86 7.17 7.17 0 0 1-5.13 2zm0-11v8.12h5a4 4 0 0 0 3-1.2 3.93 3.93 0 0 0 1.2-2.85 4.15 4.15 0 0 0-4.17-4h-5z"/><path class="cls-1" d="m58.12 8.5309a7.38 7.38 0 0 1 5.24 1.78 6.3 6.3 0 0 1 1.92 4.86v9.83h-2.86v-2.22h-0.12a5.67 5.67 0 0 1-4.94 2.73 6.41 6.41 0 0 1-4.42-1.51 5 5 0 0 1-1.77-3.9 4.71 4.71 0 0 1 1.87-3.93 7.84 7.84 0 0 1 5-1.46 8.77 8.77 0 0 1 4.38 1v-0.71a3.44 3.44 0 0 0-1.23-2.66 4.26 4.26 0 0 0-2.9-1.09 4.54 4.54 0 0 0-4 2.12l-2.64-1.65a7.32 7.32 0 0 1 6.44-3.15m-3.84 11.53a2.36 2.36 0 0 0 1 1.95 3.65 3.65 0 0 0 2.32 0.78 4.76 4.76 0 0 0 3.37-1.4 4.39 4.39 0 0 0 1.48-3.29 6.1 6.1 0 0 0-3.89-1.14 5.15 5.15 0 0 0-3 0.87 2.66 2.66 0 0 0-1.24 2.2"/><polygon class="cls-1" transform="translate(-204.22 -38.999)" points="269.84 48.05 273.1 48.05 277.84 59.49 277.9 59.49 282.52 48.05 285.78 48.05 275.8 71 272.71 71 276.42 62.97"/><path class="cls-2" d="m26.16 13.661a16 16 0 0 0-0.25-2.81h-12.55v5.15h7.23a6.24 6.24 0 0 1-2.69 4.15v3.33h4.31a13.07 13.07 0 0 0 3.95-9.82"/><path class="cls-3" d="m17.9 20.151a8.08 8.08 0 0 1-4.54 1.28 8 8 0 0 1-7.5-5.52h-4.44v3.44a13.35 13.35 0 0 0 11.94 7.36 12.72 12.72 0 0 0 8.85-3.23z"/><path class="cls-4" d="m5.4395 13.361a8.08 8.08 0 0 1 0.42-2.56v-3.44h-4.44a13.39 13.39 0 0 0 0 12l4.44-3.45a8 8 0 0 1-0.42-2.55"/><path class="cls-5" d="m13.36 5.2909a7.26 7.26 0 0 1 5.13 2l3.81-3.81a12.84 12.84 0 0 0-8.94-3.48 13.35 13.35 0 0 0-11.94 7.36l4.44 3.44a8 8 0 0 1 7.5-5.51"/><rect class="cls-6" x="-204.22" y="-38.999" width="490" height="110"/></svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/payment/googlePay.svg b/packages/manager/src/assets/icons/payment/googlePay.svg
index 8910b402132..ad4865b5102 100644
--- a/packages/manager/src/assets/icons/payment/googlePay.svg
+++ b/packages/manager/src/assets/icons/payment/googlePay.svg
@@ -14,4 +14,4 @@
 			<path d="m370.87 318.3c12.63 0 23.94 4.35 32.87 12.85l24.45-24.43c-14.85-13.83-34.21-22.32-57.32-22.32-33.47 0-62.46 19.2-76.56 47.18l28.46 22.08c6.79-20.3 25.75-35.36 48.1-35.36z" fill="#e94235" />
 		</g>
 	</g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/payment/jcb.svg b/packages/manager/src/assets/icons/payment/jcb.svg
index e6d96ae3178..0c455365861 100644
--- a/packages/manager/src/assets/icons/payment/jcb.svg
+++ b/packages/manager/src/assets/icons/payment/jcb.svg
@@ -8,7 +8,7 @@
 		<path id="path6325" fill="#FFFFFF" d="M282.152,138.716c0,13.061-10.635,23.695-23.695,23.695H129.532V68.563
 			c0-13.06,10.635-23.695,23.695-23.695h128.925V138.716z"/>
 		<g id="g6327">
-			
+
 				<linearGradient id="path6338_1_" gradientUnits="userSpaceOnUse" x1="138.4824" y1="96.8465" x2="175.7471" y2="96.8465" gradientTransform="matrix(2.0492 0 0 -2.0492 -51.9252 308.6292)">
 				<stop  offset="0" style="stop-color:#007940"/>
 				<stop  offset="0.2285" style="stop-color:#00873F"/>
@@ -17,7 +17,7 @@
 			</linearGradient>
 			<path id="path6338" fill="url(#path6338_1_)" d="M240.171,114.648h9.796c0.279,0,0.932-0.094,1.212-0.094
 				c1.866-0.373,3.452-2.052,3.452-4.384c0-2.239-1.586-3.919-3.452-4.385c-0.28-0.093-0.839-0.093-1.212-0.093h-9.796V114.648z"/>
-			
+
 				<linearGradient id="path6349_1_" gradientUnits="userSpaceOnUse" x1="138.4824" y1="100.0107" x2="175.7139" y2="100.0107" gradientTransform="matrix(2.0492 0 0 -2.0492 -51.9252 308.6292)">
 				<stop  offset="0" style="stop-color:#007940"/>
 				<stop  offset="0.2285" style="stop-color:#00873F"/>
@@ -28,7 +28,7 @@
 				c0.56,0,1.213,0,1.68,0.093c5.411,0.28,9.422,3.079,9.422,7.93c0,3.825-2.705,7.09-7.743,7.743v0.187
 				c5.504,0.373,9.702,3.452,9.702,8.209c0,5.131-4.665,8.49-10.822,8.49h-26.307v34.517h24.908c9.329,0,16.978-7.557,16.978-16.979
 				V52.798H248.847L248.847,52.798z"/>
-			
+
 				<linearGradient id="path6360_1_" gradientUnits="userSpaceOnUse" x1="138.4816" y1="103.4929" x2="175.7496" y2="103.4929" gradientTransform="matrix(2.0492 0 0 -2.0492 -51.9252 308.6292)">
 				<stop  offset="0" style="stop-color:#007940"/>
 				<stop  offset="0.2285" style="stop-color:#00873F"/>
@@ -39,7 +39,7 @@
 				c-0.187,0-0.654-0.094-0.933-0.094h-8.863v8.21h8.863c0.28,0,0.84,0,0.933-0.093C251.833,100.281,253.419,98.789,253.419,96.55z"
 				/>
 		</g>
-		
+
 			<linearGradient id="path6371_1_" gradientUnits="userSpaceOnUse" x1="92.6833" y1="100.0333" x2="130.5236" y2="100.0333" gradientTransform="matrix(2.0492 0 0 -2.0492 -51.9252 308.6292)">
 			<stop  offset="0" style="stop-color:#1F286F"/>
 			<stop  offset="0.4751" style="stop-color:#004E94"/>
@@ -49,7 +49,7 @@
 		<path id="path6371" fill="url(#path6371_1_)" d="M154.999,52.798c-9.329,0-16.979,7.556-16.979,16.978v41.886
 			c4.758,2.332,9.702,3.825,14.646,3.825c5.877,0,9.049-3.545,9.049-8.396V87.314h14.553v19.684c0,7.65-4.758,13.9-20.897,13.9
 			c-9.795,0-17.445-2.146-17.445-2.146v35.73h24.908c9.329,0,16.978-7.557,16.978-16.979V52.798H154.999L154.999,52.798z"/>
-		
+
 			<linearGradient id="path6384_1_" gradientUnits="userSpaceOnUse" x1="115.4738" y1="99.988" x2="152.2254" y2="99.988" gradientTransform="matrix(2.0492 0 0 -2.0492 -51.9252 308.6292)">
 			<stop  offset="0" style="stop-color:#6C2C2F"/>
 			<stop  offset="0.1735" style="stop-color:#882730"/>
@@ -64,4 +64,4 @@
 			H201.924L201.924,52.798z"/>
 	</g>
 </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/payment/mastercard.svg b/packages/manager/src/assets/icons/payment/mastercard.svg
index 6ad92093a35..d1b2ff2071f 100644
--- a/packages/manager/src/assets/icons/payment/mastercard.svg
+++ b/packages/manager/src/assets/icons/payment/mastercard.svg
@@ -8,4 +8,4 @@
       <path d="M450.76889,328.3077v-1.1589h.4673v-.2361h-1.1901v.2361h.4675v1.1589Zm2.3105,0v-1.3973h-.3648l-.41959.9611-.41971-.9611h-.365v1.3973h.2576v-1.054l.3935.9087h.2671l.39351-.911v1.0563Z" transform="translate(-319.79649 -252)" style="fill: #f79e1b"/>
     </g>
   </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/pending.svg b/packages/manager/src/assets/icons/pending.svg
index 03ee9107408..1f85c52dc65 100644
--- a/packages/manager/src/assets/icons/pending.svg
+++ b/packages/manager/src/assets/icons/pending.svg
@@ -1,9 +1,7 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-  <g fill="none" fill-rule="evenodd">
-    <circle cx="32" cy="32" r="32" fill="#00B159"/>
-    <g fill="#FFF" fill-rule="nonzero" transform="translate(21.3 17)">
-      <path d="M-1.41042404,3.66141207 C-0.315926826,9.97839328 3.60220664,14.2944776 10.2056189,16.4273874 C10.50536,16.5242042 10.8279733,16.5242042 11.1277145,16.4273874 C17.7311267,14.2944776 21.6492602,9.97839328 22.7437574,3.66141207 C23.0983022,1.35863415 21.5375554,-0.769032307 19.2627524,-1.11900199 C19.050523,-1.15165268 18.8353855,-1.16679261 18.6151111,-1.16679261 L2.71822222,-1.16679261 C0.425755708,-1.18050948 -1.45143169,0.675982066 -1.46307549,2.9783457 C-1.46526586,3.19045842 -1.44896656,3.41264942 -1.41500199,3.63341911 L-1.41042404,3.66141207 Z M1.53689931,3.00272271 C1.54031573,2.34899543 2.06571112,1.82939249 2.70921493,1.83319318 L18.6151111,1.83319318 C18.6885111,1.83319318 18.7521563,1.83774009 18.8065809,1.8461131 C19.4439818,1.94417478 19.881222,2.54023633 19.7832202,3.17724756 C18.9130924,8.19773546 15.9444689,11.5814142 10.6666632,13.4180074 C5.39459231,11.583386 2.42656444,8.20430221 1.54839226,3.16569599 C1.54019251,3.1087829 1.5364648,3.05421153 1.53689931,3.00272271 Z"/>
-      <path d="M-1.46266667,27.0142222 C-1.46266667,26.7941304 -1.4476612,26.5806436 -1.41042404,26.3403657 C-0.315990009,20.0237492 3.60177627,15.7075744 10.2052445,13.5727335 C10.505216,13.4757555 10.8281173,13.4757555 11.1280889,13.5727335 C17.7315571,15.7075744 21.6493233,20.0237492 22.7486064,26.3701275 C23.0957228,28.6444345 21.535024,30.7691483 19.2609747,31.119002 C19.0396601,31.1530504 18.8167866,31.1693755 18.6151111,31.1666667 L2.72226074,31.1666667 C0.42298041,31.1778378 -1.45154773,29.3222389 -1.46266667,27.0142222 Z M1.5501131,26.8245302 C1.54168473,26.8793146 1.53731587,26.9412232 1.53731587,27.0069847 C1.5404236,27.6510612 2.06571444,28.1705796 2.70916442,28.166694 L2.71822222,28.1666667 L18.6343403,28.1667899 C18.6863616,28.1674569 18.7440778,28.1632292 18.8048031,28.1538869 C19.4428996,28.0557182 19.8802549,27.4603087 19.7877982,26.8525232 C18.9132684,21.8051025 15.944706,18.4204172 10.6666658,16.5821347 C5.38863022,18.4203961 2.42019285,21.80432 1.5501131,26.8245302 Z"/>
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" fill="currentColor"/>
+  <path d="M16.0214 6.8986C16.3887 6.8986 16.6865 7.19637 16.6865 7.56364C16.6865 7.93091 16.3887 8.22867 16.0214 8.22867H8.02143C7.65416 8.22867 7.35639 7.93091 7.35639 7.56364C7.35639 7.19637 7.65416 6.8986 8.02143 6.8986H16.0214Z" fill="white"/>
+  <path d="M14.2646 6.8986C14.6961 6.89724 15.0935 7.09854 15.3574 7.42692C15.6203 7.75407 15.7296 8.17868 15.6708 8.58903L15.6689 8.60075C15.5105 9.58231 15.14 10.3394 14.5224 10.9318C13.9228 11.5068 13.1371 11.8802 12.2392 12.1916C12.0981 12.2405 11.9448 12.2405 11.8037 12.1916C10.9058 11.8802 10.12 11.5068 9.52045 10.9318C8.90285 10.3394 8.53241 9.58231 8.37397 8.60075L8.37201 8.58903C8.31324 8.17868 8.4226 7.75407 8.68549 7.42692C8.94939 7.09854 9.34672 6.89822 9.77826 6.89957L14.2646 6.8986ZM9.77436 8.22867C9.76687 8.22863 9.74566 8.23138 9.7226 8.25992C9.69804 8.29049 9.68017 8.34144 9.68744 8.39762C9.80857 9.13936 10.0678 9.61357 10.4414 9.97184C10.7993 10.3152 11.3047 10.5906 12.0214 10.8556C12.7381 10.5906 13.2435 10.3152 13.6015 9.97184C13.975 9.6136 14.2333 9.13927 14.3544 8.39762C14.3618 8.34139 14.3448 8.29051 14.3203 8.25992C14.2972 8.23138 14.276 8.22863 14.2685 8.22867H9.77436Z" fill="white"/>
+  <path d="M11.9111 10.9074C12.0205 10.889 12.1333 10.899 12.2392 10.9357C14.1622 11.6032 15.23 13.4187 15.6035 15.1769L15.6689 15.5275L15.6708 15.5392C15.7293 15.9494 15.6193 16.3734 15.3564 16.7004C15.0925 17.0285 14.6959 17.229 14.2646 17.2277L9.77826 17.2287C9.34694 17.23 8.95037 17.0285 8.68647 16.7004C8.42359 16.3734 8.31352 15.9494 8.37201 15.5392L8.37397 15.5275C8.67436 13.666 9.75245 11.6477 11.8037 10.9357L11.9111 10.9074ZM12.0214 12.2785C10.7397 12.8361 9.93481 14.2195 9.68842 15.7267C9.68026 15.784 9.69765 15.8363 9.7226 15.8673C9.74565 15.8959 9.76686 15.8986 9.77436 15.8986H14.2685C14.276 15.8986 14.2972 15.8959 14.3203 15.8673C14.3452 15.8363 14.3626 15.784 14.3544 15.7267C14.108 14.2196 13.3032 12.8361 12.0214 12.2785Z" fill="white"/>
+  <path d="M16.0214 15.8986C16.3887 15.8986 16.6865 16.1964 16.6865 16.5636C16.6865 16.9309 16.3887 17.2287 16.0214 17.2287H8.02143C7.65416 17.2287 7.35639 16.9309 7.35639 16.5636C7.35639 16.1964 7.65416 15.8986 8.02143 15.8986H16.0214Z" fill="white"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/pointer.svg b/packages/manager/src/assets/icons/pointer.svg
index 676f587837c..3453f1b8564 100644
--- a/packages/manager/src/assets/icons/pointer.svg
+++ b/packages/manager/src/assets/icons/pointer.svg
@@ -1,7 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>icon_pointer</title>
-    <g id="icon_pointer" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <polygon id="icon-/-" fill="currentColor" fill-rule="nonzero" transform="translate(9.000000, 8.000000) scale(1, -1) rotate(-90.000000) translate(-9.000000, -8.000000) " points="4.41 5 9 8.70850202 13.59 5 15 6.1417004 9 11 3 6.1417004"></polygon>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M5.52973 3.52973C5.78943 3.27004 6.21049 3.27004 6.47019 3.52973L10.4702 7.52974C10.7299 7.78943 10.7299 8.21049 10.4702 8.47019L6.47019 12.4702C6.21049 12.7299 5.78943 12.7299 5.52973 12.4702C5.27004 12.2105 5.27004 11.7894 5.52973 11.5297L9.05951 7.99996L5.52973 4.47019C5.27004 4.21049 5.27004 3.78943 5.52973 3.52973Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/postgresql.svg b/packages/manager/src/assets/icons/postgresql.svg
index a3996622490..a658739b47f 100644
--- a/packages/manager/src/assets/icons/postgresql.svg
+++ b/packages/manager/src/assets/icons/postgresql.svg
@@ -1,22 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="27px" height="28px" viewBox="0 0 27 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>postgresql</title>
-    <g id="Databases-multi-engine-options" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Create-Database-Copy-9" transform="translate(-223.000000, -596.000000)" fill-rule="nonzero">
-            <g id="postgresql" transform="translate(223.000000, 596.000000)">
-                <polygon id="Path" fill="#000000" points="24.5038185 17.1381615 24.5083873 17.1335927 24.5015341 17.1381615 24.5026763 17.1381615"></polygon>
-                <path d="M21.1206179,16.9211433 L21.1229023,16.9234277 L21.1229023,16.9245699 L21.1194757,16.9257121 C20.9538565,16.9862487 20.8167923,17.0113772 20.7014299,17.0627762 C20.5837832,17.1096065 20.4889805,17.1952716 20.4330126,17.3049229 L20.4318704,17.3072073 C20.3610539,17.4385605 20.299375,17.6715696 20.3176503,18.0679135 C20.3644805,18.1021795 20.4215906,18.1284502 20.4798429,18.1467254 L20.4844117,18.1478676 C20.6774437,18.2072621 21.0006867,18.2460969 21.3616224,18.2403859 C22.0812093,18.2323905 22.9675576,18.0622025 23.4381446,17.8406154 C23.8436261,17.6475834 24.1908553,17.4145743 24.5003919,17.1381615 C22.9287227,17.4671155 22.0412322,17.379166 21.4964021,17.1518679 C21.3547692,17.0901891 21.2302692,17.0136616 21.1206179,16.9211433 Z" id="Path" fill="#31648C"></path>
-                <polygon id="Path" fill="#000000" points="19.5089716 4.84122081 19.5158248 4.85150062 19.5238203 4.86063823"></polygon>
-                <path d="M13.4975654,22.1432882 C13.4964232,22.1147332 13.4975654,22.085036 13.4964232,22.0564809 C13.4964232,22.0450589 13.495281,22.0370635 13.495281,22.0256415 L13.4975654,22.1432882 Z M12.2925429,17.1027533 C12.2262952,17.0696294 12.1486255,17.0456432 12.0652448,17.0342212 L12.0618182,17.0342212 L12.0618182,17.0319368 L12.037832,17.0319368 C11.9784375,17.0376478 11.8916302,17.0582074 11.7225844,17.2466707 C11.3296671,17.6921292 11.1926029,17.9719686 10.8682177,18.2335327 C10.5438325,18.4939546 10.1235024,18.6333032 9.28284213,18.80806 C9.0167092,18.8628857 8.8636542,18.9234224 8.76314048,18.972537 C8.79626432,18.9999499 8.79283771,19.0068031 8.84195237,19.0330737 C8.96531013,19.1016058 9.12293393,19.1621425 9.25086049,19.1952663 C9.61179615,19.2866424 10.2057409,19.3928672 10.8248141,19.2866424 C11.4438873,19.1792755 12.0880889,18.8788765 12.6374878,18.0987529 C12.7322905,17.9639732 12.7425703,17.7652301 12.6649006,17.5516384 C12.5872309,17.3380468 12.4136163,17.1541523 12.2925429,17.1027533 Z M20.0823568,7.98113257 C19.3159396,7.99141238 18.8864718,8.19129764 18.660316,8.45286177 C18.3404996,8.82407723 18.3108023,9.47513206 18.5095454,10.2769575 C18.7071462,11.0799251 19.1149121,11.9776954 19.4986918,12.723553 C19.6905817,13.0970528 19.8767605,13.43286 20.0263889,13.7058462 C20.1771595,13.9799745 20.287953,14.1741488 20.3553429,14.339768 C20.4170218,14.492823 20.4866961,14.6276028 20.5563704,14.7532449 C20.8533427,14.1193231 20.905884,13.4968233 20.8761868,12.8480529 C20.8373519,12.0450853 20.6523153,11.2238425 20.6797281,10.3923198 C20.7105676,9.42030639 20.900173,8.78752679 20.9161638,8.03595824 C20.6660217,8.0016922 20.3759025,7.98113257 20.0823568,7.98113257 Z M20.2239897,8.5590865 L20.2228475,8.56822411 C20.2228475,8.57165072 20.2228475,8.57507732 20.2228475,8.57964613 C20.2228475,8.63218739 20.2079989,8.68244426 20.1817283,8.72356351 L20.1828705,8.72242131 C20.1474622,8.78752679 20.106343,8.84463686 20.0583705,8.89375152 C19.9464348,9.01825148 19.7968064,9.10505879 19.6277606,9.13475603 L19.6231918,9.13589823 C19.5992055,9.13932483 19.5717927,9.14046703 19.5432377,9.14046703 C19.3993203,9.14046703 19.2668249,9.09477898 19.1583158,9.01710928 L19.1606002,9.01825148 C19.1046323,8.97941663 19.0555177,8.93487077 19.0155406,8.88461391 L19.0143984,8.88347171 C18.9789902,8.84463686 18.9538617,8.79438 18.9435819,8.74069653 L18.9435819,8.73841213 C18.9435819,8.73270112 18.9424397,8.72699011 18.9424397,8.7212791 C18.9424397,8.67216444 18.9607149,8.62647638 18.9915544,8.59221034 C19.0281048,8.54994889 19.0715085,8.51568284 19.1217653,8.49055441 L19.1240497,8.48941221 C19.2325589,8.42773333 19.3787607,8.38204528 19.5443799,8.35691684 C19.6060588,8.34777923 19.6677376,8.34321043 19.7248477,8.34206823 L19.7248477,8.34549483 L19.7808156,8.34549483 C19.8550587,8.34777923 19.9235908,8.35577464 19.9841274,8.37062326 C20.0446641,8.38432968 20.0972054,8.4048893 20.1394668,8.43344434 C20.1817283,8.46199938 20.2137099,8.50540303 20.2239897,8.5590865 L20.2239897,8.5590865 Z M7.5124299,13.0148143 C7.5124299,12.8092181 7.52842072,12.6081906 7.55811796,12.4105898 L7.55583355,12.4322916 C7.6723381,11.5882047 7.68832892,10.7989435 7.6746225,10.1753015 C7.66091608,9.56765037 7.61751243,9.16331106 7.61751243,8.91088454 C7.61751243,8.90745794 7.61751243,8.90403133 7.61751243,8.90060473 C7.61751243,8.89717813 7.61751243,8.89260932 7.61751243,8.88918272 L7.61751243,8.88347171 L7.61637023,8.8766185 L7.61637023,8.8754763 C7.61637023,8.8731919 7.61637023,8.87204969 7.61637023,8.86976529 C7.61637023,7.51739879 7.85394813,6.22100015 8.28455807,5.01826203 C8.60094787,4.16846416 9.07153486,3.30610207 9.77627315,2.60707479 C9.08295688,2.3763501 7.85394813,2.02455205 6.52214125,1.95830437 C6.39421469,1.95145116 6.2445863,1.94688236 6.09495791,1.94688236 L6.09381571,1.94688236 L6.09381571,1.94802456 C5.95104053,1.94802456 5.80712315,1.95259336 5.66549017,1.96058877 C4.52557313,2.02683646 3.44733497,2.36150148 2.6774912,3.18845532 C1.90536302,4.01540917 1.39708338,5.37120228 1.50787692,7.61562811 C1.52957875,8.04052705 1.71233098,9.23070095 2.02529417,10.6447463 C2.33939957,12.0587917 2.78143153,13.7229792 3.3136974,15.1929925 C3.84710547,16.6630057 4.49359149,17.9422713 5.10809586,18.5476381 C5.41763245,18.8503215 5.68604979,18.972537 5.9293387,18.9622572 C6.17376981,18.9508352 6.46845778,18.80806 6.82825123,18.3705969 C7.53527393,17.509377 8.20346177,16.7475286 8.89335144,16.0073821 L8.87050741,16.0313683 C8.03670036,15.2946484 7.5124299,14.2175524 7.5124299,13.0148143 Z" id="Shape" fill="#31648C"></path>
-                <path d="M13.5877994,1.89091449 L13.5877994,1.88863008 C12.2537081,1.89205669 11.2976855,2.2998226 10.5712454,2.91090037 C9.82310341,3.54253777 9.32167698,4.40718426 8.99158076,5.29239038 C8.59980567,6.3432157 8.4661681,7.35977499 8.41248463,8.04966466 L8.42733325,8.04052705 C8.83053036,7.81208676 9.35936963,7.58364647 9.92590154,7.4511511 C10.4924335,7.31865573 11.102369,7.27867868 11.6551945,7.49569696 C12.20802,7.71271523 12.6649006,8.22327928 12.8305198,8.99769185 C13.6243498,12.7178419 12.5838043,14.1010479 12.2000246,15.14502 C12.0778091,15.445419 11.9510247,15.8314831 11.8448,16.2255426 L11.8265247,16.3020701 C11.8744972,16.2906481 11.9236119,16.2769416 11.9715843,16.2723728 C12.2422861,16.2495288 12.4547355,16.3409049 12.5803777,16.3957306 C12.9664418,16.5579232 13.2314325,16.8982992 13.3742077,17.2866477 C13.4119003,17.3883036 13.438171,17.497955 13.4541618,17.6110329 C13.4690104,17.6498678 13.4770058,17.6955558 13.4770058,17.7423861 C13.4770058,17.7469549 13.4770058,17.7515237 13.4770058,17.7560925 C13.4587306,18.3271932 13.4473086,18.9976655 13.4473086,19.6715643 C13.4473086,20.4699631 13.4632994,21.2649353 13.4929966,22.0564809 C13.5192673,22.6572789 13.5569599,23.1895448 13.6037902,23.6087327 C13.6529048,24.035916 13.7214369,24.359159 13.7648406,24.4688104 C13.908758,24.8343148 14.1200652,25.3128972 14.5015605,25.6384246 C14.8830558,25.9628099 15.4301703,26.1798281 16.4295965,25.9628099 C17.2965274,25.7743466 17.8310777,25.5127825 18.1885868,25.1369982 C18.5460958,24.7612139 18.7585453,24.2380857 18.8944673,23.4374025 C19.0989213,22.238091 19.5089716,18.7600876 19.5592285,18.1056061 C19.5363845,17.6121751 19.6083432,17.2329642 19.7648248,16.9439873 C19.924733,16.6470149 20.1737329,16.4654049 20.3873245,16.3671756 C20.4946915,16.3180609 20.5952052,16.284937 20.6774437,16.2609508 C20.57693,16.1158912 20.4866961,15.9948179 20.3930355,15.8771711 L20.4033154,15.8897353 C20.1074852,15.5287997 19.8550587,15.1141806 19.664311,14.6675798 L19.6517468,14.634456 C19.5363845,14.3957359 19.4392973,14.215268 19.3376414,14.0382268 L19.3616276,14.0827727 C19.2119993,13.8086443 19.0223938,13.4659839 18.8236508,13.081062 C18.4261647,12.310076 17.9944125,11.3757553 17.7693988,10.4654207 C17.5455274,9.55622836 17.5135457,8.61505437 18.0869308,7.95143533 C18.5940683,7.36205939 19.4861276,7.11762828 20.8236455,7.25469245 C20.7848106,7.1347613 20.7608244,7.03538978 20.6934345,6.87548158 C20.3679071,6.11020661 19.976132,5.45001418 19.511256,4.85150062 C18.37705,3.38719837 16.5438167,1.93774474 13.7134415,1.89091449 L13.5877994,1.89091449 Z" id="Shape" fill="#31648C"></path>
-                <polygon id="Path" fill="#000000" points="8.39649381 8.97484782 8.39877822 8.97370562 8.40220482 8.97027902"></polygon>
-                <path d="M15.683739,0.580809433 C15.7031564,0.575098426 15.7237161,0.572814023 15.7419913,0.568245217 L15.7648353,0.561392008 L15.683739,0.580809433 Z" id="Path" fill="#000000"></path>
-                <polygon id="Path" fill="#000000" points="10.0755299 8.20157745 10.0869519 8.20043525 10.0960896 8.19700864"></polygon>
-                <polygon id="Path" fill="#000000" points="10.9047682 8.54195348 10.9024838 8.54195348 10.9024838 8.54195348"></polygon>
-                <path d="M11.4907175,14.8766027 C11.9487403,13.6270343 12.8499372,12.7155575 12.0915155,9.15874226 C11.9670155,8.57621952 11.7214422,8.34092602 11.3833506,8.20843066 C11.2188736,8.14789398 11.0281259,8.11248574 10.8282407,8.11248574 C10.8156765,8.11248574 10.80197,8.11248574 10.7894058,8.11248574 L10.7916902,8.11248574 C10.5484013,8.11477014 10.3131078,8.14560958 10.0869519,8.20043525 C9.60722734,8.3215086 9.18461281,8.49283882 8.79169551,8.71214149 C8.64435153,8.79323779 8.51756717,8.8777607 8.39877822,8.97256342 L8.37707639,8.99312305 C8.3839296,9.15988446 8.41591124,9.56422377 8.42961765,10.1593107 C8.44332407,10.8103655 8.42733325,11.640746 8.30283329,12.5396585 C8.03327375,14.492823 9.43361272,16.1101802 11.0783828,16.1124646 C11.1754699,15.7115519 11.3330937,15.3049282 11.4907175,14.8766027 Z M10.5187041,9.20100371 L10.5187041,9.20100371 C10.4650206,9.14617804 10.421617,9.08449916 10.3862087,9.01710928 L10.3839243,9.01254047 C10.3542271,8.96456801 10.3370941,8.90631574 10.3370941,8.84349466 C10.3370941,8.83207264 10.3382363,8.82065063 10.3393785,8.80922862 L10.3393785,8.81037082 C10.3565115,8.68701306 10.4570252,8.62304978 10.5541123,8.58764154 C10.6443462,8.5579443 10.74486,8.54081128 10.8522269,8.54081128 C10.8682177,8.54081128 10.8842086,8.54081128 10.9024838,8.54195348 L10.9013416,8.53738467 C10.960736,8.53738467 11.0246993,8.54309568 11.0886626,8.55223329 C11.261135,8.57621952 11.4153322,8.62304978 11.5318368,8.69158187 C11.590089,8.72356351 11.6403459,8.76354056 11.680323,8.81151302 L11.6814652,8.81265522 C11.7203,8.85720108 11.743144,8.91545335 11.743144,8.98055883 C11.743144,8.98969644 11.743144,8.99883405 11.7420018,9.00797167 L11.7420018,9.00682946 C11.7305798,9.07536155 11.6997404,9.13475603 11.6574789,9.18272849 C11.6106487,9.23983856 11.5581074,9.28895322 11.4987129,9.33007247 L11.4964285,9.33121467 C11.3810662,9.41573758 11.2360066,9.46599444 11.079525,9.46599444 C11.0486856,9.46599444 11.0178461,9.46371004 10.9881489,9.46028344 L10.9915755,9.46028344 C10.80197,9.4283018 10.6397774,9.33464128 10.5187041,9.20100371 Z" id="Shape" fill="#31648C"></path>
-                <path d="M20.1200494,4.38548243 C20.6146226,5.01940423 21.0429482,5.74127554 21.3730444,6.51568812 L21.3970306,6.5785092 C21.5215306,6.88005038 21.6049113,7.1347613 21.6517415,7.33236215 C21.6757278,7.43173368 21.6917186,7.51511438 21.6974296,7.60192169 C21.699714,7.64532535 21.7019984,7.6898712 21.6837232,7.7663987 C21.6837232,7.7698253 21.6780122,7.77782071 21.67687,7.78124732 C21.711136,8.78181578 21.4655627,9.46028344 21.4370077,10.4151638 C21.4141636,11.1073379 21.5889205,11.9205853 21.6323241,12.8080759 C21.6734434,13.6418829 21.5740718,14.5579285 21.0383794,15.456841 C21.0840674,15.5116667 21.1240445,15.5664923 21.1674481,15.621318 C22.5826357,13.3654702 23.6026216,10.86976 24.1463095,8.74183873 C24.4375709,7.59621068 24.591768,6.55794957 24.6054745,5.73556454 C24.6168965,4.9131795 24.4649837,4.31695035 24.2730938,4.06795043 C22.7585347,2.10793276 20.7105676,1.60879073 18.9926966,1.59508431 L18.9926966,1.59622651 L18.8282196,1.59622651 C18.1657427,1.60650633 17.5261099,1.68303382 16.908179,1.81667139 C18.3108023,2.44716659 19.3730497,3.41803781 20.1200494,4.38548243 Z" id="Shape" fill="#31648C"></path>
-                <path d="M13.7762626,0.394630598 L13.7648406,0.394630598 C12.4353181,0.371786569 11.2942589,0.698456181 10.3725023,1.24214407 C9.46559436,0.923469865 7.58438859,0.374070972 5.60038468,0.48372231 C4.21946314,0.560249807 2.71175724,0.985148743 1.59468423,2.17874925 C0.481037825,3.37234976 -0.107195917,5.21928949 0.0161618389,7.73213266 C0.0504278821,8.42544893 0.245744329,9.55622836 0.568987336,11.0205306 C0.893372546,12.4848329 1.34796872,14.1992772 1.91564284,15.762951 C2.48331695,17.327767 3.10467454,18.7326747 4.07668796,19.6875551 C4.56212357,20.1661375 5.23031142,20.5681925 6.01728821,20.5350686 C6.57011371,20.5122246 7.06925574,20.2666513 7.50100788,19.9045734 C7.71117295,20.1844128 7.93504443,20.3066283 8.13949849,20.4197063 C8.39649381,20.5624814 8.64663593,20.6595686 8.90591566,20.7235318 C9.37193384,20.8411786 10.1691904,20.9988024 11.1035112,20.837752 C11.4221854,20.7840685 11.7568505,20.678986 12.0903733,20.5293576 C12.1029375,20.9062841 12.1177861,21.2752151 12.1314925,21.648715 C12.1783228,22.8320357 12.2068778,23.9251225 12.5575337,24.8834295 C12.6135015,25.0399111 12.7688409,25.8463053 13.3776343,26.5578968 C13.9864277,27.2706305 15.1811704,27.7149469 16.5403901,27.4202589 C17.4998393,27.2123782 18.7185682,26.8377362 19.5295313,25.6704063 C20.3302145,24.5167828 20.6911501,22.8617329 20.7631088,20.1775596 C20.781384,20.0325 20.8030859,19.9091422 20.8247877,19.7937799 L21.0155353,19.8109129 L21.0383794,19.8109129 C22.0617919,19.8577432 23.1720117,19.7103992 24.0994792,19.2740782 C24.9207221,18.8891563 25.5420796,18.4996656 25.9955336,17.8086338 C26.1086116,17.6373036 26.2319693,17.4305651 26.2662354,17.0741982 C26.3005014,16.7178314 26.0983317,16.1604371 25.7625245,15.9034418 C25.0909101,15.3871667 24.6694377,15.5836254 24.217126,15.6784281 C23.8139289,15.7732308 23.3479107,15.8326253 22.8704705,15.8451895 L22.8613329,15.8451895 C24.1657269,13.6213233 25.1011899,11.2592507 25.634598,9.16902207 C25.9509878,7.93544451 26.128029,6.79781188 26.1417354,5.80295442 C26.156584,4.80809697 26.0766299,3.92745966 25.487254,3.16561129 C23.6471675,0.785263491 21.0600812,0.127355461 19.0578021,0.104511432 C18.9961232,0.10336923 18.9333021,0.102227029 18.8716232,0.10336923 L18.8716232,0.0999426261 C17.7819631,0.109080238 16.7334221,0.273557245 15.7408491,0.567103016 L15.6940188,0.583093836 C15.1206337,0.4757269 14.4547303,0.407194814 13.7762626,0.394630598 Z M16.4821378,1.12221292 C17.1811651,0.949740498 17.9852749,0.845800167 18.8122288,0.835520354 L18.819082,0.835520354 L18.8202242,0.830951548 C20.7139942,0.812676325 23.1320346,1.3506532 24.869323,3.59736344 C25.2599559,4.10221648 25.3764604,4.84007861 25.362754,5.74927095 C25.3479054,6.6573211 25.1822862,7.74469687 24.8784606,8.93601298 C24.2890847,11.2432599 23.1765805,13.9331443 21.6094801,16.3466159 C21.6608791,16.3843086 21.7202736,16.4174324 21.7819525,16.4425608 L21.7876635,16.4448452 C22.1143331,16.5819094 22.8601907,16.6995562 24.3484791,16.3900196 C24.7231212,16.3100655 24.9972496,16.256382 25.2816577,16.4756847 C25.4095843,16.585336 25.4895384,16.7475286 25.4895384,16.9291387 C25.4895384,16.9405607 25.4895384,16.9519827 25.4883962,16.9634047 L25.4883962,16.9622625 C25.4712632,17.1073221 25.4198641,17.237533 25.3410522,17.3460422 C25.0532174,17.7835053 24.4855433,18.1981245 23.7591032,18.5396427 C23.1149016,18.8434683 22.1908606,19.0022343 21.3719022,19.0113719 C20.9607097,19.0159407 20.582641,18.9839591 20.2605402,18.8823031 L20.2399806,18.8743077 C20.1154806,20.0850412 19.8299302,22.4756689 19.6437514,23.5664712 C19.4952652,24.4459663 19.2348433,25.1449936 18.7368435,25.6681219 C18.2399858,26.1912501 17.5375319,26.5064977 16.5917892,26.712094 C15.4210327,26.9668049 14.566666,26.6926766 14.0161249,26.2232318 C13.466726,25.7549292 13.2154417,25.1335716 13.0635289,24.7532185 C12.9595886,24.4905122 12.9059051,24.1501362 12.8533638,23.69554 C12.8008226,23.2409438 12.7631299,22.6846917 12.7368593,22.0576231 C12.7117309,21.4202747 12.6980244,20.6709906 12.6980244,19.9182798 C12.6980244,19.6704221 12.7003088,19.4237066 12.7025932,19.1758489 C12.2308641,19.6144542 11.6346349,19.9228486 10.9721581,20.0404954 L10.9515984,20.043922 C10.1737593,20.1775596 9.48044298,20.0462064 9.06582386,19.9411239 C8.84537898,19.885156 8.65348914,19.8063441 8.47302131,19.7081148 C8.28341587,19.6053166 8.10294804,19.4876699 7.98187469,19.2580874 C7.93390223,19.1701379 7.90534719,19.0639132 7.90534719,18.9519774 C7.90534719,18.9074316 7.909916,18.8628857 7.91905361,18.8217664 C7.96017286,18.6687115 8.04583797,18.5385005 8.16348472,18.4471244 L8.16462692,18.4459822 C8.3884984,18.2620877 8.68318637,18.1592896 9.12978714,18.0656291 C9.94075016,17.8965833 10.2240161,17.7812209 10.3964885,17.6430146 C10.5426903,17.5242256 10.7094517,17.2843633 11.0018553,16.9325653 C11.0007131,16.9222855 10.9995709,16.9051524 10.9984287,16.8891616 L10.9984287,16.885735 C10.4456032,16.8697442 9.93047035,16.7201158 9.48044298,16.4676893 L9.497576,16.4768269 C9.32853019,16.6572947 8.4638837,17.5824779 7.41077397,18.8663123 C6.96759981,19.403147 6.47759539,19.7115414 5.96132034,19.7332432 C5.44504529,19.754945 4.9778849,19.4922387 4.5803988,19.102748 C3.7865688,18.3226244 3.1537892,16.9805377 2.6021059,15.4636942 C2.05156481,13.9468507 1.60382184,12.2575348 1.28514764,10.818361 C0.965331237,9.37918713 0.7780102,8.21871047 0.750597366,7.65903176 C0.631808416,5.28096836 1.18120731,3.67845974 2.1235235,2.66761147 C3.06698189,1.65676319 4.35995392,1.27412571 5.61980211,1.20102482 C7.88250316,1.06967165 10.0298419,1.86807046 10.4650206,2.03940067 C11.3033965,1.46373115 12.3827768,1.10507989 13.7294323,1.12792392 C14.4079,1.13820374 15.060097,1.22843765 15.683739,1.38948805 L15.6266289,1.37692384 L15.649473,1.36664402 C15.8676334,1.28440552 16.1463306,1.20102482 16.431881,1.13249273 L16.4821378,1.12221292 Z" id="Shape" fill="#31648C"></path>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.3438 16.6592C17.475 15.574 17.4352 15.417 18.2414 15.5928L18.4453 15.6115C19.0664 15.6397 19.8774 15.5108 20.3555 15.2905C21.3821 14.8147 21.9914 14.0178 20.9789 14.2264C18.668 14.7022 18.5086 13.9217 18.5086 13.9217C20.9485 10.303 21.968 5.70686 21.0867 4.58186C18.6867 1.51389 14.5289 2.96467 14.461 3.00217L14.4399 3.00686C13.9828 2.91311 13.4719 2.85451 12.8977 2.84514C11.8524 2.82873 11.0578 3.11936 10.4578 3.57639C10.4578 3.57639 3.04456 0.522481 3.38909 7.41779C3.46175 8.88498 5.49143 18.5178 7.91253 15.6092C8.79612 14.5451 9.65159 13.6451 9.65159 13.6451C10.0758 13.9264 10.5844 14.0717 11.1164 14.0201L11.1586 13.985C11.1446 14.1162 11.1516 14.2451 11.175 14.3998C10.5516 15.0959 10.7344 15.2178 9.48752 15.4756C8.22659 15.7358 8.96721 16.1975 9.45003 16.3194C10.036 16.467 11.393 16.6733 12.3094 15.3912L12.2719 15.5365C12.5156 15.7311 12.4992 16.9428 12.5344 17.8076C12.5696 18.6725 12.6281 19.4811 12.8039 19.9569C12.9797 20.4326 13.1883 21.6584 14.8266 21.3069C16.2024 21.0092 17.25 20.5873 17.3438 16.6592Z" fill="black" stroke="black" stroke-width="3.57868"/>
+<path d="M20.9839 14.2244C18.6729 14.7002 18.5136 13.9197 18.5136 13.9197C20.9534 10.2987 21.9729 5.7049 21.0917 4.5799C18.6917 1.51193 14.5339 2.96272 14.4659 3.00022L14.4425 3.0049C13.9854 2.91115 13.4745 2.85256 12.9003 2.84318C11.855 2.82678 11.0628 3.1174 10.4604 3.57443C10.4604 3.57443 3.04481 0.520528 3.39168 7.41584C3.46434 8.88303 5.49403 18.5158 7.91512 15.6072C8.79872 14.5432 9.65418 13.6432 9.65418 13.6432C10.0784 13.9244 10.587 14.0697 11.119 14.0182L11.1612 13.983C11.1495 14.1143 11.1542 14.2432 11.1776 14.3979C10.5542 15.094 10.737 15.2158 9.49012 15.4737C8.22918 15.7338 8.96981 16.1955 9.45262 16.3174C10.0386 16.4651 11.3956 16.6713 12.312 15.3893L12.2745 15.5346C12.5182 15.7291 12.6893 16.8072 12.6612 17.7846C12.6331 18.7619 12.6143 19.4322 12.8065 19.9549C12.9987 20.4776 13.1909 21.6565 14.8292 21.3049C16.1979 21.0119 16.9081 20.2502 17.0065 18.9822C17.0768 18.0799 17.2362 18.2135 17.2456 17.4072L17.3722 17.0252C17.5198 15.8018 17.3956 15.408 18.2393 15.5908L18.4432 15.6096C19.0643 15.6377 19.8776 15.5088 20.3534 15.2885C21.387 14.8127 21.9964 14.0158 20.9839 14.2244Z" fill="#336791"/>
+<path d="M12.4151 14.9248C12.3518 17.1982 12.4315 19.4904 12.6541 20.0459C12.8768 20.6037 13.3526 21.6842 14.9932 21.335C16.3619 21.042 16.8611 20.4725 17.0768 19.2186C17.2361 18.2951 17.5432 15.7334 17.583 15.2084" stroke="white" stroke-width="1.19289" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.451 3.52264C10.451 3.52264 3.03064 0.489824 3.37752 7.38514C3.45017 8.85232 5.47986 18.4851 7.90095 15.5765C8.78455 14.5125 9.58611 13.6781 9.58611 13.6781" stroke="white" stroke-width="1.19289" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.4586 2.96954C14.2008 3.04923 18.586 1.36642 21.0774 4.55157C21.9563 5.67657 20.9368 10.2703 18.4969 13.8914" stroke="white" stroke-width="1.19289" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.4971 13.8917C18.4971 13.8917 18.6565 14.6745 20.9675 14.1964C21.98 13.9878 21.3706 14.7823 20.344 15.2605C19.5003 15.6519 17.6112 15.7527 17.5807 15.2113C17.5011 13.8167 18.5745 14.2409 18.4971 13.8917ZM18.4971 13.8917C18.4268 13.5777 17.9464 13.2683 17.63 12.4972C17.3534 11.8245 13.8261 6.67063 18.6073 7.43703C18.7831 7.40188 17.3604 2.89016 12.8862 2.81516C8.41199 2.7425 8.55965 8.31594 8.55965 8.31594" stroke="white" stroke-width="1.19289" stroke-linecap="round" stroke-linejoin="bevel"/>
+<path d="M11.1612 14.367C10.5377 15.0631 10.7205 15.185 9.47365 15.4428C8.21271 15.703 8.95334 16.1647 9.43615 16.2866C10.0221 16.4342 11.3791 16.6405 12.2955 15.3584C12.5744 14.967 12.2932 14.3436 11.9112 14.1842C11.7283 14.1069 11.4799 14.0108 11.1612 14.367Z" stroke="white" stroke-width="1.19289" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.1211 14.3552C11.0578 13.945 11.2547 13.4575 11.468 12.888C11.7867 12.0325 12.5203 11.177 11.932 8.46296C11.4937 6.44031 8.5617 8.04109 8.55936 8.31531C8.55702 8.58953 8.69295 9.70515 8.51014 11.0036C8.27342 12.6981 9.58826 14.1325 11.1047 13.9872" stroke="white" stroke-width="1.19289" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.4226 8.27544C10.4086 8.36919 10.5937 8.61997 10.8351 8.65278C11.0765 8.68559 11.2804 8.49106 11.2945 8.39731C11.3086 8.30356 11.1234 8.20044 10.882 8.16763C10.6406 8.13247 10.4367 8.18169 10.4226 8.27544Z" fill="white" stroke="white" stroke-width="0.397627"/>
+<path d="M17.7469 8.08403C17.761 8.17778 17.5758 8.42856 17.3344 8.46138C17.093 8.49419 16.8891 8.29966 16.875 8.20591C16.8633 8.11216 17.0461 8.00903 17.2875 7.97622C17.5266 7.94106 17.7329 7.99028 17.7469 8.08403Z" fill="white" stroke="white" stroke-width="0.198813"/>
+<path d="M18.607 7.43652C18.6469 8.17012 18.4477 8.67168 18.4242 9.45449C18.3867 10.5912 18.9656 11.892 18.0938 13.1951" stroke="white" stroke-width="1.19289" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/manager/src/assets/icons/promotionalOffers/heavenly-bucket.svg b/packages/manager/src/assets/icons/promotionalOffers/heavenly-bucket.svg
index 4e5769a64ac..b884f66395e 100644
--- a/packages/manager/src/assets/icons/promotionalOffers/heavenly-bucket.svg
+++ b/packages/manager/src/assets/icons/promotionalOffers/heavenly-bucket.svg
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 128.3 127.1" viewBox="0 0 128.3 127.1">
-   <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="64.1672" x2="64.1672" y1="124.6929" y2="31.6854">
-      <stop offset="0" stop-color="#c5c5cc" />
-      <stop offset="1" stop-color="#fff" stop-opacity="0" />
-   </linearGradient>
-   <linearGradient id="b" gradientUnits="userSpaceOnUse" x1="22.727" x2="109.126" y1="35.937" y2="122.336">
-      <stop offset="0" stop-color="#fff" />
-      <stop offset="1" stop-color="#dedede" />
-   </linearGradient>
-   <linearGradient id="c" gradientUnits="userSpaceOnUse" x1="30.7232" x2="103.2375" y1="94.8309" y2="22.3166">
-      <stop offset="0" stop-color="#2e6b4c" />
-      <stop offset="1" stop-color="#1bb35e" />
-   </linearGradient>
-   <g clip-rule="evenodd" fill-rule="evenodd">
-      <path d="m29.4 31.7c-4.4 0-8 3.6-8 7.9 0 4.4 3.6 7.9 8 7.9h1.6l2.4 21.7c-3.3 2.4-5.6 6.3-5.6 11.1v.3c-14.4.2-21.8 11.1-21.8 22v.2c0 10.6 6.9 21.1 20.9 21.9h79.3c.1-.1 16.2-2.3 16.2-17.3 0-.7 0-1.4-.1-2.2-.8-8.5-7.7-15.2-16.3-16 2.5-10 0-18.6-5.1-24.8l1.9-16.8h1.6c4.4 0 8-3.6 8-7.9 0-4.4-3.6-8.1-8.1-8.1h-74.9z" fill="url(#a)" />
-      <path d="m30.6 31.3c-4.3 0-7.7 3.4-7.7 7.7 0 4.2 3.5 7.7 7.7 7.7h1.5l2.3 20.9c-3.2 2.4-5.4 6.1-5.4 10.7v.3c-13.9.1-21 10.7-21 21.2v.2c0 10.2 6.7 20.4 20.1 21.1h76.6c.1-.1 15.6-2.2 15.6-16.7 0-.7 0-1.4-.1-2.1-.8-8.2-7.4-14.7-15.7-15.4 2.4-9.7 0-17.9-5-23.9l1.8-16.2h1.5c4.3 0 7.7-3.4 7.7-7.7s-3.5-7.8-7.8-7.8z" fill="url(#b)" />
-      <path d="m103.1 33.8h-72.3c-2.8 0-4.9 2.2-4.9 4.9s2.2 4.9 4.9 4.9h4l6.6 60.3c.1 2.2 2 4 4.3 4h42.4c2.2 0 4.1-1.7 4.4-3.9l6.6-60.3h4c2.8 0 4.9-2.2 4.9-4.9.1-2.6-2.1-5-4.9-5zm-22.1 68.3c-2.8 0-4.9-2.2-4.9-4.9s2.2-5 4.9-5c2.8 0 5 2.2 5 5-.1 2.7-2.3 4.9-5 4.9zm-30.6-76.2c-.4 0-.7-.2-.9-.5l-7-13.9c-.2-.5-.1-1.1.4-1.3s1.1-.1 1.3.4l7 13.9c.2.5.1 1.1-.4 1.3-.1.1-.2.1-.4.1zm33.1 0c-.2 0-.3 0-.5-.1-.5-.2-.7-.9-.4-1.3l7-13.9c.2-.5.9-.7 1.3-.4.5.2.7.9.4 1.3l-7 13.9c0 .3-.4.5-.8.5zm-16.5-3.9c-.6 0-1-.4-1-1v-14c0-.6.4-1 1-1s1 .4 1 1v14c0 .5-.5 1-1 1z" fill="url(#c)" />
-   </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M4.0053 10.1059L4.00498 10.1034C4.00257 10.0839 3.99951 10.0579 3.99612 10.0256C3.98936 9.96103 3.98129 9.87144 3.97448 9.76032C3.96091 9.53856 3.95224 9.22841 3.96984 8.85868C4.00477 8.12529 4.14462 7.12389 4.58083 6.10608C5.02142 5.07804 5.76622 4.03163 6.99435 3.25009C8.21905 2.47073 9.85311 2 12 2C14.1468 2 15.7809 2.47073 17.0056 3.25009C18.2337 4.03163 18.9785 5.07804 19.4191 6.10608C19.8553 7.12389 19.9951 8.12529 20.0301 8.85868C20.0477 9.22841 20.039 9.53856 20.0254 9.76032C20.0186 9.87144 20.0106 9.96103 20.0038 10.0256C20.0004 10.0579 19.9973 10.0839 19.9949 10.1034L19.9946 10.1059C19.9935 10.1166 19.9923 10.1275 19.9909 10.1386L18.9964 19.5852C18.9948 19.6053 18.9926 19.6266 18.9896 19.649C18.982 19.7062 18.9694 19.7701 18.9497 19.8391C18.9098 19.9786 18.843 20.1318 18.7382 20.289C18.5273 20.6054 18.1908 20.8976 17.6971 21.1444C16.7382 21.6239 15.051 22 12 22C8.94888 22 7.26169 21.6239 6.30271 21.1444C5.80908 20.8976 5.47252 20.6055 5.26161 20.2891C5.1568 20.1319 5.08995 19.9787 5.05009 19.8392C5.03036 19.7702 5.01776 19.7063 5.01012 19.6491C5.00713 19.6267 5.00491 19.6054 5.00332 19.5852L4.00903 10.1387C4.0076 10.1275 4.00636 10.1166 4.0053 10.1059ZM6.2081 11.925L6.97615 19.2221C7.01835 19.2547 7.088 19.301 7.19712 19.3556C7.73818 19.6261 9.05103 20 12 20C14.9489 20 16.2617 19.6261 16.8027 19.3556C16.9118 19.301 16.9814 19.2547 17.0236 19.2222L17.7918 11.925C16.6445 12.2573 14.8488 12.5 11.9999 12.5C9.15106 12.5 7.35534 12.2574 6.2081 11.925ZM17.9399 8.11951C17.8708 7.72821 17.7585 7.30844 17.5808 6.89392C17.2714 6.17196 16.7662 5.46837 15.9318 4.93741C15.094 4.40427 13.8531 4 12 4C10.1468 4 8.90589 4.40427 8.0681 4.93741C7.23373 5.46837 6.72853 6.17196 6.41912 6.89392C6.24147 7.30842 6.12909 7.72818 6.06001 8.11948C7.19894 7.76453 9.02537 7.5 11.9999 7.5C14.9745 7.5 16.801 7.76455 17.9399 8.11951ZM17.2498 10C16.3918 9.74883 14.817 9.5 11.9999 9.5C9.18276 9.5 7.60801 9.74883 6.74999 10C7.60801 10.2512 9.18276 10.5 11.9999 10.5C14.817 10.5 16.3918 10.2512 17.2498 10ZM17.079 19.1727C17.0796 19.172 17.0799 19.1716 17.0799 19.1716L17.079 19.1727Z" fill="currentColor"/>
 </svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/providers/akamai-logo-rgb-waveOnly.svg b/packages/manager/src/assets/icons/providers/akamai-logo-rgb-waveOnly.svg
index ecc82648017..7469f871782 100644
--- a/packages/manager/src/assets/icons/providers/akamai-logo-rgb-waveOnly.svg
+++ b/packages/manager/src/assets/icons/providers/akamai-logo-rgb-waveOnly.svg
@@ -1,9 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="100px" height="108px" viewBox="0 0 100 108" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Shape</title>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="akamai-logo-rgb" transform="translate(0.600000, 0.700000)" fill="#009CDE" fill-rule="nonzero">
-            <path d="M54.5,104.8 C57,105.6 56.9,107.2 54.1,107.2 C24.3,107.2 0,83.2 0,53.6 C0,24 24.2,0 54.1,0 C56.9,0 57.5,1.5 55.2,2.2 C32.8,8.6 16.4,29.2 16.4,53.6 C16.4,77.7 32.4,98.1 54.5,104.8 M26.6,66.1 C26.5,64.7 26.4,63.2 26.4,61.7 C26.4,38.2 45.5,19.1 69,19.1 C91.2,19.1 97.9,29 98.7,28.4 C99.6,27.7 90.6,8 64.5,8 C41,8 21.9,27.1 21.9,50.6 C21.9,56 22.9,61.2 24.8,66 C25.6,68 26.8,68.1 26.6,66.1 M44.5,35.4 C55.6,30.6 69.5,30.4 83.1,35.2 C92.3,38.4 97.6,43 98,42.8 C98.7,42.5 92.7,32.9 81.7,28.7 C68.4,23.7 54.2,26.3 43.8,34.5 C42.7,35.4 43.1,36 44.5,35.4" id="Shape"></path>
-        </g>
-    </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path d="M12.9255 21.5565C8.89741 20.3017 5.96725 16.4958 5.96725 12C5.96725 7.50417 8.96046 3.61486 13.0553 2.40182C13.4744 2.27672 13.3631 2 12.8587 2C7.41378 2 3 6.48067 3 12C3 17.5193 7.41378 22 12.8587 22C13.3631 22 13.3854 21.7005 12.9255 21.5603V21.5565Z" fill="#00A4EB"/>
+  <path d="M7.83668 14.343C7.81072 14.0738 7.79588 13.8047 7.79588 13.528C7.79588 9.14587 11.275 5.59014 15.5627 5.59014C19.6204 5.59014 20.8369 7.44003 20.989 7.31872C21.1522 7.18605 19.5165 3.5166 14.7541 3.5166C10.4627 3.5166 6.9873 7.06854 6.9873 11.4544C6.9873 12.4704 7.17276 13.437 7.51028 14.324C7.65494 14.6955 7.87377 14.6993 7.83668 14.3392V14.343Z" fill="#00A4EB"/>
+  <path d="M11.0896 8.6229C13.1073 7.72449 15.6443 7.69417 18.1368 8.58499C19.8096 9.18014 20.7814 10.0331 20.8593 9.99894C20.9928 9.94208 19.8838 8.14906 17.8883 7.37574C15.47 6.43943 12.8662 6.92843 10.9672 8.44852C10.7595 8.61532 10.8374 8.72904 11.0859 8.61911L11.0896 8.6229Z" fill="#00A4EB"/>
 </svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/providers/github-logo.svg b/packages/manager/src/assets/icons/providers/github-logo.svg
index ab5c5549ae6..300d344ca7d 100644
--- a/packages/manager/src/assets/icons/providers/github-logo.svg
+++ b/packages/manager/src/assets/icons/providers/github-logo.svg
@@ -1,14 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 32.6 31.8" style="enable-background:new 0 0 32.6 31.8;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#191717;}
-</style>
-<path class="st0" d="M16.3,0C7.3,0,0,7.3,0,16.3c0,7.2,4.7,13.3,11.1,15.5c0.8,0.1,1.1-0.4,1.1-0.8c0-0.4,0-1.4,0-2.8
-	c-4.5,1-5.5-2.2-5.5-2.2c-0.7-1.9-1.8-2.4-1.8-2.4c-1.5-1,0.1-1,0.1-1c1.6,0.1,2.5,1.7,2.5,1.7c1.5,2.5,3.8,1.8,4.7,1.4
-	c0.1-1.1,0.6-1.8,1-2.2c-3.6-0.4-7.4-1.8-7.4-8.1c0-1.8,0.6-3.2,1.7-4.4C7.4,10.7,6.8,9,7.7,6.8c0,0,1.4-0.4,4.5,1.7
-	c1.3-0.4,2.7-0.5,4.1-0.5c1.4,0,2.8,0.2,4.1,0.5c3.1-2.1,4.5-1.7,4.5-1.7c0.9,2.2,0.3,3.9,0.2,4.3c1,1.1,1.7,2.6,1.7,4.4
-	c0,6.3-3.8,7.6-7.4,8c0.6,0.5,1.1,1.5,1.1,3c0,2.2,0,3.9,0,4.5c0,0.4,0.3,0.9,1.1,0.8c6.5-2.2,11.1-8.3,11.1-15.5
-	C32.6,7.3,25.3,0,16.3,0z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path d="M11.9613 2C6.46055 2 2 6.45976 2 11.9613C2 16.3626 4.85422 20.0965 8.81219 21.4137C9.31 21.5059 9.49281 21.1976 9.49281 20.9344C9.49281 20.6969 9.48352 19.9122 9.4793 19.0798C6.70797 19.6824 6.1232 17.9045 6.1232 17.9045C5.67008 16.7531 5.01719 16.447 5.01719 16.447C4.11344 15.8287 5.08531 15.8414 5.08531 15.8414C6.08563 15.9117 6.61234 16.868 6.61234 16.868C7.50078 18.3909 8.94266 17.9505 9.51109 17.6961C9.60047 17.0522 9.85867 16.6128 10.1435 16.3641C7.93102 16.1121 5.60508 15.258 5.60508 11.4411C5.60508 10.3536 5.99422 9.46492 6.63148 8.76734C6.52805 8.5164 6.18711 7.50328 6.72797 6.13117C6.72797 6.13117 7.56445 5.86344 9.46805 7.15226C10.2626 6.93148 11.1148 6.82086 11.9613 6.81711C12.8079 6.82086 13.6607 6.93148 14.4568 7.15226C16.3581 5.86344 17.1934 6.13117 17.1934 6.13117C17.7356 7.50328 17.3945 8.5164 17.2911 8.76734C17.9298 9.46492 18.3162 10.3535 18.3162 11.4411C18.3162 15.267 15.9859 16.1095 13.7678 16.3561C14.1251 16.6652 14.4434 17.2715 14.4434 18.2008C14.4434 19.5336 14.4319 20.6063 14.4319 20.9344C14.4319 21.1995 14.6112 21.5102 15.1162 21.4123C19.072 20.0937 21.9226 16.3611 21.9226 11.9613C21.9226 6.45976 17.4627 2 11.9613 2Z" fill="currentColor"/>
+  <path d="M5.73086 16.1902C5.70898 16.2396 5.63102 16.2545 5.56016 16.2205C5.48789 16.188 5.44727 16.1205 5.4707 16.0709C5.49219 16.0199 5.57016 16.0057 5.64227 16.0399C5.71469 16.0723 5.75594 16.1405 5.73086 16.1902ZM6.22086 16.6273C6.17336 16.6714 6.08047 16.6509 6.01742 16.5813C5.95227 16.5119 5.94008 16.4191 5.98828 16.3743C6.03727 16.3303 6.12734 16.3509 6.19266 16.4204C6.25781 16.4906 6.27055 16.5828 6.22086 16.6273ZM6.55703 17.1867C6.49594 17.2291 6.39609 17.1894 6.33445 17.1008C6.27344 17.0123 6.27344 16.906 6.33578 16.8634C6.39766 16.8209 6.49594 16.8591 6.55844 16.947C6.61938 17.0371 6.61945 17.1433 6.55703 17.1867ZM7.12547 17.8346C7.07086 17.8948 6.95461 17.8787 6.86945 17.7965C6.78242 17.7162 6.75813 17.6022 6.81289 17.542C6.86813 17.4816 6.98508 17.4986 7.07086 17.5801C7.15734 17.6602 7.18367 17.7751 7.12547 17.8346ZM7.86016 18.0534C7.83617 18.1313 7.72414 18.1668 7.61133 18.1337C7.49867 18.0995 7.42492 18.0081 7.44766 17.9293C7.47109 17.8508 7.58359 17.8138 7.69727 17.8493C7.80977 17.8833 7.88359 17.974 7.86016 18.0534ZM8.69641 18.1461C8.69922 18.2283 8.60352 18.2964 8.48508 18.2979C8.36594 18.3005 8.26961 18.234 8.26836 18.1532C8.26836 18.0702 8.36188 18.0027 8.48094 18.0008C8.59938 17.9984 8.69641 18.0645 8.69641 18.1461ZM9.51781 18.1146C9.53203 18.1948 9.44969 18.2771 9.33211 18.299C9.21648 18.3201 9.10945 18.2706 9.09469 18.1912C9.08031 18.109 9.16422 18.0267 9.27961 18.0054C9.39742 17.9849 9.50281 18.0331 9.51781 18.1146Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/providers/google-logo.svg b/packages/manager/src/assets/icons/providers/google-logo.svg
index 307886a522d..ff5a29eb93c 100644
--- a/packages/manager/src/assets/icons/providers/google-logo.svg
+++ b/packages/manager/src/assets/icons/providers/google-logo.svg
@@ -1,12 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="535px" height="546px" viewBox="0 0 535 546" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>GoogleG</title>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Google__G__Logo" fill-rule="nonzero">
-            <path d="M534.5,279.4 C534.5,260.9 533,242.3 529.8,224.1 L273.1,224.1 L273.1,328.9 L420.1,328.9 C414,362.7 394.4,392.6 365.7,411.6 L365.7,479.6 L453.4,479.6 C504.9,432.2 534.5,362.2 534.5,279.4 Z" id="Path" fill="#4285F4"></path>
-            <path d="M273.1,545.3 C346.5,545.3 408.4,521.2 453.5,479.6 L365.8,411.6 C341.4,428.2 309.9,437.6 273.2,437.6 C202.2,437.6 142,389.7 120.4,325.3 L29.9,325.3 L29.9,395.4 C76.1,487.3 170.2,545.3 273.1,545.3 Z" id="Path" fill="#34A853"></path>
-            <path d="M120.3,325.3 C108.9,291.5 108.9,254.9 120.3,221.1 L120.3,151 L29.9,151 C-8.7,227.9 -8.7,318.5 29.9,395.4 L120.3,325.3 L120.3,325.3 Z" id="Path" fill="#FBBC04"></path>
-            <path d="M273.1,108.7 C311.9,108.1 349.4,122.7 377.5,149.5 L455.2,71.8 C406,25.6 340.7,0.2 273.1,1 C170.2,1 76.1,59 29.9,151 L120.3,221.1 C141.8,156.6 202.1,108.7 273.1,108.7 Z" id="Path" fill="#EA4335"></path>
-        </g>
-    </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path d="M21.8055 10.0415H21V10H12V14H17.6515C16.827 16.3285 14.6115 18 12 18C8.6865 18 6 15.3135 6 12C6 8.6865 8.6865 6 12 6C13.5295 6 14.921 6.577 15.9805 7.5195L18.809 4.691C17.023 3.0265 14.634 2 12 2C6.4775 2 2 6.4775 2 12C2 17.5225 6.4775 22 12 22C17.5225 22 22 17.5225 22 12C22 11.3295 21.931 10.675 21.8055 10.0415Z" fill="#FFC107"/>
+  <path d="M3.15282 7.3455L6.43832 9.755C7.32732 7.554 9.4805 6 12 6C13.5295 6 14.921 6.577 15.9805 7.5195L18.809 4.691C17.023 3.0265 14.634 2 12 2C8.159 2 4.82782 4.1685 3.15282 7.3455Z" fill="#FF3D00"/>
+  <path d="M12 22C14.583 22 16.9301 21.0115 18.7046 19.404L15.6096 16.785C14.6056 17.5455 13.3575 18 12 18C9.399 18 7.19064 16.3415 6.35864 14.027L3.09764 16.5395C4.75264 19.778 8.1135 22 12 22Z" fill="#4CAF50"/>
+  <path d="M21.8055 10.0415H21V10H12V14H17.6515C17.2555 15.1185 16.536 16.083 15.608 16.7855L15.6096 16.785L18.7046 19.404C18.4856 19.603 22 17 22 12C22 11.3295 21.931 10.675 21.8055 10.0415Z" fill="#1976D2"/>
 </svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/reset.svg b/packages/manager/src/assets/icons/reset.svg
index 40f4cca6ce9..ec01a0ed580 100644
--- a/packages/manager/src/assets/icons/reset.svg
+++ b/packages/manager/src/assets/icons/reset.svg
@@ -1,10 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Group</title>
-    <g id="Reset-icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Group" transform="translate(1.000000, 1.000000)" stroke="#3683DC">
-            <path d="M13.7363253,3.32698217 C12.3899701,1.32056985 10.100209,0 7.50193269,0 C3.35872967,0 0,3.35786438 0,7.5 C0,11.6421356 3.35872967,15 7.50193269,15 C11.6451357,15 15.0038654,11.6421356 15.0038654,7.5 C15.0038654,7.40408797 15.0020646,7.30859644 14.9984949,7.21355735" id="Path"></path>
-            <polyline id="Path-2-Copy" stroke-linecap="round" stroke-linejoin="round" points="10.4333273 3.33095006 14.0038654 3.33095006 14.0038654 8.8817842e-16"></polyline>
-        </g>
-    </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M3.46517 8.68899L3.5779 8.57626C3.90399 8.25018 4.43268 8.25018 4.75877 8.57626C5.08486 8.90235 5.08486 9.43104 4.75877 9.75713L3.0921 11.4238C2.76601 11.7499 2.23732 11.7499 1.91123 11.4238L0.244566 9.75713C-0.0815219 9.43104 -0.0815219 8.90235 0.244566 8.57626C0.570653 8.25018 1.09935 8.25018 1.42543 8.57626L1.74217 8.893C1.95426 7.31057 2.61795 5.81385 3.66495 4.58797C4.95358 3.07918 6.73828 2.0797 8.69804 1.7693C10.6578 1.45891 12.664 1.85797 14.3558 2.89471C16.0476 3.93144 17.314 5.53782 17.9271 7.4249C18.5403 9.31198 18.46 11.3559 17.7007 13.1891C16.9413 15.0222 15.5528 16.5243 13.7849 17.4251C12.017 18.3259 9.98566 18.5663 8.05629 18.1031C6.39815 17.705 4.90885 16.8097 3.78256 15.5469C3.47623 15.2034 3.5617 14.6789 3.93404 14.4084C4.30638 14.1379 4.82403 14.2248 5.13886 14.5605C6.02551 15.5059 7.17333 16.1771 8.44536 16.4825C9.98886 16.8531 11.6139 16.6607 13.0283 15.9401C14.4426 15.2194 15.5534 14.0178 16.1609 12.5513C16.7683 11.0847 16.8326 9.44959 16.342 7.93993C15.8515 6.43026 14.8384 5.14516 13.485 4.31577C12.1315 3.48638 10.5266 3.16713 8.95877 3.41545C7.39096 3.66377 5.96319 4.46335 4.93229 5.67039C4.18914 6.5405 3.68738 7.58119 3.46517 8.68899Z" fill="currentColor"/>
 </svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/ssh-key.svg b/packages/manager/src/assets/icons/ssh-key.svg
index 32459459a33..9859d9d10ef 100644
--- a/packages/manager/src/assets/icons/ssh-key.svg
+++ b/packages/manager/src/assets/icons/ssh-key.svg
@@ -1,7 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-  <g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5">
-    <path d="M12.7499997,9.807 C12.749,6.493 10.062,3.808 6.748,3.80899972 C3.435,3.80899972 0.749,6.496 0.749999721,9.81 C0.751,12.545 2.601,14.934 5.24999972,15.618 L5.24999972,21.754 C5.24999972,22.582 5.922,23.254 6.74999972,23.254 C7.578,23.254 8.24999972,22.582 8.24999972,21.754 L8.24999972,15.618 C10.9,14.934 12.751,12.544 12.7499997,9.807 Z"/>
-    <path d="M13.563 15.75C14.347 15.642 15.101 15.379 15.782 14.977L20.689 19.883C21.285 20.459 22.234 20.442 22.81 19.846 23.371 19.265 23.371 18.343 22.81 17.762L17.9 12.856C19.585 10.002 18.637 6.324 15.784 4.639 13.923 3.54 11.615 3.527 9.741 4.605M6.75 7.557C7.578 7.557 8.25 8.229 8.25 9.057 8.25 9.885 7.578 10.557 6.75 10.557 5.922 10.557 5.25 9.885 5.25 9.057 5.25 8.229 5.922 7.557 6.75 7.557z"/>
-    <path d="M6.75,7.557 L6.75,3 C6.75,1.757 7.757,0.75 9,0.75 C10.243,0.75 11.25,1.757 11.25,3 L11.25,3.989"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M17.6301 2.3695C16.6904 1.43005 15.1671 1.43025 14.2276 2.36992L8.10647 8.49119C6.02852 7.87852 3.75885 8.67023 2.5234 10.5027C1.17922 12.4965 1.43627 15.1632 3.13653 16.8635C4.83681 18.5638 7.5035 18.8209 9.49724 17.4767C11.3297 16.2412 12.1214 13.9715 11.5087 11.8935L12.4914 10.9107L13.1937 11.0991L13.1948 11.0994C13.8441 11.2726 14.5364 11.0867 15.0116 10.6115C15.4867 10.1364 15.6727 9.44402 15.4995 8.79476L15.3692 8.30904L15.854 8.4391C16.5036 8.6131 17.1966 8.42737 17.6721 7.95186C18.1476 7.47639 18.3333 6.78327 18.1593 6.13376L17.9549 5.37003C18.5535 4.43846 18.4452 3.18434 17.6301 2.3695ZM15.4086 3.55069C15.696 3.26322 16.1619 3.26315 16.4494 3.55053C16.7369 3.83792 16.7369 4.30395 16.4496 4.59143C16.2387 4.80232 16.1564 5.10963 16.2335 5.39769L16.5462 6.56587C16.5658 6.63917 16.5449 6.71736 16.4912 6.77101C16.4376 6.82465 16.3594 6.8456 16.2861 6.82597L15.1184 6.51271C14.8302 6.43539 14.5226 6.51775 14.3116 6.72876L13.7889 7.25145C13.5779 7.46245 13.4956 7.77001 13.5729 8.05822L13.8861 9.22564C13.9054 9.29894 13.8843 9.37702 13.8307 9.43065C13.777 9.48432 13.6985 9.50528 13.6252 9.48584L12.4584 9.17281C12.1701 9.09549 11.8626 9.17786 11.6516 9.38887L9.95486 11.0856C9.71428 11.3262 9.64373 11.6887 9.77654 12.002C10.4031 13.4799 9.89465 15.1946 8.56367 16.092C7.23269 16.9894 5.45248 16.8178 4.31742 15.6827C3.18234 14.5476 3.01074 12.7673 3.9081 11.4363C4.80546 10.1053 6.52011 9.59676 7.99798 10.2234C8.31125 10.3562 8.67377 10.2856 8.91437 10.045L15.4086 3.55069ZM6.66829 13.3334C6.66829 13.411 6.60536 13.474 6.52774 13.474C6.45011 13.474 6.38718 13.411 6.38718 13.3334C6.38718 13.2558 6.45011 13.1928 6.52774 13.1928C6.60536 13.1928 6.66829 13.2558 6.66829 13.3334ZM6.52774 11.804C5.68305 11.804 4.99829 12.4887 4.99829 13.3334C4.99829 14.1781 5.68305 14.8628 6.52774 14.8628C7.37242 14.8628 8.05718 14.1781 8.05718 13.3334C8.05718 12.4887 7.37242 11.804 6.52774 11.804Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/status.svg b/packages/manager/src/assets/icons/status.svg
index ae7d06df074..e420b87b017 100644
--- a/packages/manager/src/assets/icons/status.svg
+++ b/packages/manager/src/assets/icons/status.svg
@@ -1,15 +1,3 @@
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-  y="0px" style="enable-background:new 0 0 64 64;" xml:space="preserve" fill="none">
-  <title>Group</title>
-  <circle id="background" class="outerCircle" stroke-width="2" cx="31.9" cy="31.9" r="29.9"></circle>
-  <g id="Status-page-icon" fill-rule="evenodd" class="insidePath" transform="translate(16.000000, 19.000000)">
-    <g id="Artboard-Copy" transform="translate(-319.000000, -396.000000)">
-      <g id="Group" transform="translate(319.000000, 396.000000)">
-        <rect id="Rectangle" stroke-width="2" x="1" y="1" width="30" height="21"></rect>
-        <line x1="10.5" y1="25.5" x2="22.5" y2="25.5" id="Line" stroke-width="2" stroke-linecap="square"></line>
-        <polyline id="Path-2"
-          points="5.40261339 17.5963174 13.2194757 9.11530643 19.1871196 14.7389396 27.3256132 5.65051209"></polyline>
-      </g>
-    </g>
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M15.4716 3.00041C15.9256 2.98751 16.3312 3.28214 16.4594 3.71784L18.7482 11.5H21C21.5523 11.5 22 11.9477 22 12.5C22 13.0523 21.5523 13.5 21 13.5H18C17.5564 13.5 17.1658 13.2078 17.0406 12.7822L15.6115 7.92306L12.9738 19.2272C12.8716 19.6655 12.4891 19.9815 12.0394 19.9992C11.5897 20.017 11.1835 19.7321 11.0471 19.3032L8.345 10.811L7.41381 12.9061C7.25331 13.2673 6.89519 13.5 6.5 13.5H3C2.44772 13.5 2 13.0523 2 12.5C2 11.9477 2.44772 11.5 3 11.5H5.85013L7.58619 7.59387C7.75484 7.21441 8.14044 6.97866 8.55506 7.00152C8.96968 7.02438 9.32702 7.3011 9.45293 7.6968L11.8516 15.2354L14.5262 3.77277C14.6294 3.3305 15.0176 3.01331 15.4716 3.00041Z" fill="currentColor"/>
 </svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/support.svg b/packages/manager/src/assets/icons/support.svg
index 5873f7d0fe6..e7afd2d9fac 100644
--- a/packages/manager/src/assets/icons/support.svg
+++ b/packages/manager/src/assets/icons/support.svg
@@ -1,16 +1,3 @@
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve" fill="none">
-	 <desc>Customer Support</desc>
-	<circle id="background" class="outerCircle" stroke-width="2" cx="31.9" cy="31.9" r="29.9"></circle>
-	<g id="mail" class="insidePath" transform="translate(15.000000, 15.000000)">
-		<path id="Stroke-541" d="M26.4,12.9l5,3.4v13.1c0,1-0.8,1.9-1.9,1.9h-25c-1,0-1.9-0.8-1.9-1.9V16.4l5-3.4"/>
-		<polyline id="Stroke-542" points="6.4,27.6 12.6,22.6 21.4,22.6 27.6,27.6"/>
-		<path id="Stroke-543" d="M31.4,16.4l-7.5,5"/>
-		<path id="Stroke-544" d="M2.6,16.4l7.5,5"/>
-		<polyline id="Stroke-545" points="26.4,19.5 26.4,2.6 7.6,2.6 7.6,19.5"/>
-		<path id="Stroke-546" d="M11.4,6.4h2.5"/>
-		<path id="Stroke-547" d="M13.9,10.1h8.8"/>
-		<path id="Stroke-548" d="M11.4,13.9h11.2"/>
-		<path id="Stroke-549" d="M11.4,17.6h11.2"/>
-	</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M3.88066 8.24496C3.85951 8.08699 3.83939 7.8987 3.8262 7.68762C3.7839 7.01092 3.81555 6.14288 4.07949 5.29827C4.33922 4.46715 4.81848 3.67053 5.68044 3.0709C6.54893 2.46674 7.89617 2 10 2C12.1038 2 13.4511 2.46674 14.3196 3.07091C15.1815 3.67053 15.6608 4.46715 15.9205 5.29827C16.1845 6.14289 16.2161 7.01093 16.1738 7.68762C16.1606 7.89871 16.1405 8.08699 16.1194 8.24496C15.8573 8.26804 15.6195 8.3078 15.421 8.34914C15.1995 8.39531 15.014 8.44622 14.8814 8.48648C14.8148 8.50668 14.7609 8.52441 14.7216 8.53784C14.7019 8.54456 14.6859 8.55022 14.6737 8.55459L14.6583 8.56017L14.6528 8.56219L14.6507 8.563L14.6497 8.56335C14.6493 8.56351 14.6489 8.56367 15 9.5L14.6497 8.56335C14.2594 8.70972 14 9.08315 14 9.5V14.5C14 14.9168 14.2586 15.29 14.6489 15.4363L15 14.5C14.6489 15.4363 14.6484 15.4362 14.6489 15.4363L14.6528 15.4378L14.6583 15.4398L14.6737 15.4454C14.6859 15.4498 14.7019 15.4554 14.7216 15.4622C14.7609 15.4756 14.8148 15.4933 14.8814 15.5135C15.014 15.5538 15.1995 15.6047 15.421 15.6509C15.8123 15.7324 16.3565 15.8077 16.9381 15.7613C16.9004 15.951 16.8508 16.0737 16.805 16.1524C16.7406 16.2628 16.6517 16.3469 16.4178 16.4156C16.1409 16.4971 15.7403 16.5312 15.1313 16.5312C14.8532 16.5312 14.5538 16.5246 14.2203 16.5173L14.1556 16.5159C13.8879 16.51 13.6019 16.504 13.301 16.5014C13.1262 16.0955 12.8519 15.7741 12.5417 15.5389C12.0502 15.1663 11.4617 15 11 15H9C8.53831 15 7.94976 15.1663 7.45834 15.5389C6.92645 15.9422 6.5 16.599 6.5 17.5C6.5 18.401 6.92645 19.0578 7.45834 19.4611C7.94976 19.8337 8.53831 20 9 20H11C11.4617 20 12.0502 19.8337 12.5417 19.4611C12.8512 19.2264 13.125 18.9059 13.2998 18.5014C13.5793 18.504 13.849 18.5096 14.1116 18.5154C14.1354 18.5159 14.1591 18.5164 14.1827 18.517C14.5095 18.5242 14.8302 18.5312 15.1313 18.5312C15.7597 18.5312 16.4091 18.5029 16.9822 18.3344C17.5983 18.1531 18.1594 17.7997 18.5325 17.1601C18.8797 16.565 19 15.8284 19 15C19 14.9591 18.9975 14.9188 18.9928 14.8792C19.0368 14.8357 19.0801 14.7901 19.1224 14.7425C19.7073 14.0844 20 13.1631 20 12C20 10.8369 19.7073 9.91554 19.1224 9.2575C18.8161 8.91296 18.4625 8.67745 18.1004 8.5195C18.1277 8.31738 18.1533 8.07881 18.1699 7.81238C18.2214 6.98907 18.1905 5.85711 17.8295 4.70173C17.4642 3.53285 16.756 2.32947 15.4617 1.42909C14.1739 0.533261 12.3962 0 10 0C7.60383 0 5.82607 0.533261 4.53831 1.4291C3.24403 2.32947 2.5358 3.53285 2.17053 4.70173C1.80948 5.85712 1.77863 6.98908 1.83009 7.81238C1.84674 8.0788 1.87231 8.31737 1.89957 8.51949C1.53753 8.67744 1.18386 8.91296 0.877592 9.2575C0.292672 9.91554 0 10.8369 0 12C0 13.1631 0.292672 14.0844 0.87759 14.7425C1.46155 15.3994 2.21785 15.66 2.87596 15.7423C3.52657 15.8236 4.14622 15.741 4.57895 15.6509C4.80054 15.6047 4.98599 15.5538 5.1186 15.5135C5.18516 15.4933 5.2391 15.4756 5.27839 15.4622C5.29806 15.4554 5.31411 15.4498 5.3263 15.4454L5.34168 15.4398L5.34715 15.4378L5.34933 15.437L5.35027 15.4366C5.3507 15.4365 5.35112 15.4363 5 14.5L5.35027 15.4366C5.74058 15.2903 6 14.9168 6 14.5V9.5C6 9.08315 5.74143 8.71003 5.35112 8.56367L5 9.5C5.35112 8.56367 5.35156 8.56383 5.35112 8.56367L5.34933 8.563L5.34716 8.56219L5.34168 8.56017L5.3263 8.55459C5.31411 8.55022 5.29806 8.54456 5.27839 8.53784C5.2391 8.52441 5.18516 8.50668 5.11861 8.48648C4.98599 8.44622 4.80054 8.39531 4.57896 8.34914C4.38049 8.3078 4.14271 8.26804 3.88066 8.24496ZM4 10.275C3.7222 10.2288 3.41256 10.2062 3.12403 10.2423C2.78215 10.285 2.53845 10.3994 2.37241 10.5862C2.20733 10.7719 2 11.1631 2 12C2 12.8369 2.20733 13.228 2.37241 13.4138C2.53845 13.6005 2.78215 13.715 3.12404 13.7577C3.41256 13.7938 3.72221 13.7711 4 13.7249V10.275ZM4.65252 13.5623C4.65282 13.5622 4.65222 13.5624 4.65075 13.563L4.65252 13.5623ZM4.65248 10.4377C4.65259 10.4377 4.65262 10.4377 4.65248 10.4377V10.4377ZM16 13.7249C16.2778 13.7711 16.5874 13.7938 16.876 13.7577C17.2178 13.715 17.4615 13.6005 17.6276 13.4138C17.7927 13.228 18 12.8369 18 12C18 11.1631 17.7927 10.7719 17.6276 10.5862C17.4616 10.3994 17.2179 10.285 16.876 10.2423C16.5874 10.2062 16.2778 10.2288 16 10.275V13.7249ZM15.3475 10.4377C15.3474 10.4377 15.3474 10.4377 15.3475 10.4377V10.4377ZM8.54841 17.2665C8.52561 17.3097 8.5 17.3804 8.5 17.5C8.5 17.6196 8.52561 17.6904 8.54841 17.7335C8.57296 17.78 8.61069 17.8249 8.66666 17.8674C8.72467 17.9113 8.79578 17.9474 8.86906 17.9717C8.90469 17.9835 8.93653 17.991 8.96197 17.9954C8.98546 17.9995 8.99842 17.9999 8.99995 18C9.0001 18 9.00013 18 8.99995 18L11 18C10.9998 18 10.9999 18 11 18C11.0015 17.9999 11.0145 17.9995 11.038 17.9954C11.0635 17.991 11.0953 17.9835 11.1309 17.9717C11.2042 17.9474 11.2753 17.9113 11.3333 17.8674C11.3893 17.8249 11.427 17.78 11.4516 17.7335C11.4744 17.6904 11.5 17.6196 11.5 17.5C11.5 17.3804 11.4744 17.3097 11.4516 17.2665C11.427 17.22 11.3893 17.1751 11.3333 17.1327C11.2753 17.0887 11.2042 17.0526 11.1309 17.0284C11.0953 17.0166 11.0635 17.009 11.038 17.0046C11.0145 17.0005 11.0016 17.0001 11 17C11 17 11.0001 17 11 17L9.00007 17C9.00084 17 8.98774 17.0002 8.96197 17.0046C8.93653 17.009 8.90469 17.0165 8.86906 17.0283C8.79578 17.0526 8.72467 17.0887 8.66666 17.1327C8.61069 17.1751 8.57296 17.22 8.54841 17.2665Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/swapSmall.svg b/packages/manager/src/assets/icons/swapSmall.svg
index 3d69d430869..dd3dbfcef40 100644
--- a/packages/manager/src/assets/icons/swapSmall.svg
+++ b/packages/manager/src/assets/icons/swapSmall.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4.80352 2.19649C5.06322 2.45619 5.06322 2.87724 4.80351 3.13694L3.60543 4.335L11.3333 4.335C11.7006 4.335 11.9983 4.63273 11.9983 5C11.9983 5.36727 11.7006 5.665 11.3333 5.665L3.60539 5.665L4.80352 6.86315C5.06322 7.12286 5.06322 7.54391 4.80351 7.80361C4.54381 8.0633 4.12276 8.0633 3.86306 7.8036L1.52973 5.47022C1.27003 5.21052 1.27004 4.78947 1.52974 4.52977L3.86307 2.19648C4.12277 1.93678 4.54383 1.93679 4.80352 2.19649ZM11.1964 8.19648C11.4561 7.93678 11.8772 7.93678 12.1369 8.19648L14.4701 10.5298C14.7298 10.7895 14.7298 11.2105 14.4702 11.4702L12.1369 13.8036C11.8772 14.0633 11.4561 14.0633 11.1964 13.8036C10.9367 13.5439 10.9367 13.1229 11.1964 12.8632L12.3945 11.665L4.66658 11.665C4.29932 11.665 4.00159 11.3673 4.00159 11C4.00159 10.6327 4.29932 10.335 4.66658 10.335L12.3945 10.335L11.1964 9.13694C10.9367 8.87724 10.9367 8.45618 11.1964 8.19648Z" fill="#3D3D42"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.80352 2.19649C5.06322 2.45619 5.06322 2.87724 4.80351 3.13694L3.60543 4.335L11.3333 4.335C11.7006 4.335 11.9983 4.63273 11.9983 5C11.9983 5.36727 11.7006 5.665 11.3333 5.665L3.60539 5.665L4.80352 6.86315C5.06322 7.12286 5.06322 7.54391 4.80351 7.80361C4.54381 8.0633 4.12276 8.0633 3.86306 7.8036L1.52973 5.47022C1.27003 5.21052 1.27004 4.78947 1.52974 4.52977L3.86307 2.19648C4.12277 1.93678 4.54383 1.93679 4.80352 2.19649ZM11.1964 8.19648C11.4561 7.93678 11.8772 7.93678 12.1369 8.19648L14.4701 10.5298C14.7298 10.7895 14.7298 11.2105 14.4702 11.4702L12.1369 13.8036C11.8772 14.0633 11.4561 14.0633 11.1964 13.8036C10.9367 13.5439 10.9367 13.1229 11.1964 12.8632L12.3945 11.665L4.66658 11.665C4.29932 11.665 4.00159 11.3673 4.00159 11C4.00159 10.6327 4.29932 10.335 4.66658 10.335L12.3945 10.335L11.1964 9.13694C10.9367 8.87724 10.9367 8.45618 11.1964 8.19648Z" fill="currentColor"/>
 </svg>
diff --git a/packages/manager/src/assets/icons/ticket.svg b/packages/manager/src/assets/icons/ticket.svg
index afb766cc72a..e7afd2d9fac 100644
--- a/packages/manager/src/assets/icons/ticket.svg
+++ b/packages/manager/src/assets/icons/ticket.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="26" height="20" viewBox="0 0 26 20">
-  <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3.5 4.5L13.5 4.5M3.5 7.5L13.5 7.5M3.5 10.5L20.5 10.5M3.5 13.5L20.5 13.5M19.5.793C19.313.605 19.058.5 18.793.5L1.5.5C.948.5.5.948.5 1.5L.5 16.5C.5 17.052.948 17.5 1.5 17.5L22.5 17.5C23.052 17.5 23.5 17.052 23.5 16.5L23.5 5.207C23.5 4.942 23.395 4.687 23.207 4.5L19.5.793z" transform="translate(1 1)"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M3.88066 8.24496C3.85951 8.08699 3.83939 7.8987 3.8262 7.68762C3.7839 7.01092 3.81555 6.14288 4.07949 5.29827C4.33922 4.46715 4.81848 3.67053 5.68044 3.0709C6.54893 2.46674 7.89617 2 10 2C12.1038 2 13.4511 2.46674 14.3196 3.07091C15.1815 3.67053 15.6608 4.46715 15.9205 5.29827C16.1845 6.14289 16.2161 7.01093 16.1738 7.68762C16.1606 7.89871 16.1405 8.08699 16.1194 8.24496C15.8573 8.26804 15.6195 8.3078 15.421 8.34914C15.1995 8.39531 15.014 8.44622 14.8814 8.48648C14.8148 8.50668 14.7609 8.52441 14.7216 8.53784C14.7019 8.54456 14.6859 8.55022 14.6737 8.55459L14.6583 8.56017L14.6528 8.56219L14.6507 8.563L14.6497 8.56335C14.6493 8.56351 14.6489 8.56367 15 9.5L14.6497 8.56335C14.2594 8.70972 14 9.08315 14 9.5V14.5C14 14.9168 14.2586 15.29 14.6489 15.4363L15 14.5C14.6489 15.4363 14.6484 15.4362 14.6489 15.4363L14.6528 15.4378L14.6583 15.4398L14.6737 15.4454C14.6859 15.4498 14.7019 15.4554 14.7216 15.4622C14.7609 15.4756 14.8148 15.4933 14.8814 15.5135C15.014 15.5538 15.1995 15.6047 15.421 15.6509C15.8123 15.7324 16.3565 15.8077 16.9381 15.7613C16.9004 15.951 16.8508 16.0737 16.805 16.1524C16.7406 16.2628 16.6517 16.3469 16.4178 16.4156C16.1409 16.4971 15.7403 16.5312 15.1313 16.5312C14.8532 16.5312 14.5538 16.5246 14.2203 16.5173L14.1556 16.5159C13.8879 16.51 13.6019 16.504 13.301 16.5014C13.1262 16.0955 12.8519 15.7741 12.5417 15.5389C12.0502 15.1663 11.4617 15 11 15H9C8.53831 15 7.94976 15.1663 7.45834 15.5389C6.92645 15.9422 6.5 16.599 6.5 17.5C6.5 18.401 6.92645 19.0578 7.45834 19.4611C7.94976 19.8337 8.53831 20 9 20H11C11.4617 20 12.0502 19.8337 12.5417 19.4611C12.8512 19.2264 13.125 18.9059 13.2998 18.5014C13.5793 18.504 13.849 18.5096 14.1116 18.5154C14.1354 18.5159 14.1591 18.5164 14.1827 18.517C14.5095 18.5242 14.8302 18.5312 15.1313 18.5312C15.7597 18.5312 16.4091 18.5029 16.9822 18.3344C17.5983 18.1531 18.1594 17.7997 18.5325 17.1601C18.8797 16.565 19 15.8284 19 15C19 14.9591 18.9975 14.9188 18.9928 14.8792C19.0368 14.8357 19.0801 14.7901 19.1224 14.7425C19.7073 14.0844 20 13.1631 20 12C20 10.8369 19.7073 9.91554 19.1224 9.2575C18.8161 8.91296 18.4625 8.67745 18.1004 8.5195C18.1277 8.31738 18.1533 8.07881 18.1699 7.81238C18.2214 6.98907 18.1905 5.85711 17.8295 4.70173C17.4642 3.53285 16.756 2.32947 15.4617 1.42909C14.1739 0.533261 12.3962 0 10 0C7.60383 0 5.82607 0.533261 4.53831 1.4291C3.24403 2.32947 2.5358 3.53285 2.17053 4.70173C1.80948 5.85712 1.77863 6.98908 1.83009 7.81238C1.84674 8.0788 1.87231 8.31737 1.89957 8.51949C1.53753 8.67744 1.18386 8.91296 0.877592 9.2575C0.292672 9.91554 0 10.8369 0 12C0 13.1631 0.292672 14.0844 0.87759 14.7425C1.46155 15.3994 2.21785 15.66 2.87596 15.7423C3.52657 15.8236 4.14622 15.741 4.57895 15.6509C4.80054 15.6047 4.98599 15.5538 5.1186 15.5135C5.18516 15.4933 5.2391 15.4756 5.27839 15.4622C5.29806 15.4554 5.31411 15.4498 5.3263 15.4454L5.34168 15.4398L5.34715 15.4378L5.34933 15.437L5.35027 15.4366C5.3507 15.4365 5.35112 15.4363 5 14.5L5.35027 15.4366C5.74058 15.2903 6 14.9168 6 14.5V9.5C6 9.08315 5.74143 8.71003 5.35112 8.56367L5 9.5C5.35112 8.56367 5.35156 8.56383 5.35112 8.56367L5.34933 8.563L5.34716 8.56219L5.34168 8.56017L5.3263 8.55459C5.31411 8.55022 5.29806 8.54456 5.27839 8.53784C5.2391 8.52441 5.18516 8.50668 5.11861 8.48648C4.98599 8.44622 4.80054 8.39531 4.57896 8.34914C4.38049 8.3078 4.14271 8.26804 3.88066 8.24496ZM4 10.275C3.7222 10.2288 3.41256 10.2062 3.12403 10.2423C2.78215 10.285 2.53845 10.3994 2.37241 10.5862C2.20733 10.7719 2 11.1631 2 12C2 12.8369 2.20733 13.228 2.37241 13.4138C2.53845 13.6005 2.78215 13.715 3.12404 13.7577C3.41256 13.7938 3.72221 13.7711 4 13.7249V10.275ZM4.65252 13.5623C4.65282 13.5622 4.65222 13.5624 4.65075 13.563L4.65252 13.5623ZM4.65248 10.4377C4.65259 10.4377 4.65262 10.4377 4.65248 10.4377V10.4377ZM16 13.7249C16.2778 13.7711 16.5874 13.7938 16.876 13.7577C17.2178 13.715 17.4615 13.6005 17.6276 13.4138C17.7927 13.228 18 12.8369 18 12C18 11.1631 17.7927 10.7719 17.6276 10.5862C17.4616 10.3994 17.2179 10.285 16.876 10.2423C16.5874 10.2062 16.2778 10.2288 16 10.275V13.7249ZM15.3475 10.4377C15.3474 10.4377 15.3474 10.4377 15.3475 10.4377V10.4377ZM8.54841 17.2665C8.52561 17.3097 8.5 17.3804 8.5 17.5C8.5 17.6196 8.52561 17.6904 8.54841 17.7335C8.57296 17.78 8.61069 17.8249 8.66666 17.8674C8.72467 17.9113 8.79578 17.9474 8.86906 17.9717C8.90469 17.9835 8.93653 17.991 8.96197 17.9954C8.98546 17.9995 8.99842 17.9999 8.99995 18C9.0001 18 9.00013 18 8.99995 18L11 18C10.9998 18 10.9999 18 11 18C11.0015 17.9999 11.0145 17.9995 11.038 17.9954C11.0635 17.991 11.0953 17.9835 11.1309 17.9717C11.2042 17.9474 11.2753 17.9113 11.3333 17.8674C11.3893 17.8249 11.427 17.78 11.4516 17.7335C11.4744 17.6904 11.5 17.6196 11.5 17.5C11.5 17.3804 11.4744 17.3097 11.4516 17.2665C11.427 17.22 11.3893 17.1751 11.3333 17.1327C11.2753 17.0887 11.2042 17.0526 11.1309 17.0284C11.0953 17.0166 11.0635 17.009 11.038 17.0046C11.0145 17.0005 11.0016 17.0001 11 17C11 17 11.0001 17 11 17L9.00007 17C9.00084 17 8.98774 17.0002 8.96197 17.0046C8.93653 17.009 8.90469 17.0165 8.86906 17.0283C8.79578 17.0526 8.72467 17.0887 8.66666 17.1327C8.61069 17.1751 8.57296 17.22 8.54841 17.2665Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/undo.svg b/packages/manager/src/assets/icons/undo.svg
index 235305e5a9d..7fb586847b4 100644
--- a/packages/manager/src/assets/icons/undo.svg
+++ b/packages/manager/src/assets/icons/undo.svg
@@ -1,6 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-    <g fill="none" fill-rule="evenodd" stroke="#3683DC" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5">
-        <path d="M0.481 0.48L0.481 5.292 5.294 5.292" transform="translate(.3 .3)"/>
-        <path d="M7.7 14.917c3.987.003 7.22-3.227 7.223-7.214C14.926 3.717 11.696.483 7.71.48 4.648.478 1.919 2.407.899 5.292" transform="translate(.3 .3)"/>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M3.80352 2.19642C4.06322 2.45612 4.06322 2.87718 3.80352 3.13687L3.60541 3.33498L9.99997 3.33499C11.875 3.33501 13.0821 4.10058 13.7947 5.11864C14.4805 6.09829 14.665 7.24618 14.665 8C14.665 8.75478 14.4772 9.90086 13.7904 10.8792C13.0771 11.8953 11.8711 12.6615 10.0012 12.665L9.99996 12.665H8.66663C8.29936 12.665 8.00163 12.3673 8.00163 12C8.00163 11.6327 8.29936 11.335 8.66663 11.335L9.99872 11.335C9.99889 11.335 9.99905 11.335 9.99922 11.335C11.4521 11.3321 12.246 10.7643 12.7019 10.115C13.1843 9.42783 13.335 8.57702 13.335 8C13.335 7.42045 13.1861 6.56836 12.7052 5.88135C12.2512 5.23276 11.4583 4.66501 9.99996 4.66499L3.60541 4.66498L3.80352 4.86309C4.06322 5.12279 4.06322 5.54384 3.80352 5.80354C3.54382 6.06324 3.12277 6.06324 2.86307 5.80354L1.52973 4.47021C1.27004 4.21051 1.27004 3.78945 1.52973 3.52976L2.86307 2.19642C3.12277 1.93672 3.54382 1.93672 3.80352 2.19642Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/unsorted.svg b/packages/manager/src/assets/icons/unsorted.svg
index 5b2a949d6a3..ad2220dafb8 100644
--- a/packages/manager/src/assets/icons/unsorted.svg
+++ b/packages/manager/src/assets/icons/unsorted.svg
@@ -1,3 +1,3 @@
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13.7499 1.66492C13.9714 1.66492 14.1838 1.75289 14.3404 1.90949L17.2571 4.82624C17.5831 5.15233 17.5831 5.68103 17.2571 6.00711C16.931 6.3332 16.4023 6.33319 16.0762 6.0071L14.5849 4.51581V14.1666C14.5849 14.6278 14.2111 15.0016 13.7499 15.0016C13.2888 15.0016 12.9149 14.6278 12.9149 14.1666V4.51585L11.4237 6.00709C11.0977 6.33319 10.569 6.3332 10.2429 6.00712C9.91678 5.68104 9.91676 5.15235 10.2428 4.82625L13.1595 1.9095C13.3161 1.7529 13.5285 1.66492 13.7499 1.66492ZM6.24992 4.99838C6.71107 4.99838 7.08492 5.37222 7.08492 5.83338V15.4842L8.57619 13.9929C8.90228 13.6668 9.43097 13.6668 9.75706 13.9929C10.0831 14.319 10.0831 14.8477 9.75706 15.1738L6.84035 18.0905C6.68376 18.2471 6.47137 18.335 6.24991 18.335C6.02845 18.335 5.81607 18.2471 5.65947 18.0905L2.74285 15.1738C2.41677 14.8477 2.41677 14.319 2.74287 13.9929C3.06896 13.6668 3.59765 13.6668 3.92373 13.9929L5.41492 15.4841V5.83338C5.41492 5.37222 5.78876 4.99838 6.24992 4.99838Z" fill="#3D3D42"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.7499 1.66492C13.9714 1.66492 14.1838 1.75289 14.3404 1.90949L17.2571 4.82624C17.5831 5.15233 17.5831 5.68103 17.2571 6.00711C16.931 6.3332 16.4023 6.33319 16.0762 6.0071L14.5849 4.51581V14.1666C14.5849 14.6278 14.2111 15.0016 13.7499 15.0016C13.2888 15.0016 12.9149 14.6278 12.9149 14.1666V4.51585L11.4237 6.00709C11.0977 6.33319 10.569 6.3332 10.2429 6.00712C9.91678 5.68104 9.91676 5.15235 10.2428 4.82625L13.1595 1.9095C13.3161 1.7529 13.5285 1.66492 13.7499 1.66492ZM6.24992 4.99838C6.71107 4.99838 7.08492 5.37222 7.08492 5.83338V15.4842L8.57619 13.9929C8.90228 13.6668 9.43097 13.6668 9.75706 13.9929C10.0831 14.319 10.0831 14.8477 9.75706 15.1738L6.84035 18.0905C6.68376 18.2471 6.47137 18.335 6.24991 18.335C6.02845 18.335 5.81607 18.2471 5.65947 18.0905L2.74285 15.1738C2.41677 14.8477 2.41677 14.319 2.74287 13.9929C3.06896 13.6668 3.59765 13.6668 3.92373 13.9929L5.41492 15.4841V5.83338C5.41492 5.37222 5.78876 4.99838 6.24992 4.99838Z" fill="currentColor"/>
 </svg>
diff --git a/packages/manager/src/assets/icons/view.svg b/packages/manager/src/assets/icons/view.svg
index c69b1fbd3b8..ca689f80d64 100644
--- a/packages/manager/src/assets/icons/view.svg
+++ b/packages/manager/src/assets/icons/view.svg
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="13px" viewBox="0 0 20 13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 55.2 (78181) - https://sketchapp.com -->
-    <title>icon/view</title>
-    <desc>Created with Sketch.</desc>
-    <g id="2.-Continuted" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Kube-Detail-3.1" transform="translate(-1319.000000, -244.000000)">
-            <g id="right-rail" transform="translate(1112.000000, 169.000000)">
-                <g id="Kubeconfig">
-                    <g id="button/view" transform="translate(151.000000, 62.000000)">
-                        <g id="icon/view">
-                            <g transform="translate(56.000000, 10.000000)">
-                                <polygon id="Path" points="0 0 20 0 20 20 0 20"></polygon>
-                                <path d="M10,5 C13.1583333,5 15.975,6.775 17.35,9.58333333 C15.975,12.3916667 13.1583333,14.1666667 10,14.1666667 C6.84166667,14.1666667 4.025,12.3916667 2.65,9.58333333 C4.025,6.775 6.84166667,5 10,5 L10,5 Z M10,3.33333333 C5.83333333,3.33333333 2.275,5.925 0.833333333,9.58333333 C2.275,13.2416667 5.83333333,15.8333333 10,15.8333333 C14.1666667,15.8333333 17.725,13.2416667 19.1666667,9.58333333 C17.725,5.925 14.1666667,3.33333333 10,3.33333333 Z M10,7.5 C11.15,7.5 12.0833333,8.43333333 12.0833333,9.58333333 C12.0833333,10.7333333 11.15,11.6666667 10,11.6666667 C8.85,11.6666667 7.91666667,10.7333333 7.91666667,9.58333333 C7.91666667,8.43333333 8.85,7.5 10,7.5 L10,7.5 Z M10,5.83333333 C7.93333333,5.83333333 6.25,7.51666667 6.25,9.58333333 C6.25,11.65 7.93333333,13.3333333 10,13.3333333 C12.0666667,13.3333333 13.75,11.65 13.75,9.58333333 C13.75,7.51666667 12.0666667,5.83333333 10,5.83333333 Z" id="Shape" fill="#3683DC" fill-rule="nonzero"></path>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M4.17251 12C4.2424 12.1067 4.32442 12.2282 4.41833 12.3615C4.78881 12.8874 5.33816 13.5876 6.05139 14.285C7.4904 15.692 9.50279 17 12 17C14.4972 17 16.5096 15.692 17.9486 14.285C18.6618 13.5876 19.2112 12.8874 19.5817 12.3615C19.6756 12.2282 19.7576 12.1067 19.8275 12C19.7576 11.8933 19.6756 11.7718 19.5817 11.6385C19.2112 11.1126 18.6618 10.4124 17.9486 9.71501C16.5096 8.30798 14.4972 7 12 7C9.50279 7 7.4904 8.30798 6.05139 9.71501C5.33816 10.4124 4.78881 11.1126 4.41833 11.6385C4.32442 11.7718 4.2424 11.8933 4.17251 12ZM21 12C21.8779 11.5211 21.8777 11.5208 21.8775 11.5204L21.8759 11.5175L21.8727 11.5117L21.8626 11.4936C21.8543 11.4788 21.8427 11.4583 21.8279 11.4327C21.7983 11.3814 21.7558 11.3092 21.7005 11.2192C21.5901 11.0392 21.4283 10.787 21.2166 10.4865C20.7945 9.88738 20.1677 9.08761 19.3468 8.28499C17.7177 6.69203 15.2301 5 12 5C8.76994 5 6.28233 6.69203 4.65316 8.28499C3.8323 9.08761 3.20551 9.88738 2.78337 10.4865C2.57172 10.787 2.40994 11.0392 2.29949 11.2192C2.24423 11.3092 2.2017 11.3814 2.1721 11.4327C2.15729 11.4583 2.14571 11.4788 2.13737 11.4936L2.1273 11.5117L2.12409 11.5175L2.12295 11.5196C2.12275 11.52 2.1221 11.5211 3 12L2.1221 11.5211C1.9593 11.8196 1.9593 12.1804 2.1221 12.4789L3 12C2.1221 12.4789 2.12191 12.4785 2.1221 12.4789L2.12295 12.4804L2.12409 12.4825L2.1273 12.4883L2.13737 12.5064C2.14571 12.5212 2.15729 12.5417 2.1721 12.5673C2.2017 12.6186 2.24423 12.6908 2.29949 12.7808C2.40994 12.9608 2.57172 13.213 2.78337 13.5135C3.20551 14.1126 3.8323 14.9124 4.65316 15.715C6.28233 17.308 8.76994 19 12 19C15.2301 19 17.7177 17.308 19.3468 15.715C20.1677 14.9124 20.7945 14.1126 21.2166 13.5135C21.4283 13.213 21.5901 12.9608 21.7005 12.7808C21.7558 12.6908 21.7983 12.6186 21.8279 12.5673C21.8427 12.5417 21.8543 12.5212 21.8626 12.5064L21.8727 12.4883L21.8759 12.4825L21.8771 12.4804C21.8773 12.48 21.8779 12.4789 21 12ZM21 12L21.8779 12.4789C22.0407 12.1804 22.0403 11.8189 21.8775 11.5204L21 12ZM12 11C11.4477 11 11 11.4477 11 12C11 12.5523 11.4477 13 12 13C12.5523 13 13 12.5523 13 12C13 11.4477 12.5523 11 12 11ZM9 12C9 10.3431 10.3431 9 12 9C13.6569 9 15 10.3431 15 12C15 13.6569 13.6569 15 12 15C10.3431 15 9 13.6569 9 12Z" fill="currentColor"/>
 </svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/youtube.svg b/packages/manager/src/assets/icons/youtube.svg
index f362a87ae00..fc5cf2d235d 100644
--- a/packages/manager/src/assets/icons/youtube.svg
+++ b/packages/manager/src/assets/icons/youtube.svg
@@ -1,11 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Rectangle 2</title>
-    <g id="Final-Options" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Linodes-landing-22" transform="translate(-882.000000, -670.000000)" stroke="currentColor">
-            <g id="Group-12" transform="translate(169.500000, 670.000000)">
-                <path d="M726.5,0.5 C727.466498,0.5 728.341498,0.891750844 728.974874,1.52512627 C729.608249,2.15850169 730,3.03350169 730,4 L730,14 C730,14.9664983 729.608249,15.8414983 728.974874,16.4748737 C728.341498,17.1082492 727.466498,17.5 726.5,17.5 L716.5,17.5 C715.533502,17.5 714.658502,17.1082492 714.025126,16.4748737 C713.391751,15.8414983 713,14.9664983 713,14 L713,4 C713,3.03350169 713.391751,2.15850169 714.025126,1.52512627 C714.658502,0.891750844 715.533502,0.5 716.5,0.5 L726.5,0.5 Z M718,4.69097409 L718,13.3090081 L726.618034,9.00009722 L718,4.69097409 Z" id="Rectangle-2"></path>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M1.66504 3.33335C1.66504 2.87219 2.03888 2.49835 2.50004 2.49835H17.5C17.9612 2.49835 18.335 2.87219 18.335 3.33335V16.6667C18.335 17.1278 17.9612 17.5017 17.5 17.5017H2.50004C2.03888 17.5017 1.66504 17.1278 1.66504 16.6667V3.33335ZM3.33504 4.16835V4.99835H16.665V4.16835H3.33504ZM16.665 6.66835H3.33504V15.8317H16.665V6.66835Z" fill="currentColor"/>
+  <path d="M8.75004 12.9167V9.58335L12.0834 11.25L8.75004 12.9167Z" fill="currentColor"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M8.31105 8.87306C8.55723 8.72092 8.86462 8.70709 9.12346 8.83651L12.4568 10.5032C12.7397 10.6446 12.9184 10.9337 12.9184 11.25C12.9184 11.5663 12.7397 11.8554 12.4568 11.9969L9.12346 13.6635C8.86462 13.793 8.55723 13.7791 8.31105 13.627C8.06488 13.4748 7.91504 13.2061 7.91504 12.9167V9.58335C7.91504 9.29396 8.06488 9.0252 8.31105 8.87306ZM9.58504 10.9344V11.5656L10.2163 11.25L9.58504 10.9344Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/assets/icons/zoomin.svg b/packages/manager/src/assets/icons/zoomin.svg
index 389ea95c5da..4e96d715e67 100644
--- a/packages/manager/src/assets/icons/zoomin.svg
+++ b/packages/manager/src/assets/icons/zoomin.svg
@@ -1,18 +1,10 @@
-<svg width="20" height="20" viewBox="0 0 20 20"  xmlns="http://www.w3.org/2000/svg">
-<path d="M13.333 2.50073H17.4997V6.6674" fill="currentColor"/>
-<path d="M13.333 2.50073H17.4997V6.6674" stroke="currentColor" stroke-width="1.67" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.66667 2.50073H2.5V6.6674" fill="currentColor"/>
-<path d="M6.66667 2.50073H2.5V6.6674" stroke="currentColor" stroke-width="1.67" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.66667 17.5006H2.5V13.334" fill="currentColor"/>
-<path d="M6.66667 17.5006H2.5V13.334" stroke="currentColor" stroke-width="1.67" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.333 17.5006H17.4997V13.334" fill="currentColor"/>
-<path d="M13.333 17.5006H17.4997V13.334" stroke="currentColor" stroke-width="1.67" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M17.5003 2.50073L11.667 8.33406L17.5003 2.50073Z" fill="currentColor"/>
-<path d="M17.5003 2.50073L11.667 8.33406" stroke="currentColor" stroke-width="1.67" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.5 2.50073L8.33333 8.33406L2.5 2.50073Z" fill="currentColor"/>
-<path d="M2.5 2.50073L8.33333 8.33406" stroke="currentColor" stroke-width="1.67" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.5 17.5008L8.33333 11.6674L2.5 17.5008Z" fill="currentColor"/>
-<path d="M2.5 17.5008L8.33333 11.6674" stroke="currentColor" stroke-width="1.67" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M17.5003 17.5008L11.667 11.6674L17.5003 17.5008Z" fill="currentColor"/>
-<path d="M17.5003 17.5008L11.667 11.6674" stroke="currentColor" stroke-width="1.67" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M12.0816 3.33329C12.0816 2.87213 12.4555 2.49829 12.9166 2.49829H16.6666C17.1278 2.49829 17.5016 2.87213 17.5016 3.33329V7.08329C17.5016 7.54445 17.1278 7.91829 16.6666 7.91829C16.2055 7.91829 15.8316 7.54445 15.8316 7.08329V4.16829H12.9166C12.4555 4.16829 12.0816 3.79445 12.0816 3.33329Z" fill="currentColor"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M7.91829 3.33329C7.91829 2.87213 7.54445 2.49829 7.08329 2.49829H3.33329C2.87213 2.49829 2.49829 2.87213 2.49829 3.33329V7.08329C2.49829 7.54445 2.87213 7.91829 3.33329 7.91829C3.79445 7.91829 4.16829 7.54445 4.16829 7.08329V4.16829H7.08329C7.54445 4.16829 7.91829 3.79445 7.91829 3.33329Z" fill="currentColor"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M3.33329 12.0816C3.79445 12.0816 4.16829 12.4555 4.16829 12.9166V15.8316H7.08329C7.54445 15.8316 7.91829 16.2055 7.91829 16.6666C7.91829 17.1278 7.54445 17.5016 7.08329 17.5016H3.33329C2.87213 17.5016 2.49829 17.1278 2.49829 16.6666V12.9166C2.49829 12.4555 2.87213 12.0816 3.33329 12.0816Z" fill="currentColor"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M16.6666 12.0816C16.2055 12.0816 15.8316 12.4555 15.8316 12.9166V15.8316H12.9166C12.4555 15.8316 12.0816 16.2055 12.0816 16.6666C12.0816 17.1278 12.4555 17.5016 12.9166 17.5016H16.6666C17.1278 17.5016 17.5016 17.1278 17.5016 16.6666V12.9166C17.5016 12.4555 17.1278 12.0816 16.6666 12.0816Z" fill="currentColor"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M17.2571 2.74286C17.5831 3.06894 17.5831 3.59764 17.2571 3.92373L11.8404 9.34039C11.5143 9.66648 10.9856 9.66648 10.6595 9.34039C10.3334 9.0143 10.3334 8.48561 10.6595 8.15952L16.0762 2.74286C16.4023 2.41677 16.931 2.41677 17.2571 2.74286Z" fill="currentColor"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M2.74286 2.74286C2.41677 3.06894 2.41677 3.59764 2.74286 3.92373L8.15952 9.34039C8.48561 9.66648 9.0143 9.66648 9.34039 9.34039C9.66648 9.0143 9.66648 8.48561 9.34039 8.15952L3.92373 2.74286C3.59764 2.41677 3.06894 2.41677 2.74286 2.74286Z" fill="currentColor"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M9.34039 10.6595C9.66648 10.9856 9.66648 11.5143 9.34039 11.8404L3.92373 17.2571C3.59764 17.5831 3.06894 17.5831 2.74286 17.2571C2.41677 16.931 2.41677 16.4023 2.74286 16.0762L8.15952 10.6595C8.48561 10.3334 9.0143 10.3334 9.34039 10.6595Z" fill="currentColor"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M10.6595 10.6595C10.3334 10.9856 10.3334 11.5143 10.6595 11.8404L16.0762 17.2571C16.4023 17.5831 16.931 17.5831 17.2571 17.2571C17.5831 16.931 17.5831 16.4023 17.2571 16.0762L11.8404 10.6595C11.5143 10.3334 10.9856 10.3334 10.6595 10.6595Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/components/AvatarForProxy.tsx b/packages/manager/src/components/AvatarForProxy.tsx
index d144b083e53..8c0d7e2785e 100644
--- a/packages/manager/src/components/AvatarForProxy.tsx
+++ b/packages/manager/src/components/AvatarForProxy.tsx
@@ -40,8 +40,11 @@ export const AvatarForProxy = ({ height = 34, width = 34 }: Props) => {
 
 const StyledProxyUserIcon = styled(ProxyUserIcon, {
   label: 'styledProxyUserIcon',
-})(() => ({
+})(({ theme }) => ({
   bottom: 0,
   left: 0,
   position: 'absolute',
+  '& path': {
+    fill: theme.tokens.alias.Content.Icon.Secondary.Default,
+  },
 }));
diff --git a/packages/manager/src/components/IconGallery/IconGallery.stories.tsx b/packages/manager/src/components/IconGallery/IconGallery.stories.tsx
new file mode 100644
index 00000000000..973d784f967
--- /dev/null
+++ b/packages/manager/src/components/IconGallery/IconGallery.stories.tsx
@@ -0,0 +1,178 @@
+import { Typography } from '@linode/ui';
+import Box from '@mui/material/Box';
+import { useTheme } from '@mui/material/styles';
+import TextField from '@mui/material/TextField';
+import React, { useMemo, useState } from 'react';
+
+import { allIcons, IconGallery, type IconName } from './IconGallery';
+
+import type { Meta, StoryObj } from '@storybook/react-vite';
+
+const meta: Meta<typeof IconGallery> = {
+  title: 'Icons/Icon Gallery',
+  component: IconGallery,
+  parameters: {
+    docs: {
+      description: {
+        component:
+          'A component for displaying individual SVG icons. Icons with defined colors (like database logos) preserve their original colors, while others can be customized with a global color override.',
+      },
+    },
+  },
+  argTypes: {
+    globalColor: {
+      control: { type: 'color' },
+      description:
+        "Override color for icons that don't have defined colors. Icons with fixed colors will not be affected.",
+    },
+    size: {
+      control: { type: 'number' },
+      description: 'Size of the icon in pixels',
+    },
+    iconName: {
+      control: { type: 'select' },
+      options: allIcons.map((icon) => icon.name),
+      description: 'The name of the icon to display',
+    },
+  },
+};
+
+export default meta;
+type Story = StoryObj<typeof IconGallery>;
+
+export const SingleIcon: Story = {
+  args: {
+    iconName: 'Add',
+    size: 48,
+    globalColor: '#108ad6',
+  },
+};
+
+const AllIconsComponent = ({
+  globalColor = '#108ad6',
+}: {
+  globalColor?: string;
+}) => {
+  const [searchTerm, setSearchTerm] = useState('');
+  const theme = useTheme();
+
+  const filteredIcons = useMemo(() => {
+    if (!searchTerm.trim()) {
+      return allIcons;
+    }
+
+    return allIcons.filter((icon) =>
+      icon.name.toLowerCase().includes(searchTerm.toLowerCase())
+    );
+  }, [searchTerm]);
+
+  const statsInfo = useMemo(() => {
+    const total = allIcons.length;
+    const filtered = filteredIcons.length;
+
+    return { total, filtered };
+  }, [filteredIcons]);
+
+  return (
+    <Box sx={{ padding: 2 }}>
+      <Typography gutterBottom variant="h4">
+        Icon Gallery
+      </Typography>
+
+      <Typography color="text.secondary" sx={{ mb: 3 }} variant="body1">
+        A searchable collection of {statsInfo.total} SVG icons. Icons with
+        currentColor in their SVG will respond to color changes, while others
+        preserve their original colors.
+        {globalColor &&
+          ` Global color override is active for changeable icons.`}
+      </Typography>
+
+      <Box
+        sx={{
+          mb: 3,
+          display: 'flex',
+          gap: 2,
+          flexWrap: 'wrap',
+          alignItems: 'center',
+        }}
+      >
+        <TextField
+          onChange={(e) => setSearchTerm(e.target.value)}
+          placeholder="Search icons..."
+          size="small"
+          sx={{
+            minWidth: 300,
+            flexGrow: 1,
+            maxWidth: 400,
+            marginTop: 0,
+            zIndex: 1,
+            position: 'relative',
+            '& .MuiOutlinedInput-root': {
+              backgroundColor: theme.palette.background.paper,
+              '&.Mui-focused': {
+                backgroundColor: theme.palette.background.paper,
+              },
+            },
+            '& .MuiInputBase-input': {
+              backgroundColor: 'transparent',
+              color: theme.palette.text.primary,
+              zIndex: 2,
+              position: 'relative',
+            },
+          }}
+          value={searchTerm}
+          variant="outlined"
+        />
+      </Box>
+
+      <Typography color="text.secondary" sx={{ mb: 2 }} variant="body2">
+        Showing {statsInfo.filtered} of {statsInfo.total} icons
+      </Typography>
+
+      {filteredIcons.length > 0 ? (
+        <Box
+          sx={{
+            display: 'grid',
+            gridTemplateColumns: 'repeat(auto-fill, minmax(120px, 1fr))',
+            gap: 2,
+          }}
+        >
+          {filteredIcons.map(({ name }) => (
+            <IconGallery
+              globalColor={globalColor}
+              iconName={name as IconName}
+              key={name}
+              size={48}
+            />
+          ))}
+        </Box>
+      ) : (
+        <Box
+          sx={{
+            textAlign: 'center',
+            py: 8,
+            color: theme.palette.text.secondary,
+          }}
+        >
+          <Typography gutterBottom variant="h6">
+            No icons found
+          </Typography>
+          <Typography variant="body2">
+            Try adjusting your search term
+          </Typography>
+        </Box>
+      )}
+    </Box>
+  );
+};
+
+export const AllIcons: Story = {
+  args: {
+    globalColor: '#108ad6',
+  },
+  argTypes: {
+    iconName: { table: { disable: true } },
+    size: { table: { disable: true } },
+  },
+  render: (args) => <AllIconsComponent globalColor={args.globalColor} />,
+};
diff --git a/packages/manager/src/components/IconGallery/IconGallery.tsx b/packages/manager/src/components/IconGallery/IconGallery.tsx
new file mode 100644
index 00000000000..8c288d8c277
--- /dev/null
+++ b/packages/manager/src/components/IconGallery/IconGallery.tsx
@@ -0,0 +1,104 @@
+import { Typography } from '@linode/ui';
+import Box from '@mui/material/Box';
+import { useTheme } from '@mui/material/styles';
+import React from 'react';
+
+const iconModules = import.meta.glob<{
+  default: React.ComponentType<React.SVGProps<SVGSVGElement>>;
+}>('../../assets/icons/**/*.svg', { eager: true });
+
+export const allIcons = Object.entries(iconModules)
+  .map(([path, module]) => {
+    const filename = path.split('/').pop()?.replace('.svg', '') || '';
+
+    const name = filename
+      .replace(/[-_]/g, ' ')
+      .split(' ')
+      .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
+      .join('');
+
+    return {
+      name,
+      component: module.default,
+      path,
+    };
+  })
+  .sort((a, b) => a.name.localeCompare(b.name));
+
+export type IconName = (typeof allIcons)[number]['name'];
+
+export interface IconGalleryProps {
+  globalColor?: string;
+  iconName: IconName;
+  size?: number;
+}
+
+export const IconGallery: React.FC<IconGalleryProps> = ({
+  iconName,
+  globalColor,
+  size = 48,
+}) => {
+  const theme = useTheme();
+  const iconData = allIcons.find((icon) => icon.name === iconName);
+
+  if (!iconData) {
+    return <Typography color="error">Icon not found: {iconName}</Typography>;
+  }
+
+  const { component: IconComponent } = iconData;
+
+  return (
+    <Box
+      sx={{
+        display: 'flex',
+        flexDirection: 'column',
+        alignItems: 'center',
+        padding: theme.spacingFunction(2),
+        minWidth: 120,
+        textAlign: 'center',
+        border: `1px solid ${theme.tokens.alias.Border.Normal}`,
+        borderRadius: 1,
+        backgroundColor: theme.palette.background.paper,
+        '&:hover': {
+          backgroundColor: theme.palette.action.hover,
+        },
+      }}
+    >
+      <Box
+        sx={{
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+          width: size,
+          height: size,
+          mb: theme.tokens.spacing.S8,
+          '& svg': {
+            width: '100%',
+            height: '100%',
+            ...(globalColor && {
+              color: globalColor,
+            }),
+          },
+        }}
+      >
+        <IconComponent
+          height={size}
+          style={{
+            width: '100%',
+            height: '100%',
+          }}
+          width={size}
+        />
+      </Box>
+      <Typography
+        sx={{
+          fontSize: theme.typography.caption.fontSize,
+          wordBreak: 'break-word',
+        }}
+        variant="caption"
+      >
+        {iconName}
+      </Typography>
+    </Box>
+  );
+};
diff --git a/packages/manager/src/components/Uploaders/FileUpload.styles.ts b/packages/manager/src/components/Uploaders/FileUpload.styles.ts
index 2cb23052408..ec12185a33f 100644
--- a/packages/manager/src/components/Uploaders/FileUpload.styles.ts
+++ b/packages/manager/src/components/Uploaders/FileUpload.styles.ts
@@ -81,11 +81,17 @@ export const useStyles = makeStyles()((theme: Theme) => ({
     '& g': {
       stroke: theme.palette.error.dark,
     },
+    '& path': {
+      fill: theme.palette.error.dark,
+    },
     color: theme.palette.error.dark,
   },
   iconRight: {
     color: theme.textColors.headlineStatic,
   },
+  success: {
+    color: theme.palette.success.dark,
+  },
   overwriteNotice: {
     alignItems: 'center',
     borderBottom: `1px solid ${theme.color.grey2}`,
diff --git a/packages/manager/src/components/Uploaders/FileUpload.tsx b/packages/manager/src/components/Uploaders/FileUpload.tsx
index 7a13f312623..ae088b76440 100644
--- a/packages/manager/src/components/Uploaders/FileUpload.tsx
+++ b/packages/manager/src/components/Uploaders/FileUpload.tsx
@@ -96,7 +96,10 @@ export const FileUpload = React.memo((props: FileUploadProps) => {
           </StyledFileSizeTypography>
           {props.percentCompleted === 100 ? (
             <FileUploadComplete
-              className={classes.iconRight}
+              className={cx({
+                [classes.iconRight]: true,
+                [classes.success]: true,
+              })}
               data-qa-file-upload-success
               height={22}
               width={22}
diff --git a/packages/manager/src/dev-tools/components/Draggable.tsx b/packages/manager/src/dev-tools/components/Draggable.tsx
index e3e7fbc69d2..f6c33605e40 100644
--- a/packages/manager/src/dev-tools/components/Draggable.tsx
+++ b/packages/manager/src/dev-tools/components/Draggable.tsx
@@ -127,7 +127,7 @@ export const Draggable = ({ children, draggable }: DraggableProps) => {
             onMouseDown={(e) => onResizeStart(e)}
             title="Resize"
           >
-            <ResizeWindow />
+            <ResizeWindow height={16} width={16} />
           </button>
         </>
       )}
diff --git a/packages/manager/src/dev-tools/dev-tools.css b/packages/manager/src/dev-tools/dev-tools.css
index feec0feee2a..244cedde76d 100644
--- a/packages/manager/src/dev-tools/dev-tools.css
+++ b/packages/manager/src/dev-tools/dev-tools.css
@@ -61,7 +61,7 @@
   position: absolute;
   z-index: 2;
   right: 0px;
-  bottom: 16px;
+  bottom: 22px;
   color: white;
   cursor: ew-resize;
   background: transparent;
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeMetrics/LinodeSummary/LinodeSummary.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeMetrics/LinodeSummary/LinodeSummary.tsx
index 083cf5cc6d1..6882e4c8337 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeMetrics/LinodeSummary/LinodeSummary.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeMetrics/LinodeSummary/LinodeSummary.tsx
@@ -196,7 +196,11 @@ const LinodeSummary = (props: Props) => {
     return (
       <Paper>
         <ErrorState
-          CustomIcon={PendingIcon}
+          CustomIcon={() => (
+            <PendingIcon
+              style={{ color: theme.tokens.alias.Content.Icon.Positive }}
+            />
+          )}
           CustomIconStyles={{ height: 64, width: 64 }}
           errorText={
             <Stack spacing={1}>
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/NetworkingSummaryPanel/TransferHistory.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/NetworkingSummaryPanel/TransferHistory.tsx
index 0634919110a..1c89b01e6a5 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/NetworkingSummaryPanel/TransferHistory.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/NetworkingSummaryPanel/TransferHistory.tsx
@@ -138,7 +138,15 @@ export const TransferHistory = React.memo((props: Props) => {
       return (
         <ErrorState
           compact
-          CustomIcon={areStatsNotReady ? PendingIcon : undefined}
+          CustomIcon={
+            areStatsNotReady
+              ? () => (
+                  <PendingIcon
+                    style={{ color: theme.tokens.alias.Content.Icon.Positive }}
+                  />
+                )
+              : undefined
+          }
           errorText={
             areStatsNotReady ? STATS_NOT_READY_MESSAGE : statsErrorString
           }
diff --git a/packages/manager/src/features/Linodes/LinodesLanding/LinodeRow/LinodeRow.tsx b/packages/manager/src/features/Linodes/LinodesLanding/LinodeRow/LinodeRow.tsx
index 76106256be1..7aacd7ad18a 100644
--- a/packages/manager/src/features/Linodes/LinodesLanding/LinodeRow/LinodeRow.tsx
+++ b/packages/manager/src/features/Linodes/LinodesLanding/LinodeRow/LinodeRow.tsx
@@ -2,6 +2,7 @@ import { useTypeQuery } from '@linode/queries';
 import { Tooltip, TooltipIcon, Typography } from '@linode/ui';
 import { Hidden } from '@linode/ui';
 import { formatStorageUnits, getFormattedStatus } from '@linode/utilities';
+import { useTheme } from '@mui/material/styles';
 import * as React from 'react';
 
 import Flag from 'src/assets/icons/flag.svg';
@@ -204,11 +205,12 @@ export const RenderFlag: React.FC<{
    * precedent over notifications
    */
   const { mutationAvailable } = props;
+  const theme = useTheme();
 
   if (mutationAvailable) {
     return (
       <Tooltip title="There is a free upgrade available for this Linode">
-        <Flag />
+        <Flag style={{ color: theme.tokens.alias.Content.Icon.Informative }} />
       </Tooltip>
     );
   }
diff --git a/packages/manager/src/features/Managed/ManagedDashboardCard/MonitorStatus.tsx b/packages/manager/src/features/Managed/ManagedDashboardCard/MonitorStatus.tsx
index 9c539b2c10b..0984a1b6342 100644
--- a/packages/manager/src/features/Managed/ManagedDashboardCard/MonitorStatus.tsx
+++ b/packages/manager/src/features/Managed/ManagedDashboardCard/MonitorStatus.tsx
@@ -1,5 +1,6 @@
 import { Typography } from '@linode/ui';
 import Grid from '@mui/material/Grid';
+import { useTheme } from '@mui/material/styles';
 import * as React from 'react';
 
 import MonitorFailed from 'src/assets/icons/monitor-failed.svg';
@@ -19,6 +20,7 @@ export interface MonitorStatusProps {
 }
 
 export const MonitorStatus = (props: MonitorStatusProps) => {
+  const theme = useTheme();
   const { monitors } = props;
 
   const failedMonitors = getFailedMonitors(monitors);
@@ -34,9 +36,17 @@ export const MonitorStatus = (props: MonitorStatusProps) => {
       <Grid>
         <StyledIconGrid>
           {failedMonitors.length === 0 ? (
-            <MonitorOK height={iconSize} width={iconSize} />
+            <MonitorOK
+              color={theme.tokens.alias.Content.Icon.Positive}
+              height={iconSize}
+              width={iconSize}
+            />
           ) : (
-            <MonitorFailed height={iconSize} width={iconSize} />
+            <MonitorFailed
+              color={theme.tokens.alias.Content.Icon.Negative}
+              height={iconSize}
+              width={iconSize}
+            />
           )}
         </StyledIconGrid>
       </Grid>
diff --git a/packages/manager/src/features/Managed/Monitors/IssueDay.tsx b/packages/manager/src/features/Managed/Monitors/IssueDay.tsx
index bb014efa15f..71211e46c25 100644
--- a/packages/manager/src/features/Managed/Monitors/IssueDay.tsx
+++ b/packages/manager/src/features/Managed/Monitors/IssueDay.tsx
@@ -1,5 +1,6 @@
 import { Tooltip } from '@linode/ui';
 import Grid from '@mui/material/Grid';
+import { useTheme } from '@mui/material/styles';
 import * as React from 'react';
 import type { JSX } from 'react';
 
@@ -64,18 +65,31 @@ const iconStyles = {
 
 export const IssueDay = (props: IssueDayProps) => {
   const { day, issues } = props;
+  const theme = useTheme();
 
   const issueLinks = issues.map((thisIssue) => thisIssue.entity.id);
 
   if (issues.length === 0) {
     // No issues for today
-    return <DayDisplay day={day} icon={<Good {...iconStyles} />} />;
+    return (
+      <DayDisplay
+        day={day}
+        icon={
+          <Good
+            style={{
+              ...iconStyles,
+              color: theme.tokens.alias.Content.Icon.Positive,
+            }}
+          />
+        }
+      />
+    );
   }
 
   return (
     <DayDisplay
       day={day}
-      icon={<Bad {...iconStyles} />}
+      icon={<Bad style={{ ...iconStyles, color: theme.palette.error.main }} />}
       // For now, not worrying about the possibility of multiple tickets opened in a single day
       ticketUrl={`/support/tickets/${issueLinks[0]}`}
     />
diff --git a/packages/manager/src/features/Managed/Monitors/MonitorRow.tsx b/packages/manager/src/features/Managed/Monitors/MonitorRow.tsx
index 0522d1f27ce..601beefa33d 100644
--- a/packages/manager/src/features/Managed/Monitors/MonitorRow.tsx
+++ b/packages/manager/src/features/Managed/Monitors/MonitorRow.tsx
@@ -1,12 +1,13 @@
 import { Tooltip, Typography } from '@linode/ui';
 import Grid from '@mui/material/Grid';
+import { useTheme } from '@mui/material/styles';
 import * as React from 'react';
 
 import TicketIcon from 'src/assets/icons/ticket.svg';
 import { TableCell } from 'src/components/TableCell';
 
 import { MonitorActionMenu } from './MonitorActionMenu';
-import { statusIconMap, statusTextMap } from './monitorMaps';
+import { getStatusColorMap, statusIconMap, statusTextMap } from './monitorMaps';
 import {
   StyledGrid,
   StyledLink,
@@ -25,8 +26,10 @@ interface MonitorRowProps {
 
 export const MonitorRow = (props: MonitorRowProps) => {
   const { issues, monitor } = props;
+  const theme = useTheme();
 
   const Icon = statusIconMap[monitor.status];
+  const statusColors = getStatusColorMap(theme);
 
   // For now, only include a ticket icon in this view if the ticket is still open (per Jay).
   const openIssues = issues.filter((thisIssue) => !thisIssue.dateClosed);
@@ -50,7 +53,11 @@ export const MonitorRow = (props: MonitorRowProps) => {
           wrap="nowrap"
         >
           <StyledGrid>
-            <Icon height={30} width={30} />
+            <Icon
+              height={30}
+              style={{ color: statusColors[monitor.status] }}
+              width={30}
+            />
           </StyledGrid>
           <Grid>{monitor.label}</Grid>
         </Grid>
diff --git a/packages/manager/src/features/Managed/Monitors/monitorMaps.ts b/packages/manager/src/features/Managed/Monitors/monitorMaps.ts
index ab9948ac318..43a77035430 100644
--- a/packages/manager/src/features/Managed/Monitors/monitorMaps.ts
+++ b/packages/manager/src/features/Managed/Monitors/monitorMaps.ts
@@ -4,6 +4,7 @@ import Good from 'src/assets/icons/monitor-ok.svg';
 import Pending from 'src/assets/icons/pending.svg';
 
 import type { MonitorStatus } from '@linode/api-v4/lib/managed';
+import type { Theme } from '@mui/material/styles';
 
 export const statusIconMap: Record<MonitorStatus, any> = {
   disabled: Disabled,
@@ -18,3 +19,12 @@ export const statusTextMap: Record<MonitorStatus, string> = {
   pending: 'Pending',
   problem: 'Failed',
 };
+
+export const getStatusColorMap = (
+  theme: Theme
+): Record<MonitorStatus, string> => ({
+  disabled: theme.palette.text.disabled,
+  ok: theme.tokens.alias.Content.Icon.Positive,
+  pending: theme.tokens.alias.Content.Icon.Positive,
+  problem: theme.tokens.alias.Content.Icon.Negative,
+});
diff --git a/packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerSummary/TablesPanel.tsx b/packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerSummary/TablesPanel.tsx
index 5c0a92af7cd..80ea72c3481 100644
--- a/packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerSummary/TablesPanel.tsx
+++ b/packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerSummary/TablesPanel.tsx
@@ -53,7 +53,11 @@ export const TablesPanel = () => {
     if (statsNotReadyError) {
       return (
         <ErrorState
-          CustomIcon={PendingIcon}
+          CustomIcon={() => (
+            <PendingIcon
+              style={{ color: theme.tokens.alias.Content.Icon.Positive }}
+            />
+          )}
           CustomIconStyles={{ height: 64, width: 64 }}
           errorText={
             <>
diff --git a/packages/manager/src/features/ObjectStorage/AccessKeyLanding/AccessCell.tsx b/packages/manager/src/features/ObjectStorage/AccessKeyLanding/AccessCell.tsx
index 1dd4f622a19..e77708c9560 100644
--- a/packages/manager/src/features/ObjectStorage/AccessKeyLanding/AccessCell.tsx
+++ b/packages/manager/src/features/ObjectStorage/AccessKeyLanding/AccessCell.tsx
@@ -69,10 +69,11 @@ export const AccessCell = React.memo((props: AccessCellProps) => {
 
 const StyledCheckIcon = styled('span', {
   label: 'StyledCheckIcon',
-})(() => ({
+})(({ theme }) => ({
   '& svg': {
     height: 25,
     width: 25,
+    color: theme.tokens.alias.Content.Icon.Positive,
   },
   alignItems: 'center',
   display: 'flex',
diff --git a/packages/manager/src/features/Profile/AuthenticationSettings/TPAProviders.tsx b/packages/manager/src/features/Profile/AuthenticationSettings/TPAProviders.tsx
index 0a5614a4fc2..b592c5fc6fd 100644
--- a/packages/manager/src/features/Profile/AuthenticationSettings/TPAProviders.tsx
+++ b/packages/manager/src/features/Profile/AuthenticationSettings/TPAProviders.tsx
@@ -1,5 +1,6 @@
 import { Box, Divider, Notice, Paper, Stack, Typography } from '@linode/ui';
 import Grid from '@mui/material/Grid';
+import { useTheme } from '@mui/material/styles';
 import * as React from 'react';
 
 import EnabledIcon from 'src/assets/icons/checkmark-enabled.svg';
@@ -33,6 +34,7 @@ const linode = {
 
 export const TPAProviders = (props: Props) => {
   const flags = useFlags();
+  const theme = useTheme();
 
   // Get list of providers from LaunchDarkly
   const providers = flags.tpaProviders ?? [];
@@ -83,7 +85,15 @@ export const TPAProviders = (props: Props) => {
                 onClick={() => handleProviderChange(thisProvider.name)}
                 renderIcon={() => <ProviderIcon height={32} width={32} />}
                 renderVariant={
-                  isProviderEnabled ? () => <EnabledIcon /> : undefined
+                  isProviderEnabled
+                    ? () => (
+                        <EnabledIcon
+                          style={{
+                            color: theme.tokens.alias.Content.Icon.Positive,
+                          }}
+                        />
+                      )
+                    : undefined
                 }
                 subheadings={isProviderEnabled ? ['Enabled'] : []}
                 tooltip={

From 0888fb0f656147f96dcc9f789b92c3ab586e5745 Mon Sep 17 00:00:00 2001
From: tvijay-akamai <51293194+tvijay-akamai@users.noreply.github.com>
Date: Tue, 18 Nov 2025 15:13:52 +0530
Subject: [PATCH 12/91] fix: [UIE-9656] - Plans panel pagination bug fix
 (#13100)

* fix: [UIE-9659] Plans panel pagination bug fix

* fix: [UIE-9659] adding changeset
---
 .../pr-13100-fixed-1764265664121.md           |  5 +++++
 packages/manager/src/components/Paginate.ts   | 20 ++++++++++++++++++-
 .../KubernetesPlanContainer.tsx               | 12 ++++++++++-
 .../components/PlansPanel/PlanContainer.tsx   | 12 ++++++++++-
 4 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13100-fixed-1764265664121.md

diff --git a/packages/manager/.changeset/pr-13100-fixed-1764265664121.md b/packages/manager/.changeset/pr-13100-fixed-1764265664121.md
new file mode 100644
index 00000000000..4371d0b1da5
--- /dev/null
+++ b/packages/manager/.changeset/pr-13100-fixed-1764265664121.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+Plans panel pagination bug fix ([#13100](https://github.com/linode/manager/pull/13100))
diff --git a/packages/manager/src/components/Paginate.ts b/packages/manager/src/components/Paginate.ts
index 449cc00e0e6..a8e74be77be 100644
--- a/packages/manager/src/components/Paginate.ts
+++ b/packages/manager/src/components/Paginate.ts
@@ -39,6 +39,20 @@ interface State {
 interface Props<T> {
   children: (p: PaginationProps<T>) => React.ReactNode;
   data: T[];
+  /**
+   * When true, prevents page size changes from being persisted to the global PAGE_SIZE
+   * localStorage key. This is critical for components with custom page size options
+   * (e.g., plans panel with 15, 25, 50) to ensure they don't override the standard
+   * page size preference (25, 50, 75, 100) used by other tables across the application.
+   *
+   * Use this flag when:
+   * - Component has non-standard page size options (anything other than 25, 50, 75, 100)
+   * - Page size should be ephemeral (not persisted across sessions)
+   * - Component uses customOptions prop in PaginationFooter
+   *
+   * @default false
+   */
+  noPageSizeOverride?: boolean;
   page?: number;
   pageSize?: number;
   pageSizeSetter?: (v: number) => void;
@@ -69,9 +83,13 @@ export default class Paginate<T> extends React.Component<Props<T>, State> {
     // Use the custom setter if one has been supplied.
     if (this.props.pageSizeSetter) {
       this.props.pageSizeSetter(pageSize);
-    } else {
+    } else if (!this.props.noPageSizeOverride) {
+      // Only persist to global PAGE_SIZE storage if noPageSizeOverride is not set.
+      // This ensures components with non-standard page sizes (e.g., 15, 25, 50)
+      // don't override the standard preference (25, 50, 75, 100) used across the app.
       storage.pageSize.set(pageSize);
     }
+    // If noPageSizeOverride is true, page size change is kept in local state only
   };
 
   render() {
diff --git a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanContainer.tsx b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanContainer.tsx
index c8e8c7501b3..f15d2c79c98 100644
--- a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanContainer.tsx
+++ b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanContainer.tsx
@@ -202,7 +202,17 @@ export const KubernetesPlanContainer = (
 
   // Pagination enabled: use new paginated rendering
   return (
-    <Paginate data={plans} key={paginationPrefix} shouldScroll={false}>
+    <Paginate
+      data={plans}
+      key={paginationPrefix}
+      // Prevent Kubernetes plans panel page size changes from being persisted to global PAGE_SIZE storage.
+      // Kubernetes plans panel uses custom page size options (15, 25, 50) which should not override
+      // the standard page size preference (25, 50, 75, 100) used by other tables.
+      noPageSizeOverride={true}
+      // Set default page size to 15 (first option in PLAN_PANEL_PAGE_SIZE_OPTIONS)
+      pageSize={PLAN_PANEL_PAGE_SIZE_OPTIONS[0].value}
+      shouldScroll={false}
+    >
       {({
         count,
         data: paginatedPlans,
diff --git a/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx b/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx
index 39ccc3944fd..c20b39df527 100644
--- a/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx
+++ b/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx
@@ -253,7 +253,17 @@ export const PlanContainer = (props: PlanContainerProps) => {
 
   // Pagination enabled: use new paginated rendering
   return (
-    <Paginate data={plans} key={paginationPrefix} shouldScroll={false}>
+    <Paginate
+      data={plans}
+      key={paginationPrefix}
+      // Prevent plans panel page size changes from being persisted to global PAGE_SIZE storage.
+      // Plans panel uses custom page size options (15, 25, 50) which should not override
+      // the standard page size preference (25, 50, 75, 100) used by other tables.
+      noPageSizeOverride={true}
+      // Set default page size to 15 (first option in PLAN_PANEL_PAGE_SIZE_OPTIONS)
+      pageSize={PLAN_PANEL_PAGE_SIZE_OPTIONS[0].value}
+      shouldScroll={false}
+    >
       {({
         count,
         data: paginatedPlans,

From 81e2a189d6285837963e6a1ca9b770e3ddc9b298 Mon Sep 17 00:00:00 2001
From: grevanak-akamai <145482092+grevanak-akamai@users.noreply.github.com>
Date: Tue, 18 Nov 2025 18:59:46 +0530
Subject: [PATCH 13/91] upcoming:[UIE-9509] - Add tooltip for Rules column
 header in Firewall Rules table (#13090)

* upcoming:[UIE-9509] - Add tooltip for Rules column in Firewall Rules table

* Added changeset: Add tooltip for Rules column header in Firewall Rules table
---
 ...r-13090-upcoming-features-1763045734612.md |  5 ++++
 .../FirewallLanding/FirewallLanding.tsx       | 28 +++++++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13090-upcoming-features-1763045734612.md

diff --git a/packages/manager/.changeset/pr-13090-upcoming-features-1763045734612.md b/packages/manager/.changeset/pr-13090-upcoming-features-1763045734612.md
new file mode 100644
index 00000000000..85af714871c
--- /dev/null
+++ b/packages/manager/.changeset/pr-13090-upcoming-features-1763045734612.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Add tooltip for Rules column header in Firewall Rules table ([#13090](https://github.com/linode/manager/pull/13090))
diff --git a/packages/manager/src/features/Firewalls/FirewallLanding/FirewallLanding.tsx b/packages/manager/src/features/Firewalls/FirewallLanding/FirewallLanding.tsx
index f115b326263..b32df9a0adf 100644
--- a/packages/manager/src/features/Firewalls/FirewallLanding/FirewallLanding.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallLanding/FirewallLanding.tsx
@@ -1,5 +1,12 @@
 import { useFirewallsQuery } from '@linode/queries';
-import { Button, CircleProgress, ErrorState, Hidden } from '@linode/ui';
+import {
+  Button,
+  CircleProgress,
+  ErrorState,
+  Hidden,
+  TooltipIcon,
+  useTheme,
+} from '@linode/ui';
 import { useLocation, useNavigate } from '@tanstack/react-router';
 import * as React from 'react';
 
@@ -21,6 +28,7 @@ import { usePaginationV2 } from 'src/hooks/usePaginationV2';
 import { useSecureVMNoticesEnabled } from 'src/hooks/useSecureVMNoticesEnabled';
 import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
 
+import { useIsFirewallRulesetsPrefixlistsEnabled } from '../shared';
 import { CreateFirewallDrawer } from './CreateFirewallDrawer';
 import { FirewallDialog } from './FirewallDialog';
 import { FirewallLandingEmptyState } from './FirewallLandingEmptyState';
@@ -48,6 +56,7 @@ const FirewallLanding = () => {
     },
     preferenceKey,
   });
+  const theme = useTheme();
 
   const filter = {
     ['+order']: order,
@@ -66,7 +75,11 @@ const FirewallLanding = () => {
   const [isModalOpen, setIsModalOpen] = React.useState<boolean>(false);
   const [dialogMode, setDialogMode] = React.useState<Mode>('enable');
   const [isGenerateDialogOpen, setIsGenerateDialogOpen] = React.useState(false);
+  const { isFirewallRulesetsPrefixlistsEnabled } =
+    useIsFirewallRulesetsPrefixlistsEnabled();
 
+  const rulesColumnTooltipText =
+    'Includes both rules and Rule Sets in the count. Each Rule Set is counted as one rule, regardless of how many rules it contains.';
   const flags = useFlags();
   const { secureVMNoticesEnabled } = useSecureVMNoticesEnabled();
 
@@ -193,7 +206,18 @@ const FirewallLanding = () => {
               Status
             </TableSortCell>
             <Hidden smDown>
-              <TableCell sx={{ width: '15%' }}>Rules</TableCell>
+              <TableCell sx={{ width: '15%' }}>
+                Rules
+                {isFirewallRulesetsPrefixlistsEnabled && (
+                  <TooltipIcon
+                    status="info"
+                    sxTooltipIcon={{
+                      padding: `0 ${theme.spacingFunction(8)} ${theme.spacingFunction(2)} ${theme.spacingFunction(8)}`,
+                    }}
+                    text={rulesColumnTooltipText}
+                  />
+                )}
+              </TableCell>
               <TableCell sx={{ width: '45%' }}>Services</TableCell>
             </Hidden>
             <TableCell sx={{ width: '10%' }} />

From a481f5136017fb0933866e32446bb4f518d182b1 Mon Sep 17 00:00:00 2001
From: Hana Xu <115299789+hana-akamai@users.noreply.github.com>
Date: Tue, 18 Nov 2025 17:32:45 -0500
Subject: [PATCH 14/91] feat: [UIE-9381] - Add region select to Database
 Backups tab (#13097)

* add region select to database backups tab

* remove region radios, use rhf

* move errors to rhf

* clean up

* Added changeset: Region select to Database Backups tab

* Added changeset: Update database restoreWithBackup data to include region

* Added changeset: Update database useRestoreFromBackupMutation data to include region

* clean up DatabaseBackupDialog
---
 .../pr-13097-changed-1763149227691.md         |   5 +
 packages/api-v4/src/databases/databases.ts    |   9 +-
 packages/api-v4/src/databases/types.ts        |   5 +
 .../pr-13097-added-1763149132736.md           |   5 +
 .../DatabaseBackups/DatabaseBackups.style.ts  |  26 +-
 .../DatabaseBackups/DatabaseBackups.tsx       | 323 ++++++++++--------
 .../DatabaseBackups/DatabaseBackupsDialog.tsx |  24 +-
 .../pr-13097-changed-1763149256983.md         |   5 +
 packages/queries/src/databases/databases.ts   |   6 +-
 9 files changed, 254 insertions(+), 154 deletions(-)
 create mode 100644 packages/api-v4/.changeset/pr-13097-changed-1763149227691.md
 create mode 100644 packages/manager/.changeset/pr-13097-added-1763149132736.md
 create mode 100644 packages/queries/.changeset/pr-13097-changed-1763149256983.md

diff --git a/packages/api-v4/.changeset/pr-13097-changed-1763149227691.md b/packages/api-v4/.changeset/pr-13097-changed-1763149227691.md
new file mode 100644
index 00000000000..a64d20f3418
--- /dev/null
+++ b/packages/api-v4/.changeset/pr-13097-changed-1763149227691.md
@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Changed
+---
+
+Update database restoreWithBackup data to include region ([#13097](https://github.com/linode/manager/pull/13097))
diff --git a/packages/api-v4/src/databases/databases.ts b/packages/api-v4/src/databases/databases.ts
index 02f4a5b23ca..181fbb4a0a0 100644
--- a/packages/api-v4/src/databases/databases.ts
+++ b/packages/api-v4/src/databases/databases.ts
@@ -17,10 +17,10 @@ import type {
   CreateDatabasePayload,
   Database,
   DatabaseBackup,
+  DatabaseBackupsPayload,
   DatabaseCredentials,
   DatabaseEngine,
   DatabaseEngineConfig,
-  DatabaseFork,
   DatabaseInstance,
   DatabaseType,
   Engine,
@@ -267,11 +267,14 @@ export const legacyRestoreWithBackup = (
  *
  * Fully restore a backup to the cluster
  */
-export const restoreWithBackup = (engine: Engine, fork: DatabaseFork) =>
+export const restoreWithBackup = (
+  engine: Engine,
+  data: DatabaseBackupsPayload,
+) =>
   Request<Database>(
     setURL(`${API_ROOT}/databases/${encodeURIComponent(engine)}/instances`),
     setMethod('POST'),
-    setData({ fork }),
+    setData(data),
   );
 
 /**
diff --git a/packages/api-v4/src/databases/types.ts b/packages/api-v4/src/databases/types.ts
index 80611783fa2..3a07d9aadf6 100644
--- a/packages/api-v4/src/databases/types.ts
+++ b/packages/api-v4/src/databases/types.ts
@@ -79,6 +79,11 @@ export interface DatabaseFork {
   source: number;
 }
 
+export interface DatabaseBackupsPayload {
+  fork: DatabaseFork;
+  region?: string;
+}
+
 export interface DatabaseCredentials {
   password: string;
   username: string;
diff --git a/packages/manager/.changeset/pr-13097-added-1763149132736.md b/packages/manager/.changeset/pr-13097-added-1763149132736.md
new file mode 100644
index 00000000000..8759fd74af1
--- /dev/null
+++ b/packages/manager/.changeset/pr-13097-added-1763149132736.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Added
+---
+
+Region select to Database Backups tab ([#13097](https://github.com/linode/manager/pull/13097))
diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseBackups/DatabaseBackups.style.ts b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseBackups/DatabaseBackups.style.ts
index d3cf4debf14..d50b9360eb7 100644
--- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseBackups/DatabaseBackups.style.ts
+++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseBackups/DatabaseBackups.style.ts
@@ -1,4 +1,4 @@
-import { Typography } from '@linode/ui';
+import { Stack, Typography } from '@linode/ui';
 import { styled } from '@mui/material/styles';
 import { DateCalendar } from '@mui/x-date-pickers';
 
@@ -36,7 +36,9 @@ export const StyledDateCalendar = styled(DateCalendar, {
   '.MuiYearCalendar-root': {
     width: '260px',
   },
-  marginLeft: '0px',
+  height: 'auto',
+  margin: 0,
+  marginRight: theme.spacingFunction(40),
   width: '260px',
 }));
 
@@ -44,3 +46,23 @@ export const StyledTypography = styled(Typography)(() => ({
   lineHeight: '20px',
   marginTop: '4px',
 }));
+
+export const StyledDateTimeStack = styled(Stack, {
+  label: 'StyledDateTimeStack',
+})(({ theme }) => ({
+  flexDirection: 'row',
+  [theme.breakpoints.down('md')]: {
+    flexDirection: 'column',
+    marginTop: theme.spacingFunction(24),
+    marginBottom: theme.spacingFunction(16),
+  },
+}));
+
+export const StyledRegionStack = styled(Stack, { label: 'StyledRegionStack' })(
+  ({ theme }) => ({
+    [theme.breakpoints.down('md')]: {
+      marginTop: theme.spacingFunction(24),
+      marginBottom: theme.spacingFunction(16),
+    },
+  })
+);
diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseBackups/DatabaseBackups.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseBackups/DatabaseBackups.tsx
index 8565492ed79..deae3d8f4da 100644
--- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseBackups/DatabaseBackups.tsx
+++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseBackups/DatabaseBackups.tsx
@@ -1,4 +1,5 @@
-import { useDatabaseQuery } from '@linode/queries';
+import { useDatabaseQuery, useRegionsQuery } from '@linode/queries';
+import { useIsGeckoEnabled } from '@linode/shared';
 import {
   Box,
   Button,
@@ -14,15 +15,19 @@ import {
   Radio,
   RadioGroup,
 } from '@mui/material';
-import { GridLegacy } from '@mui/material';
 import { LocalizationProvider } from '@mui/x-date-pickers';
 import { AdapterLuxon } from '@mui/x-date-pickers/AdapterLuxon';
 import { useParams } from '@tanstack/react-router';
+import { useFlags } from 'launchdarkly-react-client-sdk';
 import { DateTime } from 'luxon';
 import * as React from 'react';
+import { Controller, FormProvider, useForm, useWatch } from 'react-hook-form';
 
+import { RegionSelect } from 'src/components/RegionSelect/RegionSelect';
 import {
   StyledDateCalendar,
+  StyledDateTimeStack,
+  StyledRegionStack,
   StyledTypography,
 } from 'src/features/Databases/DatabaseDetail/DatabaseBackups/DatabaseBackups.style';
 import {
@@ -38,9 +43,10 @@ import {
   BACKUPS_UNABLE_TO_RESTORE_TEXT,
 } from '../../constants';
 import { useDatabaseDetailContext } from '../DatabaseDetailContext';
-import DatabaseBackupsDialog from './DatabaseBackupsDialog';
+import { DatabaseBackupsDialog } from './DatabaseBackupsDialog';
 import DatabaseBackupsLegacy from './legacy/DatabaseBackupsLegacy';
 
+import type { DatabaseBackupsPayload } from '@linode/api-v4';
 import type { TimeValidationError } from '@mui/x-date-pickers';
 
 export interface TimeOption {
@@ -50,6 +56,11 @@ export interface TimeOption {
 
 export type VersionOption = 'dateTime' | 'newest';
 
+export interface DatabaseBackupsValues extends DatabaseBackupsPayload {
+  date: DateTime | null;
+  time: DateTime | null;
+}
+
 export const DatabaseBackups = () => {
   const { disabled } = useDatabaseDetailContext();
   const { databaseId, engine } = useParams({
@@ -57,13 +68,17 @@ export const DatabaseBackups = () => {
   });
   const { isDatabasesV2GA } = useIsDatabasesEnabled();
 
+  const flags = useFlags();
+  const { isGeckoLAEnabled } = useIsGeckoEnabled(
+    flags.gecko2?.enabled,
+    flags.gecko2?.la
+  );
+  const { data: regionsData } = useRegionsQuery();
+
   const [isRestoreDialogOpen, setIsRestoreDialogOpen] = React.useState(false);
-  const [selectedDate, setSelectedDate] = React.useState<DateTime | null>(null);
-  const [selectedTime, setSelectedTime] = React.useState<DateTime | null>(null);
   const [versionOption, setVersionOption] = React.useState<VersionOption>(
     isDatabasesV2GA ? 'newest' : 'dateTime'
   );
-  const [timePickerError, setTimePickerError] = React.useState<string>('');
 
   const {
     data: database,
@@ -81,10 +96,6 @@ export const DatabaseBackups = () => {
     ? BACKUPS_UNABLE_TO_RESTORE_TEXT
     : '';
 
-  const onRestoreDatabase = () => {
-    setIsRestoreDialogOpen(true);
-  };
-
   /**
    * Check whether date and time are within the valid range of available backups by providing the selected date and time.
    * When the date and time selections are valid, clear any existing error messages for the time picker.
@@ -98,48 +109,38 @@ export const DatabaseBackups = () => {
       );
 
       if (!isSelectedTimeInvalid) {
-        setTimePickerError('');
+        clearErrors('time');
       }
     }
   };
 
   const handleOnError = (error: TimeValidationError) => {
-    if (error) {
-      switch (error) {
-        case 'maxTime':
-          setTimePickerError(BACKUPS_MAX_TIME_EXCEEDED_VALIDATON_TEXT);
-          break;
-        case 'minTime':
-          setTimePickerError(BACKUPS_MIN_TIME_EXCEEDED_VALIDATON_TEXT);
-          break;
-        case 'invalidDate':
-          setSelectedTime(null);
-          setTimePickerError(BACKUPS_INVALID_TIME_VALIDATON_TEXT);
-      }
+    switch (error) {
+      case 'maxTime':
+        setError('time', {
+          message: BACKUPS_MAX_TIME_EXCEEDED_VALIDATON_TEXT,
+        });
+        break;
+      case 'minTime':
+        setError('time', {
+          message: BACKUPS_MIN_TIME_EXCEEDED_VALIDATON_TEXT,
+        });
+        break;
+      case 'invalidDate':
+        setValue('time', null);
+        setError('time', { message: BACKUPS_INVALID_TIME_VALIDATON_TEXT });
     }
   };
 
-  /** Stores changes to the year, month, and day of the DateTime object provided by the calendar */
-  const handleDateChange = (newDate: DateTime) => {
-    validateDateTime(newDate, selectedTime);
-    setSelectedDate(newDate);
-  };
-
-  /** Stores changes to the hours, minutes, and seconds of the DateTime object provided by the time picker */
-  const handleTimeChange = (newTime: DateTime | null) => {
-    validateDateTime(selectedDate, newTime);
-    setSelectedTime(newTime);
-  };
-
   const configureMinTime = () => {
-    const canApplyMinTime = !!oldestBackup && !!selectedDate;
-    const isOnMinDate = selectedDate?.day === oldestBackup?.day;
+    const canApplyMinTime = !!oldestBackup && !!date;
+    const isOnMinDate = date?.day === oldestBackup?.day;
     return canApplyMinTime && isOnMinDate ? oldestBackup : undefined;
   };
 
   const configureMaxTime = () => {
     const today = DateTime.utc();
-    const isOnMaxDate = today.day === selectedDate?.day;
+    const isOnMaxDate = today.day === date?.day;
     return isOnMaxDate ? today : undefined;
   };
 
@@ -148,12 +149,36 @@ export const DatabaseBackups = () => {
     value: VersionOption
   ) => {
     setVersionOption(value);
-    setSelectedDate(null);
-    // Resetting state used for time picker
-    setSelectedTime(null);
-    setTimePickerError('');
+    setValue('date', null);
+    setValue('time', null);
+    clearErrors('time');
   };
 
+  const form = useForm<DatabaseBackupsValues>({
+    defaultValues: {
+      fork: {
+        source: database?.id,
+        restore_time: undefined,
+      },
+      date: null,
+      time: null,
+      region: database?.region,
+    },
+  });
+
+  const {
+    control,
+    setValue,
+    setError,
+    clearErrors,
+    formState: { errors },
+  } = form;
+
+  const [date, time, region] = useWatch({
+    control,
+    name: ['date', 'time', 'region'],
+  });
+
   if (isDefaultDatabase) {
     return (
       <Paper style={{ marginTop: 16 }}>
@@ -183,106 +208,130 @@ export const DatabaseBackups = () => {
         {unableToRestoreCopy && (
           <Notice spacingTop={16} text={unableToRestoreCopy} variant="info" />
         )}
-        {isDatabasesV2GA && (
-          <RadioGroup
-            aria-label="type"
-            name="type"
-            onChange={handleOnVersionOptionChange}
-            value={versionOption}
-          >
-            <FormControlLabel
-              control={<Radio />}
-              data-qa-dbaas-radio="Newest"
-              disabled={disabled}
-              label="Newest full backup plus incremental"
-              value="newest"
-            />
-            <FormControlLabel
-              control={<Radio />}
-              data-qa-dbaas-radio="DateTime"
-              disabled={disabled}
-              label="Specific date & time"
-              value="dateTime"
-            />
-          </RadioGroup>
-        )}
-        <GridLegacy
-          container
-          sx={{
-            justifyContent: 'flex-start',
-            mt: 2,
-          }}
-        >
-          <GridLegacy item lg={3} md={4} xs={12}>
+        <FormProvider {...form}>
+          <form>
+            {isDatabasesV2GA && (
+              <RadioGroup
+                aria-label="type"
+                name="type"
+                onChange={handleOnVersionOptionChange}
+                value={versionOption}
+              >
+                <FormControlLabel
+                  control={<Radio />}
+                  data-qa-dbaas-radio="Newest"
+                  disabled={disabled}
+                  label="Newest full backup plus incremental"
+                  value="newest"
+                />
+                <FormControlLabel
+                  control={<Radio />}
+                  data-qa-dbaas-radio="DateTime"
+                  disabled={disabled}
+                  label="Specific date & time"
+                  value="dateTime"
+                />
+              </RadioGroup>
+            )}
             <Typography variant="h3">Date</Typography>
-            <LocalizationProvider dateAdapter={AdapterLuxon}>
-              <StyledDateCalendar
-                disabled={disabled || versionOption === 'newest'}
-                onChange={handleDateChange}
-                shouldDisableDate={(date) =>
-                  isDateOutsideBackup(date, oldestBackup?.startOf('day'))
-                }
-                value={selectedDate}
+            <StyledDateTimeStack>
+              <Controller
+                control={control}
+                name="date"
+                render={({ field }) => (
+                  <LocalizationProvider dateAdapter={AdapterLuxon}>
+                    <StyledDateCalendar
+                      disabled={disabled || versionOption === 'newest'}
+                      onChange={(newDate: DateTime) => {
+                        validateDateTime(newDate, time);
+                        field.onChange(newDate);
+                      }}
+                      shouldDisableDate={(date) =>
+                        isDateOutsideBackup(date, oldestBackup?.startOf('day'))
+                      }
+                      value={field.value}
+                    />
+                  </LocalizationProvider>
+                )}
+              />
+              <Controller
+                control={control}
+                name="time"
+                render={({ field, fieldState }) => (
+                  <FormControl style={{ marginTop: 0 }}>
+                    <Typography variant="h3">Time (UTC)</Typography>
+                    <TimePicker
+                      disabled={disabled || versionOption === 'newest' || !date}
+                      errorText={
+                        versionOption === 'dateTime' && date
+                          ? fieldState.error?.message
+                          : undefined
+                      }
+                      format="HH:mm:ss"
+                      key={
+                        versionOption === 'dateTime'
+                          ? 'time-picker-active'
+                          : 'time-picker-disabled'
+                      }
+                      label=""
+                      maxTime={configureMaxTime()}
+                      minTime={configureMinTime()}
+                      onChange={(newTime: DateTime) => {
+                        validateDateTime(date, newTime);
+                        field.onChange(newTime);
+                      }}
+                      onError={handleOnError}
+                      sx={{
+                        width: '220px',
+                      }}
+                      timeSteps={{ hours: 1, minutes: 1, seconds: 1 }}
+                      value={field.value}
+                      views={['hours', 'minutes', 'seconds']}
+                    />
+                  </FormControl>
+                )}
+              />
+            </StyledDateTimeStack>
+            <StyledRegionStack>
+              <Controller
+                control={control}
+                name="region"
+                render={({ field, fieldState }) => (
+                  <RegionSelect
+                    currentCapability="Managed Databases"
+                    disableClearable
+                    disabled={disabled}
+                    errorText={fieldState.error?.message}
+                    isGeckoLAEnabled={isGeckoLAEnabled}
+                    onChange={(e, region) => field.onChange(region.id)}
+                    regions={regionsData ?? []}
+                    value={region ?? null}
+                  />
+                )}
               />
-            </LocalizationProvider>
-          </GridLegacy>
-          <GridLegacy item lg={3} md={4} xs={12}>
-            <FormControl style={{ marginTop: 0 }}>
-              <Typography variant="h3">Time (UTC)</Typography>
-              <TimePicker
+            </StyledRegionStack>
+            <Box display="flex" justifyContent="flex-end">
+              <Button
+                buttonType="primary"
+                data-qa-settings-button="restore"
                 disabled={
-                  disabled || versionOption === 'newest' || !selectedDate
+                  versionOption === 'dateTime' &&
+                  (!date || !time || !!errors.time)
                 }
-                errorText={
-                  versionOption === 'dateTime' && selectedDate
-                    ? timePickerError
-                    : undefined
-                }
-                format="HH:mm:ss"
-                key={
-                  versionOption === 'dateTime'
-                    ? 'time-picker-active'
-                    : 'time-picker-disabled'
-                }
-                label=""
-                maxTime={configureMaxTime()}
-                minTime={configureMinTime()}
-                onChange={handleTimeChange}
-                onError={handleOnError}
-                sx={{
-                  width: '220px',
-                }}
-                timeSteps={{ hours: 1, minutes: 1, seconds: 1 }}
-                value={selectedTime}
-                views={['hours', 'minutes', 'seconds']}
+                onClick={() => setIsRestoreDialogOpen(true)}
+              >
+                Restore
+              </Button>
+            </Box>
+            {database && (
+              <DatabaseBackupsDialog
+                database={database}
+                onClose={() => setIsRestoreDialogOpen(false)}
+                open={isRestoreDialogOpen}
               />
-            </FormControl>
-          </GridLegacy>
-        </GridLegacy>
-        <GridLegacy item xs={12}>
-          <Box display="flex" justifyContent="flex-end">
-            <Button
-              buttonType="primary"
-              data-qa-settings-button="restore"
-              disabled={
-                versionOption === 'dateTime' &&
-                (!selectedDate || !selectedTime || !!timePickerError)
-              }
-              onClick={onRestoreDatabase}
-            >
-              Restore
-            </Button>
-          </Box>
-        </GridLegacy>
-        {database && (
-          <DatabaseBackupsDialog
-            database={database}
-            onClose={() => setIsRestoreDialogOpen(false)}
-            open={isRestoreDialogOpen}
-            selectedDate={selectedDate}
-            selectedTime={selectedTime}
-          />
-        )}
+            )}
+          </form>
+        </FormProvider>
       </Paper>
     );
   }
diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseBackups/DatabaseBackupsDialog.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseBackups/DatabaseBackupsDialog.tsx
index 58e1875727a..a1ee61fdb2a 100644
--- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseBackups/DatabaseBackupsDialog.tsx
+++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseBackups/DatabaseBackupsDialog.tsx
@@ -4,34 +4,42 @@ import { useNavigate } from '@tanstack/react-router';
 import { useSnackbar } from 'notistack';
 import * as React from 'react';
 import { useState } from 'react';
+import { useFormContext, useWatch } from 'react-hook-form';
 
 import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
 
 import { toDatabaseFork, toFormattedDate } from '../../utilities';
 
+import type { DatabaseBackupsValues } from './DatabaseBackups';
 import type { Database } from '@linode/api-v4/lib/databases';
 import type { DialogProps } from '@linode/ui';
-import type { DateTime } from 'luxon';
 
 interface Props extends Omit<DialogProps, 'title'> {
   database: Database;
   onClose: () => void;
   open: boolean;
-  selectedDate?: DateTime | null;
-  selectedTime?: DateTime | null;
 }
 
-export const DatabaseBackupDialog = (props: Props) => {
-  const { database, onClose, open, selectedDate, selectedTime } = props;
+export const DatabaseBackupsDialog = (props: Props) => {
+  const { database, onClose, open } = props;
   const navigate = useNavigate();
   const { enqueueSnackbar } = useSnackbar();
   const [isRestoring, setIsRestoring] = useState(false);
 
-  const formattedDate = toFormattedDate(selectedDate, selectedTime);
+  const { control } = useFormContext<DatabaseBackupsValues>();
+  const [date, time, region] = useWatch({
+    control,
+    name: ['date', 'time', 'region'],
+  });
+
+  const formattedDate = toFormattedDate(date, time);
 
   const { error, mutateAsync: restore } = useRestoreFromBackupMutation(
     database.engine,
-    toDatabaseFork(database.id, selectedDate, selectedTime)
+    {
+      fork: toDatabaseFork(database.id, date, time),
+      region,
+    }
   );
 
   const handleRestoreDatabase = () => {
@@ -94,5 +102,3 @@ export const DatabaseBackupDialog = (props: Props) => {
     </Dialog>
   );
 };
-
-export default DatabaseBackupDialog;
diff --git a/packages/queries/.changeset/pr-13097-changed-1763149256983.md b/packages/queries/.changeset/pr-13097-changed-1763149256983.md
new file mode 100644
index 00000000000..4797066c966
--- /dev/null
+++ b/packages/queries/.changeset/pr-13097-changed-1763149256983.md
@@ -0,0 +1,5 @@
+---
+"@linode/queries": Changed
+---
+
+Update database useRestoreFromBackupMutation data to include region ([#13097](https://github.com/linode/manager/pull/13097))
diff --git a/packages/queries/src/databases/databases.ts b/packages/queries/src/databases/databases.ts
index 5686f21e5f5..867ab791ba9 100644
--- a/packages/queries/src/databases/databases.ts
+++ b/packages/queries/src/databases/databases.ts
@@ -25,10 +25,10 @@ import type {
   CreateDatabasePayload,
   Database,
   DatabaseBackup,
+  DatabaseBackupsPayload,
   DatabaseCredentials,
   DatabaseEngine,
   DatabaseEngineConfig,
-  DatabaseFork,
   DatabaseInstance,
   DatabaseType,
   Engine,
@@ -267,11 +267,11 @@ export const useLegacyRestoreFromBackupMutation = (
 
 export const useRestoreFromBackupMutation = (
   engine: Engine,
-  fork: DatabaseFork,
+  data: DatabaseBackupsPayload,
 ) => {
   const queryClient = useQueryClient();
   return useMutation<Database, APIError[]>({
-    mutationFn: () => restoreWithBackup(engine, fork),
+    mutationFn: () => restoreWithBackup(engine, data),
     onSuccess() {
       queryClient.invalidateQueries({
         queryKey: databaseQueries.databases.queryKey,

From b2a852e6ce4d6724700e1d19c1d94fcf3fce5f09 Mon Sep 17 00:00:00 2001
From: venkatmano-akamai <vmangalr@akamai.com>
Date: Wed, 19 Nov 2025 15:14:31 +0530
Subject: [PATCH 15/91] upcoming: [DI-28222] - Scaffolding setup for widget
 level dimension filters and group by issue fix (#13088)

* upcoming: [DI-28222] - Skeletal setup for widget level dimension filters

* upcoming: [DI-28222] - changeset

* upcoming: [DI-28222] - fix types

* upcoming: [DI-28222] - use slot props

* upcoming: [DI-28222] - add comments

* upcoming: [DI-28222] - Scaffolding changes

* upcoming: [DI-28222] - Quick changeset updates
---
 ...r-13088-upcoming-features-1763032920807.md |   5 +
 .../DimensionFilterValue/constants.ts         |  20 ++
 .../useFirewallFetchOptions.ts                |   7 +-
 .../features/CloudPulse/GroupBy/utils.test.ts |  17 +-
 .../src/features/CloudPulse/GroupBy/utils.ts  |  34 +++-
 .../features/CloudPulse/Utils/constants.ts    |   9 +
 .../CloudPulse/Widget/CloudPulseWidget.tsx    |  12 ++
 .../CloudPulseDimensionFilterDrawer.test.tsx  |  64 ++++++
 .../CloudPulseDimensionFilterDrawer.tsx       | 152 ++++++++++++++
 .../CloudPulseDimensionFilterRenderer.tsx     | 186 ++++++++++++++++++
 .../CloudPulseDimensionFiltersSelect.test.tsx |  55 ++++++
 .../CloudPulseDimensionFiltersSelect.tsx      | 107 ++++++++++
 .../CloudPulseFilterIconWithBadge.test.tsx    |  31 +++
 .../CloudPulseFilterIconWithBadge.tsx         |  49 +++++
 .../src/features/CloudPulse/shared/types.ts   |   2 +-
 .../src/queries/cloudpulse/resources.ts       |  11 +-
 16 files changed, 738 insertions(+), 23 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13088-upcoming-features-1763032920807.md
 create mode 100644 packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterDrawer.test.tsx
 create mode 100644 packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterDrawer.tsx
 create mode 100644 packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterRenderer.tsx
 create mode 100644 packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFiltersSelect.test.tsx
 create mode 100644 packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFiltersSelect.tsx
 create mode 100644 packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseFilterIconWithBadge.test.tsx
 create mode 100644 packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseFilterIconWithBadge.tsx

diff --git a/packages/manager/.changeset/pr-13088-upcoming-features-1763032920807.md b/packages/manager/.changeset/pr-13088-upcoming-features-1763032920807.md
new file mode 100644
index 00000000000..7e8f72e9126
--- /dev/null
+++ b/packages/manager/.changeset/pr-13088-upcoming-features-1763032920807.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Scaffolding setup for widget level dimension filters in cloudpulse metrics and group by issue fix in cloudpulse metrics ([#13088](https://github.com/linode/manager/pull/13088))
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/constants.ts b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/constants.ts
index a4350f92b33..146eb7884ad 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/constants.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/constants.ts
@@ -177,6 +177,26 @@ export const valueFieldConfig: ValueFieldConfigMap = {
       inputType: 'text',
     },
   },
+  nodebalancer_id: {
+    eq_neq: {
+      type: 'autocomplete',
+      multiple: false,
+      useCustomFetch: 'firewall',
+    },
+    startswith_endswith: {
+      type: 'textfield',
+      inputType: 'text',
+    },
+    in: {
+      type: 'autocomplete',
+      multiple: true,
+      useCustomFetch: 'firewall',
+    },
+    '*': {
+      type: 'textfield',
+      inputType: 'text',
+    },
+  },
   region_id: {
     eq_neq: {
       type: 'autocomplete',
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/useFirewallFetchOptions.ts b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/useFirewallFetchOptions.ts
index 64d2371e15e..e452d640931 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/useFirewallFetchOptions.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/useFirewallFetchOptions.ts
@@ -33,7 +33,7 @@ export function useFirewallFetchOptions(
     serviceType,
     type,
     scope,
-    associatedEntityType = 'both',
+    associatedEntityType,
   } = props;
 
   const supportedRegionIds =
@@ -115,7 +115,7 @@ export function useFirewallFetchOptions(
     serviceType === 'firewall' &&
       filterLabels.includes(dimensionLabel ?? '') &&
       filteredFirewallParentEntityIds.length > 0 &&
-      (associatedEntityType === 'linode' || associatedEntityType === 'both') &&
+      associatedEntityType === 'linode' &&
       supportedRegionIds?.length > 0
   );
 
@@ -128,8 +128,7 @@ export function useFirewallFetchOptions(
     serviceType === 'firewall' &&
       filterLabels.includes(dimensionLabel ?? '') &&
       filteredFirewallParentEntityIds.length > 0 &&
-      (associatedEntityType === 'nodebalancer' ||
-        associatedEntityType === 'both') &&
+      associatedEntityType === 'nodebalancer' &&
       supportedRegionIds?.length > 0,
     {},
     combinedFilterNodebalancer
diff --git a/packages/manager/src/features/CloudPulse/GroupBy/utils.test.ts b/packages/manager/src/features/CloudPulse/GroupBy/utils.test.ts
index ca1459276e7..e880eaf6d17 100644
--- a/packages/manager/src/features/CloudPulse/GroupBy/utils.test.ts
+++ b/packages/manager/src/features/CloudPulse/GroupBy/utils.test.ts
@@ -9,7 +9,7 @@ import {
   useWidgetDimension,
 } from './utils';
 
-import type { MetricDefinition } from '@linode/api-v4';
+import type { Dashboard, MetricDefinition } from '@linode/api-v4';
 
 const metricDefinitions: MetricDefinition[] = [
   {
@@ -228,13 +228,26 @@ describe('getCommonGroups method test', () => {
 });
 
 describe('getMetricDimensions method test', () => {
+  const dashboard: Dashboard = dashboardFactory.build({
+    widgets: [
+      {
+        metric: 'Metric 1',
+      },
+      {
+        metric: 'Metric 2',
+      },
+      {
+        metric: 'Metric 3',
+      },
+    ],
+  });
   it('should return empty object if metric definitions are empty', () => {
     const result = getMetricDimensions([]);
     expect(result).toEqual({});
   });
 
   it('should return unique dimensions from metric definitions', () => {
-    const result = getMetricDimensions(metricDefinitions);
+    const result = getMetricDimensions(metricDefinitions, dashboard);
     expect(result).toEqual({
       'Metric 1': [
         { label: 'Dim 1', dimension_label: 'Dim 1', values: [] },
diff --git a/packages/manager/src/features/CloudPulse/GroupBy/utils.ts b/packages/manager/src/features/CloudPulse/GroupBy/utils.ts
index df02fdcf110..67706cdf8c1 100644
--- a/packages/manager/src/features/CloudPulse/GroupBy/utils.ts
+++ b/packages/manager/src/features/CloudPulse/GroupBy/utils.ts
@@ -1,9 +1,13 @@
 import { useCloudPulseDashboardByIdQuery } from 'src/queries/cloudpulse/dashboards';
 import { useGetCloudPulseMetricDefinitionsByServiceType } from 'src/queries/cloudpulse/services';
 
+import { ASSOCIATED_ENTITY_METRIC_MAP } from '../Utils/constants';
+import { getAssociatedEntityType } from '../Utils/utils';
+
 import type { GroupByOption } from './CloudPulseGroupByDrawer';
 import type {
   CloudPulseServiceType,
+  Dashboard,
   Dimension,
   MetricDefinition,
 } from '@linode/api-v4';
@@ -54,7 +58,10 @@ export const useGlobalDimensions = (
   if (metricLoading || dashboardLoading) {
     return { options: [], defaultValue: [], isLoading: true };
   }
-  const metricDimensions = getMetricDimensions(metricDefinition?.data ?? []);
+  const metricDimensions = getMetricDimensions(
+    metricDefinition?.data ?? [],
+    dashboard
+  );
   const commonDimensions = [
     defaultOption,
     ...getCommonDimensions(metricDimensions),
@@ -167,14 +174,25 @@ export const useWidgetDimension = (
  * @returns transform dimension object with metric as key and dimensions as value
  */
 export const getMetricDimensions = (
-  metricDefinition: MetricDefinition[]
+  metricDefinition: MetricDefinition[],
+  dashboard?: Dashboard
 ): MetricDimension => {
-  return metricDefinition.reduce((acc, { metric, dimensions }) => {
-    return {
-      ...acc,
-      [metric]: dimensions,
-    };
-  }, {});
+  if (!dashboard) {
+    return {};
+  }
+  const associatedEntityType = getAssociatedEntityType(dashboard.id);
+  return metricDefinition
+    .filter(({ label }) =>
+      associatedEntityType
+        ? label.includes(ASSOCIATED_ENTITY_METRIC_MAP[associatedEntityType]) // we need to filter metrics based on associated entity type for firewall dashboards, can be linode, nodebalancer, etc.
+        : true
+    )
+    .reduce((acc, { metric, dimensions }) => {
+      return {
+        ...acc,
+        [metric]: dimensions,
+      };
+    }, {});
 };
 
 /**
diff --git a/packages/manager/src/features/CloudPulse/Utils/constants.ts b/packages/manager/src/features/CloudPulse/Utils/constants.ts
index 82f9e6b4599..ab081c787eb 100644
--- a/packages/manager/src/features/CloudPulse/Utils/constants.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/constants.ts
@@ -1,3 +1,4 @@
+import type { AssociatedEntityType } from '../shared/types';
 import type { Filter } from '@linode/api-v4';
 
 export const DASHBOARD_ID = 'dashboardId';
@@ -137,3 +138,11 @@ export const RESOURCE_FILTER_MAP: Record<string, Filter> = {
     ...ORDER_BY_LABLE_ASC,
   },
 };
+
+export const ASSOCIATED_ENTITY_METRIC_MAP: Record<
+  AssociatedEntityType,
+  string
+> = {
+  linode: 'Linode',
+  nodebalancer: 'Node Balancer',
+};
diff --git a/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidget.tsx b/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidget.tsx
index f3b72ac2f7e..e401c2876cc 100644
--- a/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidget.tsx
+++ b/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidget.tsx
@@ -25,6 +25,7 @@ import { convertStringToCamelCasesWithSpaces } from '../Utils/utils';
 import { CloudPulseAggregateFunction } from './components/CloudPulseAggregateFunction';
 import { CloudPulseIntervalSelect } from './components/CloudPulseIntervalSelect';
 import { CloudPulseLineGraph } from './components/CloudPulseLineGraph';
+import { CloudPulseDimensionFiltersSelect } from './components/DimensionFilters/CloudPulseDimensionFiltersSelect';
 import { ZoomIcon } from './components/Zoomer';
 
 import type { FilterValueType } from '../Dashboard/CloudPulseDashboardLanding';
@@ -392,6 +393,17 @@ export const CloudPulseWidget = (props: CloudPulseWidgetProperties) => {
                 />
               )}
               <Box sx={{ display: 'flex', gap: 2 }}>
+                {flags.aclp?.showWidgetDimensionFilters && (
+                  <CloudPulseDimensionFiltersSelect // upcoming: Need to pass selected dimensions from widget in upcoming PR
+                    dimensionOptions={availableMetrics?.dimensions ?? []}
+                    drawerLabel={availableMetrics?.label ?? ''}
+                    handleSelectionChange={() => {}}
+                    selectedDimensions={[]}
+                    selectedEntities={entityIds}
+                    selectedRegions={linodeRegion ? [linodeRegion] : undefined}
+                    serviceType={serviceType}
+                  />
+                )}
                 <WidgetFilterGroupByRenderer
                   dashboardId={dashboardId}
                   handleChange={handleGroupByChange}
diff --git a/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterDrawer.test.tsx b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterDrawer.test.tsx
new file mode 100644
index 00000000000..0ccf393455a
--- /dev/null
+++ b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterDrawer.test.tsx
@@ -0,0 +1,64 @@
+import { screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import { CloudPulseDimensionFilterDrawer } from './CloudPulseDimensionFilterDrawer';
+
+describe('CloudPulse dimension filter drawer tests', () => {
+  it('renders the cloud pulse dimension filter drawer successfully', async () => {
+    const handleClose = vi.fn();
+    const handleSelectionChange = vi.fn();
+    renderWithTheme(
+      <CloudPulseDimensionFilterDrawer
+        dimensionOptions={[]}
+        drawerLabel="Test Metric"
+        handleSelectionChange={handleSelectionChange}
+        onClose={handleClose}
+        open
+        serviceType="linode"
+      />
+    );
+
+    const drawerOpen = screen.getByText('Test Metric');
+    expect(drawerOpen).toBeInTheDocument();
+    const selectText = screen.getByText('Select up to 5 filters.');
+    expect(selectText).toBeInTheDocument();
+    await userEvent.click(screen.getByText('Add Filter'));
+    const applyButton = screen.getByText('Apply');
+    expect(applyButton).toBeInTheDocument();
+    const cancelButton = screen.getByText('Cancel');
+    expect(cancelButton).toBeInTheDocument();
+  });
+
+  it('the clear all button in the drawer works correctly', async () => {
+    const handleClose = vi.fn();
+    const handleSelectionChange = vi.fn();
+    const ariaDisabled = 'aria-hidden';
+    renderWithTheme(
+      <CloudPulseDimensionFilterDrawer
+        dimensionOptions={[]}
+        drawerLabel="Test Metric"
+        handleSelectionChange={handleSelectionChange}
+        onClose={handleClose}
+        open
+        serviceType="linode"
+      />
+    );
+
+    const drawerOpen = screen.getByText('Test Metric');
+    expect(drawerOpen).toBeInTheDocument();
+    const selectText = screen.getByText('Select up to 5 filters.');
+    expect(selectText).toBeInTheDocument();
+    expect(screen.getByText('Clear All')).toHaveAttribute(ariaDisabled, 'true'); // nothing is done in form
+    await userEvent.click(screen.getByText('Add Filter'));
+    expect(screen.getByText('Clear All')).toHaveAttribute(
+      ariaDisabled,
+      'false'
+    ); // now we have added one filter field
+    // validate for form fields to be present
+    await userEvent.click(screen.getByText('Clear All'));
+    expect(screen.getByText('Clear All')).toHaveAttribute(ariaDisabled, 'true'); // means the fields are cleared again
+  });
+});
diff --git a/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterDrawer.tsx b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterDrawer.tsx
new file mode 100644
index 00000000000..0db4f2d7921
--- /dev/null
+++ b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterDrawer.tsx
@@ -0,0 +1,152 @@
+import { Button, Drawer, Stack, Typography } from '@linode/ui';
+import React from 'react';
+
+import { CloudPulseDimensionFilterRenderer } from './CloudPulseDimensionFilterRenderer';
+
+import type {
+  MetricsDimensionFilter,
+  MetricsDimensionFilterForm,
+} from './types';
+import type { CloudPulseServiceType, Dimension } from '@linode/api-v4';
+
+interface CloudPulseDimensionFilterDrawerProps {
+  /**
+   * The list of dimensions associated with the selected metric
+   */
+  dimensionOptions: Dimension[];
+  /**
+   * The label for the drawer, typically the name of the metric
+   */
+  drawerLabel: string;
+  /**
+   * @param selectedDimensions The list of selected dimension filters
+   * @param close Property to determine whether to close the drawer after selection
+   */
+  handleSelectionChange: (
+    selectedDimensions: MetricsDimensionFilter[],
+    close: boolean
+  ) => void;
+  /**
+   * The callback to close the drawer
+   */
+  onClose: () => void;
+  /**
+   * The boolean value to control the drawer open state
+   */
+  open: boolean;
+  /**
+   * The selected dimension filters for the metric
+   */
+  selectedDimensions?: MetricsDimensionFilter[];
+
+  /**
+   * The selected entities for the dimension filter
+   */
+  selectedEntities?: string[];
+
+  /**
+   * The selected regions of the associated entities
+   */
+  selectedRegions?: string[];
+
+  /**
+   * The service type of the associated metric
+   */
+  serviceType: CloudPulseServiceType;
+}
+
+export const CloudPulseDimensionFilterDrawer = React.memo(
+  (props: CloudPulseDimensionFilterDrawerProps) => {
+    const {
+      onClose,
+      open,
+      dimensionOptions,
+      selectedDimensions,
+      handleSelectionChange,
+      drawerLabel,
+      selectedEntities,
+      serviceType,
+      selectedRegions,
+    } = props;
+
+    const [clearAllTrigger, setClearAllTrigger] = React.useState(0);
+    const [hideClearAll, setHideClearAll] = React.useState(
+      !selectedDimensions?.length
+    );
+
+    const handleClose = React.useCallback(() => {
+      onClose();
+      setClearAllTrigger(0); // After closing the drawer, reset the clear all trigger
+    }, [onClose]);
+
+    const onDimensionChange = React.useCallback((isDirty: boolean) => {
+      setHideClearAll(!isDirty);
+    }, []);
+
+    const handleFormSubmit = React.useCallback(
+      ({ dimension_filters: dimensionFilters }: MetricsDimensionFilterForm) => {
+        handleSelectionChange(dimensionFilters, true);
+        setClearAllTrigger(0); // After submission, reset the clear all trigger
+      },
+      [handleSelectionChange]
+    );
+
+    return (
+      <Drawer
+        onClose={(_) => handleClose()}
+        open={open}
+        title="Dimension Filters"
+        wide
+      >
+        <Stack gap={1.5}>
+          <Typography
+            data-qa-id="filter-drawer-subtitle"
+            sx={(theme) => ({ marginTop: -2, font: theme.font.normal })}
+            variant="h3"
+          >
+            {drawerLabel}
+          </Typography>
+          <Stack direction="row" justifyContent="space-between">
+            <Typography
+              data-qa-id="filter-drawer-selection-title"
+              sx={(theme) => ({
+                font: theme.font.semibold,
+                marginTop: theme.spacingFunction(12),
+              })}
+            >
+              Select up to 5 filters.
+            </Typography>
+            <Button
+              aria-hidden={hideClearAll}
+              component="a"
+              data-qa-id="filter-drawer-clear-all"
+              onClick={() => {
+                setClearAllTrigger((prev) => prev + 1);
+              }}
+              sx={(theme) => ({
+                padding: 0,
+                font: theme.font.normal,
+                color: theme.textColors.linkActiveLight,
+                display: hideClearAll ? 'none' : 'flex',
+              })}
+              variant="text"
+            >
+              Clear All
+            </Button>
+          </Stack>
+          <CloudPulseDimensionFilterRenderer
+            clearAllTrigger={clearAllTrigger}
+            dimensionOptions={dimensionOptions}
+            onClose={handleClose}
+            onDimensionChange={onDimensionChange}
+            onSubmit={handleFormSubmit}
+            selectedDimensions={selectedDimensions}
+            selectedEntities={selectedEntities}
+            selectedRegions={selectedRegions}
+            serviceType={serviceType}
+          />
+        </Stack>
+      </Drawer>
+    );
+  }
+);
diff --git a/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterRenderer.tsx b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterRenderer.tsx
new file mode 100644
index 00000000000..f4cbc390ce6
--- /dev/null
+++ b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterRenderer.tsx
@@ -0,0 +1,186 @@
+import { yupResolver } from '@hookform/resolvers/yup';
+import { ActionsPanel, Box, Button } from '@linode/ui';
+import React from 'react';
+import {
+  FormProvider,
+  useFieldArray,
+  useForm,
+  useWatch,
+} from 'react-hook-form';
+
+import { metricDimensionFiltersSchema } from './schema';
+
+import type {
+  MetricsDimensionFilter,
+  MetricsDimensionFilterForm,
+} from './types';
+import type { CloudPulseServiceType, Dimension } from '@linode/api-v4';
+
+interface CloudPulseDimensionFilterRendererProps {
+  /**
+   * The clear all trigger to reset the form
+   */
+  clearAllTrigger: number;
+
+  /**
+   * The list of dimensions associated with the selected metric
+   */
+  dimensionOptions: Dimension[];
+  /**
+   * Callback triggered to close the drawer
+   */
+  onClose: () => void;
+
+  /**
+   * Callback to publish any change in form
+   * @param isDirty indicated the changes
+   */
+  onDimensionChange: (isDirty: boolean) => void;
+  /**
+   * Callback triggered on form submission
+   * @param data The form data on submission
+   */
+  onSubmit: (data: MetricsDimensionFilterForm) => void;
+
+  /**
+   * The selected dimension filters for the metric
+   */
+  selectedDimensions?: MetricsDimensionFilter[];
+  /**
+   * The selected entities for the dimension filter
+   */
+  selectedEntities?: string[];
+
+  /**
+   * The selected regions of the associated entities
+   */
+  selectedRegions?: string[];
+
+  /**
+   * The service type of the associated metric
+   */
+  serviceType: CloudPulseServiceType;
+}
+export const CloudPulseDimensionFilterRenderer = React.memo(
+  (props: CloudPulseDimensionFilterRendererProps) => {
+    const {
+      selectedDimensions,
+      onSubmit,
+      clearAllTrigger,
+      onClose,
+      onDimensionChange,
+    } = props;
+
+    const formMethods = useForm<MetricsDimensionFilterForm>({
+      defaultValues: {
+        dimension_filters:
+          selectedDimensions && selectedDimensions.length > 0
+            ? selectedDimensions
+            : [],
+      },
+      mode: 'onBlur',
+      resolver: yupResolver(metricDimensionFiltersSchema),
+    });
+    const { control, handleSubmit, formState, setValue, clearErrors } =
+      formMethods;
+
+    const { isDirty } = formState;
+
+    const formRef = React.useRef<HTMLFormElement>(null);
+    const handleFormSubmit = handleSubmit(async (values) => {
+      onSubmit({
+        dimension_filters: values.dimension_filters,
+      });
+    });
+
+    const { append, fields } = useFieldArray({
+      control,
+      name: 'dimension_filters',
+    });
+
+    const dimensionFilterWatcher = useWatch({
+      control,
+      name: 'dimension_filters',
+    });
+
+    React.useEffect(() => {
+      // set a single empty filter
+      if (clearAllTrigger > 0) {
+        setValue('dimension_filters', [], {
+          shouldDirty: true,
+          shouldValidate: false,
+        });
+        clearErrors('dimension_filters');
+      }
+    }, [clearAllTrigger, clearErrors, setValue]);
+
+    React.useEffect(() => {
+      if (fields.length) {
+        onDimensionChange(true);
+      } else {
+        onDimensionChange(false);
+      }
+    }, [fields, onDimensionChange]);
+
+    return (
+      <FormProvider {...formMethods}>
+        <form onSubmit={handleFormSubmit} ref={formRef}>
+          <Box display="flex" flexDirection="column" gap={1}>
+            {/* upcoming: Integrate with dimension filter row component */}
+            <Button
+              compactX
+              data-qa-buttons="true"
+              data-testid="Add Filter"
+              disabled={
+                dimensionFilterWatcher && dimensionFilterWatcher.length === 5
+              }
+              onClick={() =>
+                append({
+                  dimension_label: null,
+                  operator: null,
+                  value: null,
+                })
+              }
+              size="small"
+              sx={(theme) => ({
+                justifyContent: 'start',
+                width: '160px',
+                height: '20px',
+                fontSize: '16px',
+                marginTop: theme.spacingFunction(12),
+              })}
+            >
+              Add Filter
+            </Button>
+          </Box>
+          <ActionsPanel
+            primaryButtonProps={{
+              label: 'Apply',
+              type: 'submit',
+              disabled:
+                selectedDimensions && selectedDimensions.length > 0 && !isDirty,
+              sx: {
+                width: '65px',
+              },
+            }}
+            secondaryButtonProps={{
+              label: 'Cancel',
+              onClick: () => {
+                onClose();
+              },
+              buttonType: 'outlined',
+              sx: {
+                width: '70px',
+              },
+            }}
+            sx={(theme) => ({
+              display: 'flex',
+              justifyContent: 'flex-end',
+              gap: theme.spacingFunction(12),
+            })}
+          />
+        </form>
+      </FormProvider>
+    );
+  }
+);
diff --git a/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFiltersSelect.test.tsx b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFiltersSelect.test.tsx
new file mode 100644
index 00000000000..60c7f25d0f8
--- /dev/null
+++ b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFiltersSelect.test.tsx
@@ -0,0 +1,55 @@
+import { screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import { CloudPulseDimensionFiltersSelect } from './CloudPulseDimensionFiltersSelect';
+
+import type { Dimension } from '@linode/api-v4';
+
+const dimensionOptions: Dimension[] = [
+  {
+    dimension_label: 'test',
+    values: ['XYZ', 'ZYX', 'YZX'],
+    label: 'Test',
+  },
+  {
+    dimension_label: 'sample',
+    values: ['VALUE1', 'VALUE2', 'VALUE3'],
+    label: 'Sample',
+  },
+];
+
+describe('Tests for CloudPulse Dimension Filters Select', () => {
+  it('renders the CloudPulse Dimension Filters with icon and drawer', async () => {
+    const handleSubmit = vi.fn();
+    renderWithTheme(
+      <CloudPulseDimensionFiltersSelect
+        dimensionOptions={dimensionOptions}
+        drawerLabel="Test Metric"
+        handleSelectionChange={handleSubmit}
+        selectedDimensions={[
+          {
+            dimension_label: 'test',
+            operator: 'eq',
+            value: 'YZX',
+          },
+        ]}
+        serviceType="linode"
+      />
+    );
+    const badge = screen.queryByText('1');
+    expect(badge).toBeInTheDocument(); // should be there since we passed a selected filter
+    await userEvent.click(screen.getByTestId('dimension-filter')); // click on icon
+    // check for drawer fields
+    const drawerOpen = screen.getByText('Test Metric');
+    expect(drawerOpen).toBeInTheDocument();
+    const selectText = screen.getByText('Select up to 5 filters.');
+    expect(selectText).toBeInTheDocument();
+    const applyButton = screen.getByText('Apply');
+    expect(applyButton).toBeInTheDocument();
+    const cancelButton = screen.getByText('Cancel');
+    expect(cancelButton).toBeInTheDocument();
+  });
+});
diff --git a/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFiltersSelect.tsx b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFiltersSelect.tsx
new file mode 100644
index 00000000000..e96bd0abea7
--- /dev/null
+++ b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFiltersSelect.tsx
@@ -0,0 +1,107 @@
+import { IconButton } from '@linode/ui';
+import React from 'react';
+
+import { CloudPulseTooltip } from 'src/features/CloudPulse/shared/CloudPulseTooltip';
+
+import { CloudPulseDimensionFilterDrawer } from './CloudPulseDimensionFilterDrawer';
+import { CloudPulseDimensionFilterIconWithBadge } from './CloudPulseFilterIconWithBadge';
+
+import type { MetricsDimensionFilter } from './types';
+import type { CloudPulseServiceType, Dimension } from '@linode/api-v4';
+
+interface CloudPulseDimensionFiltersSelectProps {
+  /**
+   * The list of available dimensions for the selected metric
+   */
+  dimensionOptions: Dimension[];
+  /**
+   * The label for the drawer, typically the name of the metric
+   */
+  drawerLabel: string;
+  /**
+   * @param selectedDimensions The list of selected dimension filters
+   */
+  handleSelectionChange: (selectedDimensions: MetricsDimensionFilter[]) => void;
+  /**
+   * The selected dimension filters for the metric
+   */
+  selectedDimensions?: MetricsDimensionFilter[];
+
+  /**
+   * The selected entities for the dimension filter
+   */
+  selectedEntities?: string[];
+
+  /**
+   * The selected regions of the associated entities
+   */
+  selectedRegions?: string[];
+
+  /**
+   * The service type of the associated metric
+   */
+  serviceType: CloudPulseServiceType;
+}
+
+export const CloudPulseDimensionFiltersSelect = React.memo(
+  (props: CloudPulseDimensionFiltersSelectProps) => {
+    const {
+      dimensionOptions,
+      selectedDimensions,
+      handleSelectionChange,
+      drawerLabel,
+      selectedEntities,
+      serviceType,
+      selectedRegions,
+    } = props;
+    const [open, setOpen] = React.useState(false);
+
+    const handleChangeInSelection = React.useCallback(
+      (selectedValue: MetricsDimensionFilter[], close: boolean) => {
+        if (close) {
+          handleSelectionChange(selectedValue);
+          setOpen(false);
+        }
+      },
+      [handleSelectionChange]
+    );
+
+    const selectionCount = selectedDimensions?.length ?? 0;
+
+    return (
+      <>
+        <CloudPulseTooltip placement="bottom-end" title="Dimension Filters">
+          <IconButton
+            aria-label="Widget Dimension Filter"
+            color="inherit"
+            data-qa-selected={selectionCount}
+            data-testid="dimension-filter"
+            disabled={!dimensionOptions.length}
+            onClick={() => setOpen(true)}
+            size="small"
+            sx={(theme) => ({
+              marginBlockEnd: 'auto',
+              color: selectionCount
+                ? theme.color.buttonPrimaryHover
+                : 'inherit',
+              padding: 0,
+            })}
+          >
+            <CloudPulseDimensionFilterIconWithBadge count={selectionCount} />
+          </IconButton>
+        </CloudPulseTooltip>
+        <CloudPulseDimensionFilterDrawer
+          dimensionOptions={dimensionOptions}
+          drawerLabel={drawerLabel}
+          handleSelectionChange={handleChangeInSelection}
+          onClose={() => setOpen(false)}
+          open={open}
+          selectedDimensions={selectedDimensions}
+          selectedEntities={selectedEntities}
+          selectedRegions={selectedRegions}
+          serviceType={serviceType}
+        />
+      </>
+    );
+  }
+);
diff --git a/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseFilterIconWithBadge.test.tsx b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseFilterIconWithBadge.test.tsx
new file mode 100644
index 00000000000..64d61c6688e
--- /dev/null
+++ b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseFilterIconWithBadge.test.tsx
@@ -0,0 +1,31 @@
+import { screen } from '@testing-library/react';
+import React from 'react';
+import { describe, expect, it } from 'vitest';
+
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import { CloudPulseDimensionFilterIconWithBadge } from './CloudPulseFilterIconWithBadge';
+
+describe('CloudPulseDimensionFilterIconWithBadge', () => {
+  it('renders the badge with correct count when count > 0', () => {
+    renderWithTheme(<CloudPulseDimensionFilterIconWithBadge count={5} />);
+
+    // Badge content should be visible
+    const badge = screen.getByText('5');
+    expect(badge).toBeInTheDocument();
+
+    const filter = screen.getByTestId('filled-filter');
+    expect(filter).toBeInTheDocument();
+  });
+
+  it('does not render the badge when count = 0', () => {
+    renderWithTheme(<CloudPulseDimensionFilterIconWithBadge count={0} />);
+
+    // Badge should not be visible
+    const badge = screen.queryByText('0');
+    expect(badge).not.toBeInTheDocument();
+
+    const filter = screen.getByTestId('filter');
+    expect(filter).toBeInTheDocument();
+  });
+});
diff --git a/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseFilterIconWithBadge.tsx b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseFilterIconWithBadge.tsx
new file mode 100644
index 00000000000..73ae0d49522
--- /dev/null
+++ b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseFilterIconWithBadge.tsx
@@ -0,0 +1,49 @@
+import Badge from '@mui/material/Badge';
+import React from 'react';
+
+import FilterIcon from 'src/assets/icons/filter.svg';
+import FilledFilterIcon from 'src/assets/icons/filterfilled.svg';
+interface CloudPulseDimensionFilterIconWithBadgeProps {
+  /**
+   * The count to be displayed in the badge
+   */
+  count: number;
+}
+
+export const CloudPulseDimensionFilterIconWithBadge = React.memo(
+  ({ count }: CloudPulseDimensionFilterIconWithBadgeProps) => {
+    return (
+      <Badge
+        anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
+        badgeContent={count}
+        invisible={count === 0}
+        slotProps={{
+          badge: {
+            sx: (theme) => ({
+              top: 3, // nudge up
+              right: 3, // nudge right
+              minWidth: 8,
+              width: 15,
+              height: 16,
+              borderRadius: '100%',
+              fontSize: 10,
+              lineHeight: 1,
+              color: theme.tokens.color.Neutrals.White,
+              backgroundColor: theme.palette.error.dark,
+            }),
+          },
+        }}
+      >
+        {count === 0 ? (
+          <FilterIcon data-testid="filter" height={24} width={24} />
+        ) : (
+          <FilledFilterIcon
+            data-testid="filled-filter"
+            height={24}
+            width={24}
+          />
+        )}
+      </Badge>
+    );
+  }
+);
diff --git a/packages/manager/src/features/CloudPulse/shared/types.ts b/packages/manager/src/features/CloudPulse/shared/types.ts
index 083a65b056d..a81f969298d 100644
--- a/packages/manager/src/features/CloudPulse/shared/types.ts
+++ b/packages/manager/src/features/CloudPulse/shared/types.ts
@@ -9,7 +9,7 @@ export type TransformFunction = (value: string) => string;
 
 export type TransformFunctionMap = Record<TransformKey, TransformFunction>;
 
-export type AssociatedEntityType = 'both' | 'linode' | 'nodebalancer';
+export type AssociatedEntityType = 'linode' | 'nodebalancer';
 
 export interface FirewallEntity {
   /**
diff --git a/packages/manager/src/queries/cloudpulse/resources.ts b/packages/manager/src/queries/cloudpulse/resources.ts
index 0f629381345..1dfbe72d55d 100644
--- a/packages/manager/src/queries/cloudpulse/resources.ts
+++ b/packages/manager/src/queries/cloudpulse/resources.ts
@@ -12,7 +12,7 @@ export const useResourcesQuery = (
   resourceType: string | undefined,
   params?: Params,
   filters?: Filter,
-  associatedEntityType: AssociatedEntityType = 'both',
+  associatedEntityType?: AssociatedEntityType,
   filterFn?: (resources: QueryFunctionType) => QueryFunctionType
 ) =>
   useQuery<any[], unknown, CloudPulseResources[]>({
@@ -30,16 +30,11 @@ export const useResourcesQuery = (
         // handle separately for firewall resource type
         if (resourceType === 'firewall') {
           resource.entities?.forEach((entity: FirewallDeviceEntity) => {
-            if (
-              (entity.type === associatedEntityType ||
-                associatedEntityType === 'both') &&
-              entity.label
-            ) {
+            if (entity.type === associatedEntityType && entity.label) {
               entities[String(entity.id)] = entity.label;
             }
             if (
-              (associatedEntityType === 'linode' ||
-                associatedEntityType === 'both') &&
+              associatedEntityType === 'linode' &&
               entity.type === 'linode_interface' &&
               entity.parent_entity?.label
             ) {

From a69c687eb5055950358ddd6168f36782dadc1dcf Mon Sep 17 00:00:00 2001
From: Harsh Shankar Rao <hrao@akamai.com>
Date: Wed, 19 Nov 2025 15:43:00 +0530
Subject: [PATCH 16/91] upcoming: [UIE-9669] - Implement mocks and factories
 for Network LoadBalancer (#13104)

* upcoming: [UIE-9669] - implement mocks and factories for Network LoadBalancer

* Added changeset:  Implement mocks and factories for Network LoadBalancer

* PR feedback
---
 ...r-13104-upcoming-features-1763472761959.md |  5 ++
 packages/manager/src/factories/account.ts     |  1 +
 packages/manager/src/factories/index.ts       |  1 +
 .../src/factories/networkLoadBalancer.ts      | 43 +++++++++++++
 packages/manager/src/mocks/serverHandlers.ts  | 62 +++++++++++++++++++
 5 files changed, 112 insertions(+)
 create mode 100644 packages/manager/.changeset/pr-13104-upcoming-features-1763472761959.md
 create mode 100644 packages/manager/src/factories/networkLoadBalancer.ts

diff --git a/packages/manager/.changeset/pr-13104-upcoming-features-1763472761959.md b/packages/manager/.changeset/pr-13104-upcoming-features-1763472761959.md
new file mode 100644
index 00000000000..ff43e8785fe
--- /dev/null
+++ b/packages/manager/.changeset/pr-13104-upcoming-features-1763472761959.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+ Implement mocks and factories for Network LoadBalancer ([#13104](https://github.com/linode/manager/pull/13104))
diff --git a/packages/manager/src/factories/account.ts b/packages/manager/src/factories/account.ts
index 50b1d74f529..f463fe6f83c 100644
--- a/packages/manager/src/factories/account.ts
+++ b/packages/manager/src/factories/account.ts
@@ -48,6 +48,7 @@ export const accountFactory = Factory.Sync.makeFactory<Account>({
     'Managed Databases',
     'Managed Databases Beta',
     'NETINT Quadra T1U',
+    'Network LoadBalancer',
     'NodeBalancers',
     'Object Storage Access Key Regions',
     'Object Storage Endpoint Types',
diff --git a/packages/manager/src/factories/index.ts b/packages/manager/src/factories/index.ts
index d075b7f42c7..03dd55cb4cf 100644
--- a/packages/manager/src/factories/index.ts
+++ b/packages/manager/src/factories/index.ts
@@ -33,6 +33,7 @@ export * from './longviewSubscription';
 export * from './longviewTopProcesses';
 export * from './managed';
 export * from './networking';
+export * from './networkLoadBalancer';
 export * from './notification';
 export * from './oauth';
 export * from './objectStorage';
diff --git a/packages/manager/src/factories/networkLoadBalancer.ts b/packages/manager/src/factories/networkLoadBalancer.ts
new file mode 100644
index 00000000000..e404748a6bd
--- /dev/null
+++ b/packages/manager/src/factories/networkLoadBalancer.ts
@@ -0,0 +1,43 @@
+import { Factory } from '@linode/utilities';
+
+import type {
+  NetworkLoadBalancer,
+  NetworkLoadBalancerListener,
+  NetworkLoadBalancerNode,
+} from '@linode/api-v4';
+
+export const networkLoadBalancerFactory =
+  Factory.Sync.makeFactory<NetworkLoadBalancer>({
+    id: Factory.each((id) => id),
+    label: Factory.each((id) => `nlb-${id}`),
+    region: 'us-east',
+    address_v4: '192.168.1.1',
+    address_v6: '2001:db8:85a3::8a2e:370:7334',
+    created: '2023-01-01T00:00:00Z',
+    updated: '2023-01-02T00:00:00Z',
+    status: 'active',
+    last_composite_updated: '',
+    listeners: [],
+  });
+
+export const networkLoadBalancerListenerFactory =
+  Factory.Sync.makeFactory<NetworkLoadBalancerListener>({
+    created: '2023-01-01T00:00:00Z',
+    id: Factory.each((id) => id),
+    label: Factory.each((id) => `nlb-listener-${id}`),
+    updated: '2023-01-01T00:00:00Z',
+    port: 80,
+    protocol: 'tcp',
+  });
+
+export const networkLoadBalancerNodeFactory =
+  Factory.Sync.makeFactory<NetworkLoadBalancerNode>({
+    address_v6: '2001:db8:85a3::8a2e:370:7334',
+    created: '2023-01-01T00:00:00Z',
+    id: Factory.each((id) => id),
+    label: Factory.each((id) => `nlb-node-${id}`),
+    updated: '2023-01-01T00:00:00Z',
+    linode_id: Factory.each((id) => id),
+    weight: 0,
+    weight_updated: '',
+  });
diff --git a/packages/manager/src/mocks/serverHandlers.ts b/packages/manager/src/mocks/serverHandlers.ts
index be460a52f25..d6b182d9091 100644
--- a/packages/manager/src/mocks/serverHandlers.ts
+++ b/packages/manager/src/mocks/serverHandlers.ts
@@ -90,6 +90,9 @@ import {
   managedStatsFactory,
   monitorFactory,
   mysqlConfigResponse,
+  networkLoadBalancerFactory,
+  networkLoadBalancerListenerFactory,
+  networkLoadBalancerNodeFactory,
   nodeBalancerTypeFactory,
   nodePoolFactory,
   notificationChannelFactory,
@@ -536,6 +539,64 @@ const entities = [
   }),
 ];
 
+const netLoadBalancers = [
+  http.get('*/v4beta/netloadbalancers', () => {
+    const nlbWithListener1 = networkLoadBalancerFactory.buildList(5, {
+      listeners: networkLoadBalancerListenerFactory.buildList(
+        Math.floor(Math.random() * 10) + 1
+      ),
+    });
+    const nlbWithListener2 = networkLoadBalancerFactory.buildList(5, {
+      region: 'eu-west',
+      lke_cluster: {
+        id: 1,
+        label: 'lke-e-123',
+        type: 'lkecluster',
+        url: 'v4/lke/clusters/1',
+      },
+      listeners: networkLoadBalancerListenerFactory.buildList(
+        Math.floor(Math.random() * 20) + 1
+      ),
+    });
+    const nlbWithoutListener = networkLoadBalancerFactory.buildList(20);
+    return HttpResponse.json(
+      makeResourcePage([
+        ...nlbWithListener1,
+        ...nlbWithListener2,
+        ...nlbWithoutListener,
+      ])
+    );
+  }),
+  http.get('*/v4beta/netloadbalancers/:id', () => {
+    return HttpResponse.json(
+      networkLoadBalancerFactory.build({
+        lke_cluster: {
+          id: 1,
+          label: 'lke-e-123',
+          type: 'lkecluster',
+          url: 'v4/lke/clusters/1',
+        },
+        listeners: networkLoadBalancerListenerFactory.buildList(
+          Math.floor(Math.random() * 10) + 1
+        ),
+      })
+    );
+  }),
+  http.get('*/v4beta/netloadbalancers/:id/listeners', () => {
+    return HttpResponse.json(
+      makeResourcePage(networkLoadBalancerListenerFactory.buildList(30))
+    );
+  }),
+  http.get('*/v4beta/netloadbalancers/:id/listeners/:listenerId', () => {
+    return HttpResponse.json(networkLoadBalancerListenerFactory.build());
+  }),
+  http.get('*/v4beta/netloadbalancers/:id/listeners/:listenerId/nodes', () => {
+    return HttpResponse.json(
+      makeResourcePage(networkLoadBalancerNodeFactory.buildList(30))
+    );
+  }),
+];
+
 const nanodeType = linodeTypeFactory.build({ id: 'g6-nanode-1' });
 const standardTypes = linodeTypeFactory.buildList(7);
 const dedicatedTypes = dedicatedTypeFactory.buildList(7);
@@ -3999,6 +4060,7 @@ export const handlers = [
   ...databases,
   ...vpc,
   ...entities,
+  ...netLoadBalancers,
   http.get('*/v4beta/maintenance/policies', () => {
     return HttpResponse.json(
       makeResourcePage(maintenancePolicyFactory.buildList(2))

From bb15097d67cc87abf255725ad6fa334ce1114b23 Mon Sep 17 00:00:00 2001
From: Purvesh Makode <pmakode@akamai.com>
Date: Wed, 19 Nov 2025 17:10:27 +0530
Subject: [PATCH 17/91] upcoming: [UIE-9507, UIE-9510] - Add New Firewall
 RuleSet Row Layout + Factories/Mocks (#13079)

* Save progress

* Update tests

* Few more changes

* Add more changes

* Clean up tests

* Few changes

* Layout updates

* Update tests

* Add ruleset loading state

* Clean up mocks

* Fix mocks

* Add comments to the type

* Added changeset: Update FirewallRuleType to support ruleset

* Added changeset: Update FirewallRuleTypeSchema to support ruleset

* Added changeset: Add new Firewall RuleSet row layout

* Update ruleset action text - Delete to Remove

* Move Action column and improve table responsiveness for long labels

* Update Cypress component test

* Revert Action column movement since its not yet confirmed

* Few updates

* Few fixes

* Update cypress component tests
---
 ...r-13079-upcoming-features-1762861826541.md |   5 +
 packages/api-v4/src/firewalls/types.ts        |  16 +-
 ...r-13079-upcoming-features-1762861957439.md |   5 +
 .../firewalls/firewall-rule-table.spec.tsx    |   6 +-
 .../core/firewalls/update-firewall.spec.ts    |   8 +-
 packages/manager/src/factories/firewalls.ts   |  38 ++++-
 .../Rules/FirewallRuleActionMenu.test.tsx     |  30 ++++
 .../Rules/FirewallRuleActionMenu.tsx          |  65 ++++---
 .../Rules/FirewallRuleDrawer.tsx              |   6 +-
 .../Rules/FirewallRuleDrawer.utils.ts         |  10 +-
 .../FirewallDetail/Rules/FirewallRuleForm.tsx |   6 +-
 .../Rules/FirewallRuleTable.tsx               | 160 +++++++++++++-----
 packages/manager/src/mocks/serverHandlers.ts  |  76 ++++++++-
 ...r-13079-upcoming-features-1762861891552.md |   5 +
 packages/validation/src/firewalls.schema.ts   |  31 ++--
 15 files changed, 361 insertions(+), 106 deletions(-)
 create mode 100644 packages/api-v4/.changeset/pr-13079-upcoming-features-1762861826541.md
 create mode 100644 packages/manager/.changeset/pr-13079-upcoming-features-1762861957439.md
 create mode 100644 packages/validation/.changeset/pr-13079-upcoming-features-1762861891552.md

diff --git a/packages/api-v4/.changeset/pr-13079-upcoming-features-1762861826541.md b/packages/api-v4/.changeset/pr-13079-upcoming-features-1762861826541.md
new file mode 100644
index 00000000000..a9fa484079f
--- /dev/null
+++ b/packages/api-v4/.changeset/pr-13079-upcoming-features-1762861826541.md
@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Upcoming Features
+---
+
+Update FirewallRuleType to support ruleset ([#13079](https://github.com/linode/manager/pull/13079))
diff --git a/packages/api-v4/src/firewalls/types.ts b/packages/api-v4/src/firewalls/types.ts
index 372d1f0d616..8e163648cf9 100644
--- a/packages/api-v4/src/firewalls/types.ts
+++ b/packages/api-v4/src/firewalls/types.ts
@@ -36,16 +36,26 @@ export type UpdateFirewallRules = Omit<
 
 export type FirewallTemplateRules = UpdateFirewallRules;
 
+/**
+ * The API may return either a full firewall rule object or a ruleset reference
+ * containing only the `ruleset` field. This interface supports both formats
+ * to ensure backward compatibility with existing implementations and avoid
+ * widespread refactoring.
+ */
 export interface FirewallRuleType {
-  action: FirewallPolicyType;
+  action?: FirewallPolicyType | null;
   addresses?: null | {
     ipv4?: null | string[];
     ipv6?: null | string[];
   };
   description?: null | string;
   label?: null | string;
-  ports?: string;
-  protocol: FirewallRuleProtocol;
+  ports?: null | string;
+  protocol?: FirewallRuleProtocol | null;
+  /**
+   * Present when the object represents a ruleset reference.
+   */
+  ruleset?: null | number;
 }
 
 export interface FirewallDeviceEntity {
diff --git a/packages/manager/.changeset/pr-13079-upcoming-features-1762861957439.md b/packages/manager/.changeset/pr-13079-upcoming-features-1762861957439.md
new file mode 100644
index 00000000000..63b2dd22823
--- /dev/null
+++ b/packages/manager/.changeset/pr-13079-upcoming-features-1762861957439.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Add new Firewall RuleSet row layout ([#13079](https://github.com/linode/manager/pull/13079))
diff --git a/packages/manager/cypress/component/features/firewalls/firewall-rule-table.spec.tsx b/packages/manager/cypress/component/features/firewalls/firewall-rule-table.spec.tsx
index ebbd8f752ee..537f6fccf89 100644
--- a/packages/manager/cypress/component/features/firewalls/firewall-rule-table.spec.tsx
+++ b/packages/manager/cypress/component/features/firewalls/firewall-rule-table.spec.tsx
@@ -122,13 +122,13 @@ const verifyFirewallWithRules = ({
       .within(() => {
         if (isSmallViewport) {
           // Column 'Protocol' is not visible for smaller screens.
-          cy.findByText(rule.protocol).should('not.exist');
+          cy.findByText(rule.protocol!).should('not.exist');
         } else {
-          cy.findByText(rule.protocol).should('be.visible');
+          cy.findByText(rule.protocol!).should('be.visible');
         }
 
         cy.findByText(rule.ports!).should('be.visible');
-        cy.findByText(getRuleActionLabel(rule.action)).should('be.visible');
+        cy.findByText(getRuleActionLabel(rule.action!)).should('be.visible');
       });
   });
 };
diff --git a/packages/manager/cypress/e2e/core/firewalls/update-firewall.spec.ts b/packages/manager/cypress/e2e/core/firewalls/update-firewall.spec.ts
index 60999c917d6..0869a42dddb 100644
--- a/packages/manager/cypress/e2e/core/firewalls/update-firewall.spec.ts
+++ b/packages/manager/cypress/e2e/core/firewalls/update-firewall.spec.ts
@@ -227,9 +227,9 @@ describe('update firewall', () => {
         .should('be.visible')
         .closest('tr')
         .within(() => {
-          cy.findByText(inboundRule.protocol).should('be.visible');
+          cy.findByText(inboundRule.protocol!).should('be.visible');
           cy.findByText(inboundRule.ports!).should('be.visible');
-          cy.findByText(getRuleActionLabel(inboundRule.action)).should(
+          cy.findByText(getRuleActionLabel(inboundRule.action!)).should(
             'be.visible'
           );
         });
@@ -242,9 +242,9 @@ describe('update firewall', () => {
         .should('be.visible')
         .closest('tr')
         .within(() => {
-          cy.findByText(outboundRule.protocol).should('be.visible');
+          cy.findByText(outboundRule.protocol!).should('be.visible');
           cy.findByText(outboundRule.ports!).should('be.visible');
-          cy.findByText(getRuleActionLabel(outboundRule.action)).should(
+          cy.findByText(getRuleActionLabel(outboundRule.action!)).should(
             'be.visible'
           );
         });
diff --git a/packages/manager/src/factories/firewalls.ts b/packages/manager/src/factories/firewalls.ts
index 419ecc21c6f..b77dfedde1e 100644
--- a/packages/manager/src/factories/firewalls.ts
+++ b/packages/manager/src/factories/firewalls.ts
@@ -10,7 +10,11 @@ import {
 } from '@linode/api-v4/lib/firewalls/types';
 import { Factory } from '@linode/utilities';
 
-import type { FirewallDeviceEntity } from '@linode/api-v4/lib/firewalls/types';
+import type {
+  FirewallDeviceEntity,
+  FirewallPrefixList,
+  FirewallRuleSet,
+} from '@linode/api-v4/lib/firewalls/types';
 
 export const firewallRuleFactory = Factory.Sync.makeFactory<FirewallRuleType>({
   action: 'DROP',
@@ -97,3 +101,35 @@ export const firewallSettingsFactory =
       vpc_interface: 1,
     },
   });
+
+export const firewallRuleSetFactory = Factory.Sync.makeFactory<FirewallRuleSet>(
+  {
+    created: '2025-11-05T00:00:00',
+    deleted: null,
+    description: Factory.each((i) => `firewall-ruleset-${i} description`),
+    label: Factory.each((i) => `firewall-ruleset-${i}`),
+    is_service_defined: false,
+    id: Factory.each((i) => i),
+    type: 'inbound',
+    rules: firewallRuleFactory.buildList(3),
+    updated: '2025-11-05T00:00:00',
+    version: 1,
+  }
+);
+
+export const firewallPrefixListFactory =
+  Factory.Sync.makeFactory<FirewallPrefixList>({
+    created: '2025-11-05T00:00:00',
+    updated: '2025-11-05T00:00:00',
+    description: Factory.each((i) => `firewall-prefixlist-${i} description`),
+    id: Factory.each((i) => i),
+    name: Factory.each((i) => `pl:system:resolvers:test-${i}`),
+    version: 1,
+    visibility: 'public',
+    ipv4: Factory.each((i) =>
+      Array.from({ length: 5 }, (_, j) => `139.144.${i}.${j}`)
+    ),
+    ipv6: Factory.each((i) =>
+      Array.from({ length: 5 }, (_, j) => `2600:3c05:e001:bc::${i}${j}`)
+    ),
+  });
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleActionMenu.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleActionMenu.test.tsx
index 3888e665cb8..945ef63c842 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleActionMenu.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleActionMenu.test.tsx
@@ -12,6 +12,7 @@ const props: FirewallRuleActionMenuProps = {
   handleCloneFirewallRule: vi.fn(),
   handleDeleteFirewallRule: vi.fn(),
   handleOpenRuleDrawerForEditing: vi.fn(),
+  isRuleSetRowEnabled: false,
   idx: 1,
 };
 
@@ -25,8 +26,37 @@ describe('Firewall rule action menu', () => {
 
     await userEvent.click(actionMenuButton);
 
+    // "Edit", "Clone" and "Delete" are all visible and enabled
     for (const action of ['Edit', 'Clone', 'Delete']) {
       expect(getByText(action)).toBeVisible();
     }
   });
+
+  it('should include the correct actions when Firewall rules row is a RuleSet', async () => {
+    const { getByText, queryByText, queryByLabelText, findByRole } =
+      renderWithTheme(
+        <FirewallRuleActionMenu {...props} isRuleSetRowEnabled={true} />
+      );
+
+    const actionMenuButton = queryByLabelText(/^Action menu for/)!;
+
+    await userEvent.click(actionMenuButton);
+
+    // "Edit" is visible but disabled, "Clone" is not present, and "Remove" is visible and enabled
+    for (const action of ['Edit', 'Remove']) {
+      expect(getByText(action)).toBeVisible();
+    }
+    expect(queryByText('Clone')).toBeNull();
+
+    expect(getByText('Edit')).toBeDisabled();
+    expect(getByText('Remove')).toBeEnabled();
+
+    // Hover over "Edit" and assert tooltip text
+    const editButton = getByText('Edit');
+    await userEvent.hover(editButton);
+    const tooltip = await findByRole('tooltip');
+    expect(tooltip).toHaveTextContent(
+      'Edit your custom Rule Set\u2019s label, description, or rules, using the API. Rule Sets that are defined by a managed-service can only be updated by service accounts.'
+    );
+  });
 });
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleActionMenu.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleActionMenu.tsx
index 3f3313022a3..0cfecd14a0a 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleActionMenu.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleActionMenu.tsx
@@ -1,3 +1,4 @@
+import { Box } from '@linode/ui';
 import { useTheme } from '@mui/material/styles';
 import useMediaQuery from '@mui/material/useMediaQuery';
 import * as React from 'react';
@@ -13,16 +14,20 @@ import type {
 
 export interface FirewallRuleActionMenuProps extends Partial<ActionMenuProps> {
   disabled: boolean;
-  handleCloneFirewallRule: (idx: number) => void;
+  handleCloneFirewallRule?: (idx: number) => void; // Cloning is NOT applicable in the case of ruleset
   handleDeleteFirewallRule: (idx: number) => void;
-  handleOpenRuleDrawerForEditing: (idx: number) => void;
+  handleOpenRuleDrawerForEditing?: (idx: number) => void; // Editing is NOT applicable in the case of ruleset
   idx: number;
+  isRuleSetRowEnabled: boolean;
 }
 
 export const FirewallRuleActionMenu = React.memo(
   (props: FirewallRuleActionMenuProps) => {
     const theme = useTheme<Theme>();
-    const matchesSmDown = useMediaQuery(theme.breakpoints.down('md'));
+    const matchesLgDown = useMediaQuery(theme.breakpoints.down('lg'));
+
+    const rulesetEditActionToolTipText =
+      'Edit your custom Rule Set\u2019s label, description, or rules, using the API. Rule Sets that are defined by a managed-service can only be updated by service accounts.';
 
     const {
       disabled,
@@ -30,47 +35,57 @@ export const FirewallRuleActionMenu = React.memo(
       handleDeleteFirewallRule,
       handleOpenRuleDrawerForEditing,
       idx,
+      isRuleSetRowEnabled,
       ...actionMenuProps
     } = props;
 
     const actions: Action[] = [
       {
-        disabled,
+        disabled: disabled || isRuleSetRowEnabled,
         onClick: () => {
-          handleOpenRuleDrawerForEditing(idx);
+          handleOpenRuleDrawerForEditing?.(idx);
         },
         title: 'Edit',
+        tooltip: isRuleSetRowEnabled ? rulesetEditActionToolTipText : undefined,
       },
-      {
-        disabled,
-        onClick: () => {
-          handleCloneFirewallRule(idx);
-        },
-        title: 'Clone',
-      },
+      ...(!isRuleSetRowEnabled
+        ? [
+            {
+              disabled,
+              onClick: () => {
+                handleCloneFirewallRule?.(idx);
+              },
+              title: 'Clone',
+            },
+          ]
+        : []),
       {
         disabled,
         onClick: () => {
           handleDeleteFirewallRule(idx);
         },
-        title: 'Delete',
+        title: isRuleSetRowEnabled ? 'Remove' : 'Delete',
       },
     ];
 
     return (
       <>
-        {!matchesSmDown &&
-          actions.map((action) => {
-            return (
-              <InlineMenuAction
-                actionText={action.title}
-                disabled={action.disabled}
-                key={action.title}
-                onClick={action.onClick}
-              />
-            );
-          })}
-        {matchesSmDown && (
+        {!matchesLgDown && (
+          <Box sx={{ display: 'flex', alignItems: 'center' }}>
+            {actions.map((action) => {
+              return (
+                <InlineMenuAction
+                  actionText={action.title}
+                  disabled={action.disabled}
+                  key={action.title}
+                  onClick={action.onClick}
+                  tooltip={action.tooltip}
+                />
+              );
+            })}
+          </Box>
+        )}
+        {matchesLgDown && (
           <ActionMenu
             actionsList={actions}
             ariaLabel={`Action menu for Firewall Rule`}
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
index 1829f4fc21c..fce7f71f829 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
@@ -76,7 +76,7 @@ export const FirewallRuleDrawer = React.memo(
       });
       setIPs(validatedIPs);
 
-      const _ports = itemsToPortString(presetPorts, ports);
+      const _ports = itemsToPortString(presetPorts, ports!);
 
       return {
         ...validateForm({
@@ -94,9 +94,9 @@ export const FirewallRuleDrawer = React.memo(
     };
 
     const onSubmit = (values: FormState) => {
-      const ports = itemsToPortString(presetPorts, values.ports);
+      const ports = itemsToPortString(presetPorts, values.ports!);
       const protocol = values.protocol as FirewallRuleProtocol;
-      const addresses = formValueToIPs(values.addresses, ips);
+      const addresses = formValueToIPs(values.addresses!, ips);
 
       const payload: FirewallRuleType = {
         action: values.action,
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.utils.ts b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.utils.ts
index 25a7c9ac36d..63e046e57a5 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.utils.ts
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.utils.ts
@@ -52,7 +52,7 @@ export const deriveTypeFromValuesAndIPs = (
 
   const predefinedFirewall = predefinedFirewallFromRule({
     action: 'ACCEPT',
-    addresses: formValueToIPs(values.addresses, ips),
+    addresses: formValueToIPs(values.addresses!, ips),
     ports: values.ports,
     protocol,
   });
@@ -60,9 +60,9 @@ export const deriveTypeFromValuesAndIPs = (
   if (predefinedFirewall) {
     return predefinedFirewall;
   } else if (
-    values.protocol?.length > 0 ||
+    (values.protocol && values.protocol?.length > 0) ||
     (values.ports && values.ports?.length > 0) ||
-    values.addresses?.length > 0
+    (values.addresses && values.addresses?.length > 0)
   ) {
     return 'custom';
   }
@@ -163,7 +163,7 @@ export const getInitialFormValues = (
     ports: portStringToItems(ruleToModify.ports)[1],
     protocol: ruleToModify.protocol,
     type: predefinedFirewallFromRule(ruleToModify) || '',
-  };
+  } as FormState;
 };
 
 export const getInitialAddressFormValue = (
@@ -264,7 +264,7 @@ export const itemsToPortString = (
  * and converts it to FirewallOptionItem<string>[] and a custom input string.
  */
 export const portStringToItems = (
-  portString?: string
+  portString?: null | string
 ): [FirewallOptionItem<string>[], string] => {
   // Handle empty input
   if (!portString) {
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx
index 2476c155bfc..26bc0c6db29 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx
@@ -101,7 +101,7 @@ export const FirewallRuleForm = React.memo((props: FirewallRuleFormProps) => {
       if (!touched.label) {
         setFieldValue(
           'label',
-          `${values.action.toLocaleLowerCase()}-${category}-${item?.label}`
+          `${values.action?.toLocaleLowerCase()}-${category}-${item?.label}`
         );
       }
 
@@ -259,7 +259,7 @@ export const FirewallRuleForm = React.memo((props: FirewallRuleFormProps) => {
       />
       <Autocomplete
         autoHighlight
-        disabled={['ICMP', 'IPENCAP'].includes(values.protocol)}
+        disabled={['ICMP', 'IPENCAP'].includes(values.protocol ?? '')}
         disableSelectAll
         errorText={generalPortError}
         label="Ports"
@@ -275,7 +275,7 @@ export const FirewallRuleForm = React.memo((props: FirewallRuleFormProps) => {
           dataAttrs: {
             'data-qa-port-select': true,
           },
-          helperText: ['ICMP', 'IPENCAP'].includes(values.protocol)
+          helperText: ['ICMP', 'IPENCAP'].includes(values.protocol ?? '')
             ? `Ports are not allowed for ${values.protocol} protocols.`
             : undefined,
         }}
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
index 661625a14d8..2999b46c527 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
@@ -14,6 +14,7 @@ import {
   verticalListSortingStrategy,
 } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
+import { useFirewallRuleSetQuery } from '@linode/queries';
 import { Box, LinkButton, Typography } from '@linode/ui';
 import { Autocomplete } from '@linode/ui';
 import { Hidden } from '@linode/ui';
@@ -22,8 +23,11 @@ import { useTheme } from '@mui/material/styles';
 import useMediaQuery from '@mui/material/useMediaQuery';
 import { prop, uniqBy } from 'ramda';
 import * as React from 'react';
+import { makeStyles } from 'tss-react/mui';
 
 import Undo from 'src/assets/icons/undo.svg';
+import { CopyTooltip } from 'src/components/CopyTooltip/CopyTooltip';
+import { Link } from 'src/components/Link';
 import { MaskableText } from 'src/components/MaskableText/MaskableText';
 import { Table } from 'src/components/Table';
 import { TableBody } from 'src/components/TableBody';
@@ -31,10 +35,12 @@ import { TableCell } from 'src/components/TableCell';
 import { TableHead } from 'src/components/TableHead';
 import { TableRow } from 'src/components/TableRow';
 import { TableRowEmpty } from 'src/components/TableRowEmpty/TableRowEmpty';
+import { TableRowLoading } from 'src/components/TableRowLoading/TableRowLoading';
 import {
   generateAddressesLabel,
   generateRuleLabel,
   predefinedFirewallFromRule as ruleToPredefinedFirewall,
+  useIsFirewallRulesetsPrefixlistsEnabled,
 } from 'src/features/Firewalls/shared';
 import { CustomKeyboardSensor } from 'src/utilities/CustomKeyboardSensor';
 
@@ -55,19 +61,21 @@ import type { ExtendedFirewallRule, RuleStatus } from './firewallRuleEditor';
 import type { Category, FirewallRuleError } from './shared';
 import type { DragEndEvent } from '@dnd-kit/core';
 import type { FirewallPolicyType } from '@linode/api-v4/lib/firewalls/types';
+import type { Theme } from '@linode/ui';
 import type { FirewallOptionItem } from 'src/features/Firewalls/shared';
 
 interface RuleRow {
-  action?: string;
-  addresses: string;
+  action?: null | string;
+  addresses?: null | string;
   description?: null | string;
   errors?: FirewallRuleError[];
   id: number;
   index: number;
   label?: null | string;
   originalIndex: number;
-  ports: string;
-  protocol: string;
+  ports?: null | string;
+  protocol?: null | string;
+  ruleset?: null | number;
   status: RuleStatus;
   type: string;
 }
@@ -113,7 +121,6 @@ export const FirewallRuleTable = (props: FirewallRuleTableProps) => {
 
   const theme = useTheme();
   const smDown = useMediaQuery(theme.breakpoints.down('sm'));
-  const mdDown = useMediaQuery(theme.breakpoints.down('md'));
   const lgDown = useMediaQuery(theme.breakpoints.down('lg'));
 
   const addressColumnLabel =
@@ -196,13 +203,7 @@ export const FirewallRuleTable = (props: FirewallRuleTableProps) => {
               <TableRow>
                 <TableCell
                   sx={{
-                    width: smDown
-                      ? '65%'
-                      : mdDown
-                        ? '50%'
-                        : lgDown
-                          ? '32%'
-                          : '26%',
+                    width: smDown ? '65%' : lgDown ? '32%' : '26%',
                   }}
                 >
                   Label
@@ -300,17 +301,34 @@ const FirewallRuleTableRow = React.memo((props: FirewallRuleTableRowProps) => {
     ports,
     protocol,
     status,
+    ruleset,
   } = props;
 
+  const { isFirewallRulesetsPrefixlistsEnabled } =
+    useIsFirewallRulesetsPrefixlistsEnabled();
+
+  const isRuleSetRow = Boolean(ruleset);
+  const isRuleSetRowEnabled =
+    isRuleSetRow && isFirewallRulesetsPrefixlistsEnabled;
+
+  const { data: rulesetDetails, isLoading: isRuleSetLoading } =
+    useFirewallRuleSetQuery(
+      ruleset ?? -1,
+      ruleset !== undefined && isRuleSetRowEnabled
+    );
+
   const actionMenuProps = {
     disabled: status === 'PENDING_DELETION' || disabled,
     handleCloneFirewallRule,
     handleDeleteFirewallRule,
     handleOpenRuleDrawerForEditing,
     idx: index,
+    isRuleSetRowEnabled,
   };
 
   const theme = useTheme();
+  const lgDown = useMediaQuery(theme.breakpoints.down('lg'));
+  const smDown = useMediaQuery(theme.breakpoints.down('sm'));
 
   const {
     active,
@@ -344,6 +362,25 @@ const FirewallRuleTableRow = React.memo((props: FirewallRuleTableRowProps) => {
     zIndex: isDragging ? 9999 : 0,
   } as const;
 
+  const useStyles = makeStyles()((theme: Theme) => ({
+    copyIcon: {
+      '& svg': {
+        height: '1em',
+        width: '1em',
+      },
+      color: theme.palette.primary.main,
+      display: 'inline-block',
+      position: 'relative',
+      marginTop: theme.spacingFunction(2),
+    },
+  }));
+
+  const { classes } = useStyles();
+
+  if (isRuleSetLoading) {
+    return <TableRowLoading columns={smDown ? 3 : lgDown ? 5 : 6} />;
+  }
+
   return (
     <StyledTableRow
       aria-label={label ?? `firewall rule ${id}`}
@@ -357,36 +394,75 @@ const FirewallRuleTableRow = React.memo((props: FirewallRuleTableRowProps) => {
       {...listeners}
       sx={rowStyles}
     >
-      <TableCell aria-label={`Label: ${label}`}>
-        <StyledDragIndicator aria-label="Drag indicator icon" />
-        {label || (
-          <LinkButton
-            disabled={disabled}
-            onClick={() => handleOpenRuleDrawerForEditing(index)}
-          >
-            Add a label
-          </LinkButton>
-        )}
-      </TableCell>
-      <Hidden lgDown>
-        <TableCell aria-label={`Protocol: ${protocol}`}>
-          {protocol}
-          <ConditionalError errors={errors} formField="protocol" />
-        </TableCell>
-      </Hidden>
-      <Hidden smDown>
-        <TableCell aria-label={`Ports: ${ports}`}>
-          {ports === '1-65535' ? 'All Ports' : ports}
-          <ConditionalError errors={errors} formField="ports" />
-        </TableCell>
-        <TableCell aria-label={`Addresses: ${addresses}`}>
-          <MaskableText text={addresses} />
-          <ConditionalError errors={errors} formField="addresses" />
-        </TableCell>
-      </Hidden>
-      <TableCell aria-label={`Action: ${action}`}>
-        {capitalize(action?.toLocaleLowerCase() ?? '')}
-      </TableCell>
+      {!isRuleSetRowEnabled && (
+        <>
+          <TableCell aria-label={`Label: ${label}`}>
+            <StyledDragIndicator aria-label="Drag indicator icon" />
+            {label || (
+              <LinkButton
+                disabled={disabled}
+                onClick={() => handleOpenRuleDrawerForEditing(index)}
+              >
+                Add a label
+              </LinkButton>
+            )}
+          </TableCell>
+          <Hidden lgDown>
+            <TableCell aria-label={`Protocol: ${protocol}`}>
+              {protocol}
+              <ConditionalError errors={errors} formField="protocol" />
+            </TableCell>
+          </Hidden>
+          <Hidden smDown>
+            <TableCell aria-label={`Ports: ${ports}`}>
+              {ports === '1-65535' ? 'All Ports' : ports}
+              <ConditionalError errors={errors} formField="ports" />
+            </TableCell>
+            <TableCell aria-label={`Addresses: ${addresses}`}>
+              <MaskableText text={addresses ?? ''} />
+              <ConditionalError errors={errors} formField="addresses" />
+            </TableCell>
+          </Hidden>
+          <TableCell aria-label={`Action: ${action}`}>
+            {capitalize(action?.toLocaleLowerCase() ?? '')}
+          </TableCell>
+        </>
+      )}
+
+      {isRuleSetRowEnabled && (
+        <>
+          <TableCell aria-label={`Label: ${label}`}>
+            <Box alignItems="center" display="flex" gap={1}>
+              <Box alignItems="center" display="flex">
+                <StyledDragIndicator
+                  aria-label="Drag indicator icon"
+                  sx={{ flexShrink: 0 }}
+                />
+                {rulesetDetails && (
+                  <Link onClick={() => {}}>{rulesetDetails?.label}</Link>
+                )}
+              </Box>
+              <Hidden smDown>
+                <Box
+                  sx={{
+                    alignItems: 'center',
+                    display: 'flex',
+                  }}
+                >
+                  <span>ID:&nbsp;</span>
+                  <span>{ruleset}</span>
+                  <CopyTooltip
+                    className={classes.copyIcon}
+                    text={String(ruleset)}
+                  />
+                </Box>
+              </Hidden>
+            </Box>
+          </TableCell>
+          <TableCell colSpan={smDown ? 0 : lgDown ? 3 : 4} />
+        </>
+      )}
+
       <TableCell>
         <Box sx={{ float: 'right' }}>
           {status !== 'NOT_MODIFIED' ? (
diff --git a/packages/manager/src/mocks/serverHandlers.ts b/packages/manager/src/mocks/serverHandlers.ts
index d6b182d9091..4c98a005962 100644
--- a/packages/manager/src/mocks/serverHandlers.ts
+++ b/packages/manager/src/mocks/serverHandlers.ts
@@ -66,6 +66,10 @@ import {
   firewallFactory,
   firewallMetricDefinitionsResponse,
   firewallMetricRulesFactory,
+  firewallPrefixListFactory,
+  firewallRuleFactory,
+  firewallRuleSetFactory,
+  firewallRulesFactory,
   imageFactory,
   incidentResponseFactory,
   invoiceFactory,
@@ -1300,6 +1304,18 @@ export const handlers = [
           }),
         ],
       }),
+      // Firewall with the Rule and RuleSet Reference
+      firewallFactory.build({
+        id: 1001,
+        label: 'firewall with rule and ruleset reference',
+        rules: firewallRulesFactory.build({
+          inbound: [
+            firewallRuleFactory.build({ ruleset: 123 }), // Referenced Ruleset to the Firewall (ID 123)
+            firewallRuleFactory.build({ ruleset: 123456789 }), // Referenced Ruleset to the Firewall (ID 123456789)
+            ...firewallRuleFactory.buildList(2),
+          ],
+        }),
+      }),
     ];
     firewallFactory.resetSequenceNumber();
     return HttpResponse.json(makeResourcePage(firewalls));
@@ -1308,8 +1324,64 @@ export const handlers = [
     const devices = firewallDeviceFactory.buildList(10);
     return HttpResponse.json(makeResourcePage(devices));
   }),
-  http.get('*/v4beta/networking/firewalls/:firewallId', () => {
-    const firewall = firewallFactory.build();
+  http.get('*/v4beta/networking/firewalls/rulesets', () => {
+    const rulesets = firewallRuleSetFactory.buildList(10);
+    return HttpResponse.json(makeResourcePage(rulesets));
+  }),
+  http.get('*/v4beta/networking/prefixlists', () => {
+    const prefixlists = firewallPrefixListFactory.buildList(10);
+    return HttpResponse.json(makeResourcePage(prefixlists));
+  }),
+  http.get(
+    '*/v4beta/networking/firewalls/rulesets/:rulesetId',
+    ({ params }) => {
+      const getRuleSetDetailById = (rulesetId: number) => {
+        switch (rulesetId) {
+          case 123:
+            // Ruleset with 123 Id
+            return firewallRuleSetFactory.build({
+              id: 123,
+            });
+          case 123456789:
+            // Ruleset with larger ID 123456789 & Longer label with 32 chars
+            return firewallRuleSetFactory.build({
+              id: 123456789,
+              label: 'ruleset-with-a-longer-32ch-label',
+            });
+          default:
+            return firewallRuleSetFactory.build();
+        }
+      };
+      const firewallRuleSet = getRuleSetDetailById(Number(params.rulesetId));
+      return HttpResponse.json(firewallRuleSet);
+    }
+  ),
+  http.get('*/v4beta/networking/firewalls/:firewallId', ({ params }) => {
+    const firewall =
+      params.firewallId === '1001'
+        ? firewallFactory.build({
+            id: 1001,
+            label: 'firewall with rule and ruleset reference',
+            rules: firewallRulesFactory.build({
+              inbound: [
+                firewallRuleFactory.build({ ruleset: 123 }), // Referenced Ruleset to the Firewall (ID 123)
+                firewallRuleFactory.build({ ruleset: 123456789 }), // Referenced Ruleset to the Firewall (ID 123456789)
+                ...firewallRuleFactory.buildList(1, {
+                  addresses: {
+                    ipv4: ['192.168.1.213', '172.31.255.255'],
+                    ipv6: [
+                      '2001:db8:85a3::8a2e:370:7334/128',
+                      '2001:db8:85a3::8a2e:371:7335/128',
+                    ],
+                  },
+                  ports: '22, 53, 80, 100, 443, 3306',
+                  protocol: 'IPENCAP',
+                  action: 'ACCEPT',
+                }),
+              ],
+            }),
+          })
+        : firewallFactory.build();
     return HttpResponse.json(firewall);
   }),
   http.put<{}, { status: FirewallStatus }>(
diff --git a/packages/validation/.changeset/pr-13079-upcoming-features-1762861891552.md b/packages/validation/.changeset/pr-13079-upcoming-features-1762861891552.md
new file mode 100644
index 00000000000..419f08d8ecf
--- /dev/null
+++ b/packages/validation/.changeset/pr-13079-upcoming-features-1762861891552.md
@@ -0,0 +1,5 @@
+---
+"@linode/validation": Upcoming Features
+---
+
+Update FirewallRuleTypeSchema to support ruleset ([#13079](https://github.com/linode/manager/pull/13079))
diff --git a/packages/validation/src/firewalls.schema.ts b/packages/validation/src/firewalls.schema.ts
index efa0489bf8b..db7437dbb83 100644
--- a/packages/validation/src/firewalls.schema.ts
+++ b/packages/validation/src/firewalls.schema.ts
@@ -140,23 +140,23 @@ const validateFirewallPorts = string().test({
 });
 
 export const FirewallRuleTypeSchema = object().shape({
-  action: string().oneOf(['ACCEPT', 'DROP']).required('Action is required'),
+  action: string().oneOf(['ACCEPT', 'DROP']).nullable(),
   description: string().nullable(),
   label: string().nullable(),
-  protocol: string()
-    .oneOf(['ALL', 'TCP', 'UDP', 'ICMP', 'IPENCAP'])
-    .required('Protocol is required.'),
-  ports: string().when('protocol', {
-    is: (val: any) => val !== 'ICMP' && val !== 'IPENCAP',
-    then: () => validateFirewallPorts,
-    // Workaround to get the test to fail if ports is defined when protocol === ICMP or IPENCAP
-    otherwise: (schema) =>
-      schema.test({
-        name: 'protocol',
-        message: 'Ports are not allowed for ICMP and IPENCAP protocols.',
-        test: (value) => typeof value === 'undefined',
-      }),
-  }),
+  protocol: string().oneOf(['ALL', 'TCP', 'UDP', 'ICMP', 'IPENCAP']).nullable(),
+  ports: string()
+    .when('protocol', {
+      is: (val: any) => val !== 'ICMP' && val !== 'IPENCAP',
+      then: () => validateFirewallPorts,
+      // Workaround to get the test to fail if ports is defined when protocol === ICMP or IPENCAP
+      otherwise: (schema) =>
+        schema.test({
+          name: 'protocol',
+          message: 'Ports are not allowed for ICMP and IPENCAP protocols.',
+          test: (value) => typeof value === 'undefined',
+        }),
+    })
+    .nullable(),
   addresses: object()
     .shape({
       ipv4: array().of(ipAddress).nullable(),
@@ -165,6 +165,7 @@ export const FirewallRuleTypeSchema = object().shape({
     .strict(true)
     .notRequired()
     .nullable(),
+  ruleset: number().nullable(),
 });
 
 export const FirewallRuleSchema = object().shape({

From 57def45aed5d7b76a2fd0ef9c16c0f0ccb25ace0 Mon Sep 17 00:00:00 2001
From: tvijay-akamai <51293194+tvijay-akamai@users.noreply.github.com>
Date: Wed, 19 Nov 2025 19:04:45 +0530
Subject: [PATCH 18/91] feat: [UIE-9539] Implemented Filtering for plans table
 (#13093)

* feat: [UIE-9539] Implemented Filtering for plans table

* feat: [UIE-9539] adding changeset

* feat: [UIE-9539] fixing tests

* feat: [UIE-9539] ux enhanancement and addressed code review comments

* feat: [UIE-9539] removed context usage since tabs does not rerender
---
 .../pr-13093-added-1766788494029.md           |   5 +
 .../PaginationFooter/PaginationFooter.tsx     |   8 +-
 .../KubernetesPlanContainer.tsx               | 157 +++++++++++-
 .../KubernetesPlanSelectionTable.tsx          |   7 +
 .../KubernetesPlansPanel.tsx                  |   6 +
 .../PlansPanel/DedicatedPlanFilters.tsx       | 231 ++++++++++++++++++
 .../PlansPanel/PlanContainer.test.tsx         |  43 +++-
 .../components/PlansPanel/PlanContainer.tsx   | 160 +++++++++++-
 .../PlansPanel/PlanSelectionTable.tsx         |   7 +
 .../components/PlansPanel/PlansPanel.tsx      |   6 +
 .../components/PlansPanel/constants.ts        |  47 ++++
 .../features/components/PlansPanel/types.ts   |  11 +
 .../PlansPanel/types/planFilters.ts           | 155 ++++++++++++
 .../PlansPanel/utils/planFilters.test.ts      | 211 ++++++++++++++++
 .../PlansPanel/utils/planFilters.ts           | 207 ++++++++++++++++
 15 files changed, 1240 insertions(+), 21 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13093-added-1766788494029.md
 create mode 100644 packages/manager/src/features/components/PlansPanel/DedicatedPlanFilters.tsx
 create mode 100644 packages/manager/src/features/components/PlansPanel/types/planFilters.ts
 create mode 100644 packages/manager/src/features/components/PlansPanel/utils/planFilters.test.ts
 create mode 100644 packages/manager/src/features/components/PlansPanel/utils/planFilters.ts

diff --git a/packages/manager/.changeset/pr-13093-added-1766788494029.md b/packages/manager/.changeset/pr-13093-added-1766788494029.md
new file mode 100644
index 00000000000..401b517416d
--- /dev/null
+++ b/packages/manager/.changeset/pr-13093-added-1766788494029.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Implement Filtering for Plans table ([#13093](https://github.com/linode/manager/pull/13093))
diff --git a/packages/manager/src/components/PaginationFooter/PaginationFooter.tsx b/packages/manager/src/components/PaginationFooter/PaginationFooter.tsx
index 98796549440..81ef208c458 100644
--- a/packages/manager/src/components/PaginationFooter/PaginationFooter.tsx
+++ b/packages/manager/src/components/PaginationFooter/PaginationFooter.tsx
@@ -26,6 +26,7 @@ interface Props extends PaginationProps {
   customOptions?: PaginationOption[];
   handlePageChange: (page: number) => void;
   handleSizeChange: (pageSize: number) => void;
+  minPageSize?: number;
 }
 
 const baseOptions = [
@@ -43,13 +44,14 @@ export const PaginationFooter = (props: Props) => {
     fixedSize,
     handlePageChange,
     handleSizeChange,
+    minPageSize = MIN_PAGE_SIZE,
     page,
     pageSize,
     showAll,
     sx,
   } = props;
 
-  if (count <= MIN_PAGE_SIZE && !fixedSize) {
+  if (count <= minPageSize && !fixedSize) {
     return null;
   }
 
@@ -103,8 +105,8 @@ export const PaginationFooter = (props: Props) => {
             onChange={(_e, value) => handleSizeChange(Number(value.value))}
             options={finalOptions}
             value={{
-              label: defaultPagination?.label ?? '',
-              value: defaultPagination?.value ?? '',
+              label: defaultPagination?.label ?? finalOptions[0]?.label ?? '',
+              value: defaultPagination?.value ?? finalOptions[0]?.value ?? '',
             }}
           />
         </Box>
diff --git a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanContainer.tsx b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanContainer.tsx
index f15d2c79c98..e17b3c48702 100644
--- a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanContainer.tsx
+++ b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanContainer.tsx
@@ -17,6 +17,57 @@ import type { KubernetesTier, LinodeTypeClass } from '@linode/api-v4';
 import type { PlanSelectionDividers } from 'src/features/components/PlansPanel/PlanContainer';
 import type { PlanWithAvailability } from 'src/features/components/PlansPanel/types';
 
+export interface PlanFilterRenderArgs {
+  /**
+   * Callback to notify parent of filter result
+   */
+  onResult: (result: PlanFilterRenderResult) => void;
+
+  /**
+   * All available plans (unfiltered)
+   */
+  plans: PlanWithAvailability[];
+
+  /**
+   * Plan type/class (e.g., 'dedicated', 'gpu')
+   */
+  planType: LinodeTypeClass | undefined;
+
+  /**
+   * Reset pagination back to the first page
+   */
+  resetPagination: () => void;
+
+  /**
+   * Whether filters should be disabled (e.g., no region selected)
+   */
+  shouldDisableFilters?: boolean;
+}
+
+export interface PlanFilterRenderResult {
+  /**
+   * Optional empty state configuration for the table body
+   */
+  emptyState?: null | {
+    message: string;
+  };
+
+  /**
+   * Filtered plans after applying filters
+   */
+  filteredPlans: PlanWithAvailability[];
+
+  /**
+   * The filter UI component
+   */
+  filterUI: React.ReactNode;
+
+  /**
+   * Whether any filters are currently active
+   */
+  hasActiveFilters: boolean;
+}
+
 export interface KubernetesPlanContainerProps {
   allDisabledPlans: PlanWithAvailability[];
   getTypeCount: (planId: string) => number;
@@ -24,6 +75,13 @@ export interface KubernetesPlanContainerProps {
   hasMajorityOfPlansDisabled: boolean;
   onAdd?: (key: string, value: number) => void;
   onSelect: (key: string) => void;
+
+  /**
+   * Render prop for custom filter UI per tab
+   * Receives plan data and pagination helpers, returns a React element
+   */
+  planFilters?: (args: PlanFilterRenderArgs) => React.ReactNode;
+
   plans: PlanWithAvailability[];
   planType?: LinodeTypeClass;
   selectedId?: string;
@@ -42,6 +100,7 @@ export const KubernetesPlanContainer = (
     onAdd,
     handleConfigurePool,
     onSelect,
+    planFilters,
     planType,
     plans,
     selectedId,
@@ -53,9 +112,6 @@ export const KubernetesPlanContainer = (
   const shouldDisplayNoRegionSelectedMessage = !selectedRegionId;
   const { isGenerationalPlansEnabled } = useIsGenerationalPlansEnabled();
 
-  // Feature gate for pagination functionality
-  const isK8PlanPaginationEnabled = isGenerationalPlansEnabled;
-
   /**
    * This features allows us to divide the GPU plans into two separate tables.
    * This can be re-used for other plan types in the future.
@@ -121,8 +177,74 @@ export const KubernetesPlanContainer = (
     [planType]
   );
 
+  // State to hold filter result from the filter component
+  const [filterResult, setFilterResult] =
+    React.useState<null | PlanFilterRenderResult>(null);
+
+  // Ref to store the pagination handler from Paginate component
+  // This allows us to reset pagination when filters change
+  const handlePageChangeRef = React.useRef<((page: number) => void) | null>(
+    null
+  );
+
+  // Callback for filter component to update result
+  const handleFilterResult = React.useCallback(
+    (result: PlanFilterRenderResult) => {
+      setFilterResult(result);
+    },
+    []
+  );
+
+  // Callback to reset pagination to page 1
+  // Used by filter components when filters change
+  const resetPagination = React.useCallback(() => {
+    // Call the pagination handler to go to page 1
+    handlePageChangeRef.current?.(1);
+  }, []);
+
+  // Create filter state manager component if planFilters render prop is provided
+  // This component returns null but manages filter state via local React state
+  // State persists when switching tabs because Reach UI TabPanels stay mounted
+  // and communicates filtered results back to parent via the onResult callback
+  const filterStateManager = React.useMemo(() => {
+    if (isGenerationalPlansEnabled && planFilters) {
+      return planFilters({
+        onResult: handleFilterResult,
+        planType,
+        plans,
+        resetPagination,
+        shouldDisableFilters: shouldDisplayNoRegionSelectedMessage,
+      });
+    }
+    return null;
+  }, [
+    isGenerationalPlansEnabled,
+    planFilters,
+    planType,
+    plans,
+    handleFilterResult,
+    resetPagination,
+    shouldDisplayNoRegionSelectedMessage,
+  ]);
+
+  // Clear filter result when filters are disabled or removed
+  React.useEffect(() => {
+    if (!planFilters || !isGenerationalPlansEnabled) {
+      setFilterResult(null);
+    }
+  }, [isGenerationalPlansEnabled, planFilters]);
+
+  // Use filtered plans if available, otherwise use all plans
+  const effectiveFilterResult = isGenerationalPlansEnabled
+    ? filterResult
+    : null;
+  const plansToDisplay = effectiveFilterResult?.filteredPlans ?? plans;
+  const tableEmptyState = shouldDisplayNoRegionSelectedMessage
+    ? null
+    : (effectiveFilterResult?.emptyState ?? null);
+
   // Feature gate: if pagination is disabled, render the old way
-  if (!isK8PlanPaginationEnabled) {
+  if (!isGenerationalPlansEnabled) {
     return (
       <Grid container spacing={2}>
         <Hidden mdUp>
@@ -203,7 +325,7 @@ export const KubernetesPlanContainer = (
   // Pagination enabled: use new paginated rendering
   return (
     <Paginate
-      data={plans}
+      data={plansToDisplay}
       key={paginationPrefix}
       // Prevent Kubernetes plans panel page size changes from being persisted to global PAGE_SIZE storage.
       // Kubernetes plans panel uses custom page size options (15, 25, 50) which should not override
@@ -221,9 +343,10 @@ export const KubernetesPlanContainer = (
         pageSize,
         page,
       }) => {
-        const shouldDisplayPagination =
-          !shouldDisplayNoRegionSelectedMessage &&
-          count > PLAN_PANEL_PAGE_SIZE_OPTIONS[0].value;
+        // Store the handlePageChange function in ref so filters can call it
+        handlePageChangeRef.current = handlePageChange;
+
+        const shouldDisplayPagination = !shouldDisplayNoRegionSelectedMessage;
 
         const dividerTables = planSelectionDividers
           .map((divider) => ({
@@ -248,6 +371,13 @@ export const KubernetesPlanContainer = (
         return (
           <>
             <Grid container spacing={2}>
+              {filterStateManager}
+
+              {/* Render filter UI that was passed via callback */}
+              {effectiveFilterResult?.filterUI && (
+                <Grid size={12}>{effectiveFilterResult.filterUI}</Grid>
+              )}
+
               <Hidden mdUp>
                 {shouldDisplayNoRegionSelectedMessage ? (
                   <Notice
@@ -259,6 +389,16 @@ export const KubernetesPlanContainer = (
                     text={PLAN_SELECTION_NO_REGION_SELECTED_MESSAGE}
                     variant="info"
                   />
+                ) : tableEmptyState ? (
+                  <Notice
+                    spacingLeft={8}
+                    spacingTop={8}
+                    sx={(theme) => ({
+                      '& p': { fontSize: theme.tokens.font.FontSize.Xs },
+                    })}
+                    text={tableEmptyState.message}
+                    variant="info"
+                  />
                 ) : hasActiveGpuDivider ? (
                   activeDivider.tables.map(({ filterOptions, plans }, idx) => (
                     <React.Fragment
@@ -301,6 +441,7 @@ export const KubernetesPlanContainer = (
                     )
                   ) : (
                     <KubernetesPlanSelectionTable
+                      filterEmptyStateMessage={tableEmptyState?.message}
                       key={planType ?? 'all'}
                       plans={paginatedPlans}
                       renderPlanSelection={renderPlanSelection}
diff --git a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanSelectionTable.tsx b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanSelectionTable.tsx
index d048630a77e..7135cba2b5d 100644
--- a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanSelectionTable.tsx
+++ b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanSelectionTable.tsx
@@ -13,6 +13,10 @@ import type { PlanSelectionFilterOptionsTable } from 'src/features/components/Pl
 import type { PlanWithAvailability } from 'src/features/components/PlansPanel/types';
 
 interface KubernetesPlanSelectionTableProps {
+  /**
+   * Optional message to display when filters result in no plans
+   */
+  filterEmptyStateMessage?: string;
   filterOptions?: PlanSelectionFilterOptionsTable;
   plans?: PlanWithAvailability[];
   renderPlanSelection?: (plans: PlanWithAvailability[]) => React.JSX.Element[];
@@ -33,6 +37,7 @@ export const KubernetesPlanSelectionTable = (
   props: KubernetesPlanSelectionTableProps
 ) => {
   const {
+    filterEmptyStateMessage,
     filterOptions,
     plans,
     renderPlanSelection,
@@ -79,6 +84,8 @@ export const KubernetesPlanSelectionTable = (
             colSpan={9}
             message={PLAN_SELECTION_NO_REGION_SELECTED_MESSAGE}
           />
+        ) : filterEmptyStateMessage ? (
+          <TableRowEmpty colSpan={9} message={filterEmptyStateMessage} />
         ) : (
           ((plans && renderPlanSelection?.(plans)) ?? null)
         )}
diff --git a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx
index 4d7b7255034..35fdc3e77f8 100644
--- a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx
+++ b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx
@@ -3,6 +3,7 @@ import * as React from 'react';
 import type { JSX } from 'react';
 
 import { TabbedPanel } from 'src/components/TabbedPanel/TabbedPanel';
+import { createDedicatedPlanFiltersRenderProp } from 'src/features/components/PlansPanel/DedicatedPlanFilters';
 import { PlanInformation } from 'src/features/components/PlansPanel/PlanInformation';
 import {
   determineInitialPlanCategoryTab,
@@ -152,6 +153,11 @@ export const KubernetesPlansPanel = (props: Props) => {
                 hasMajorityOfPlansDisabled={hasMajorityOfPlansDisabled}
                 onAdd={onAdd}
                 onSelect={onSelect}
+                planFilters={
+                  plan === 'dedicated'
+                    ? createDedicatedPlanFiltersRenderProp()
+                    : undefined
+                }
                 plans={plansForThisLinodeTypeClass}
                 planType={plan}
                 selectedId={selectedId}
diff --git a/packages/manager/src/features/components/PlansPanel/DedicatedPlanFilters.tsx b/packages/manager/src/features/components/PlansPanel/DedicatedPlanFilters.tsx
new file mode 100644
index 00000000000..a7bc0818739
--- /dev/null
+++ b/packages/manager/src/features/components/PlansPanel/DedicatedPlanFilters.tsx
@@ -0,0 +1,231 @@
+/**
+ * DedicatedPlanFilters Component
+ *
+ * Filter component for Dedicated CPU plans. Composes Select dropdowns and
+ * uses local React state to manage filter selections.
+ *
+ * Note: State persists when switching between plan tabs because Reach UI
+ * TabPanels keep all tabs mounted in the DOM (only visibility changes).
+ */
+
+import { Select } from '@linode/ui';
+import * as React from 'react';
+
+import {
+  PLAN_FILTER_GENERATION_ALL,
+  PLAN_FILTER_GENERATION_G6,
+  PLAN_FILTER_GENERATION_G7,
+  PLAN_FILTER_GENERATION_G8,
+  PLAN_FILTER_TYPE_ALL,
+  PLAN_FILTER_TYPE_COMPUTE_OPTIMIZED,
+  PLAN_FILTER_TYPE_GENERAL_PURPOSE,
+} from './constants';
+import { applyPlanFilters, supportsTypeFiltering } from './utils/planFilters';
+
+import type {
+  PlanFilterRenderArgs,
+  PlanFilterRenderResult,
+} from './PlanContainer';
+import type { PlanWithAvailability } from './types';
+import type { PlanFilterGeneration, PlanFilterType } from './types/planFilters';
+import type { SelectOption } from '@linode/ui';
+
+const GENERATION_OPTIONS: SelectOption<PlanFilterGeneration>[] = [
+  { label: 'All', value: PLAN_FILTER_GENERATION_ALL },
+  { label: 'G8 Dedicated', value: PLAN_FILTER_GENERATION_G8 },
+  { label: 'G7 Dedicated', value: PLAN_FILTER_GENERATION_G7 },
+  { label: 'G6 Dedicated', value: PLAN_FILTER_GENERATION_G6 },
+];
+
+const TYPE_OPTIONS_WITH_SUBTYPES: SelectOption<PlanFilterType>[] = [
+  { label: 'All', value: PLAN_FILTER_TYPE_ALL },
+  { label: 'Compute Optimized', value: PLAN_FILTER_TYPE_COMPUTE_OPTIMIZED },
+  { label: 'General Purpose', value: PLAN_FILTER_TYPE_GENERAL_PURPOSE },
+];
+
+const TYPE_OPTIONS_ALL_ONLY: SelectOption<PlanFilterType>[] = [
+  { label: 'All', value: PLAN_FILTER_TYPE_ALL },
+];
+
+interface DedicatedPlanFiltersComponentProps {
+  disabled?: boolean;
+  onResult: (result: PlanFilterRenderResult) => void;
+  plans: PlanWithAvailability[];
+  resetPagination: () => void;
+}
+
+const DedicatedPlanFiltersComponent = React.memo(
+  (props: DedicatedPlanFiltersComponentProps) => {
+    const { disabled = false, onResult, plans, resetPagination } = props;
+
+    // Local state - persists automatically because component stays mounted
+    const [generation, setGeneration] = React.useState<PlanFilterGeneration>(
+      PLAN_FILTER_GENERATION_ALL
+    );
+
+    const [type, setType] =
+      React.useState<PlanFilterType>(PLAN_FILTER_TYPE_ALL);
+
+    const typeFilteringSupported = supportsTypeFiltering(generation);
+
+    const typeOptions = typeFilteringSupported
+      ? TYPE_OPTIONS_WITH_SUBTYPES
+      : TYPE_OPTIONS_ALL_ONLY;
+
+    // Disable type filter if:
+    // 1. Panel is disabled, OR
+    // 2. Selected generation doesn't support type filtering (G7, G6, All)
+    const isTypeSelectDisabled = disabled || !typeFilteringSupported;
+
+    // Track previous filters to detect changes for pagination reset
+    const previousFilters = React.useRef<null | {
+      generation: PlanFilterGeneration;
+      type: PlanFilterType;
+    }>(null);
+
+    // Reset pagination when filters change (but not on initial mount)
+    React.useEffect(() => {
+      // Skip pagination reset on initial mount
+      if (previousFilters.current === null) {
+        previousFilters.current = { generation, type };
+        return;
+      }
+
+      const { generation: prevGeneration, type: prevType } =
+        previousFilters.current;
+
+      if (prevGeneration !== generation || prevType !== type) {
+        resetPagination();
+      }
+
+      previousFilters.current = { generation, type };
+    }, [generation, resetPagination, type]);
+
+    const handleGenerationChange = React.useCallback(
+      (
+        _event: React.SyntheticEvent,
+        option: null | SelectOption<number | string>
+      ) => {
+        // When clearing, default to "All" instead of undefined
+        const newGeneration =
+          (option?.value as PlanFilterGeneration | undefined) ??
+          PLAN_FILTER_GENERATION_ALL;
+        setGeneration(newGeneration);
+
+        // Reset type filter when generation changes
+        setType(PLAN_FILTER_TYPE_ALL);
+      },
+      []
+    );
+
+    const handleTypeChange = React.useCallback(
+      (
+        _event: React.SyntheticEvent,
+        option: null | SelectOption<number | string>
+      ) => {
+        setType(
+          (option?.value as PlanFilterType | undefined) ?? PLAN_FILTER_TYPE_ALL
+        );
+      },
+      []
+    );
+
+    const filteredPlans = React.useMemo(() => {
+      const normalizedType = typeFilteringSupported
+        ? type
+        : PLAN_FILTER_TYPE_ALL;
+      return applyPlanFilters(plans, generation, normalizedType);
+    }, [generation, plans, type, typeFilteringSupported]);
+
+    const selectedGenerationOption = React.useMemo(() => {
+      return GENERATION_OPTIONS.find((opt) => opt.value === generation) ?? null;
+    }, [generation]);
+
+    const selectedTypeOption = React.useMemo(() => {
+      const displayType = typeFilteringSupported ? type : PLAN_FILTER_TYPE_ALL;
+      return typeOptions.find((opt) => opt.value === displayType) ?? null;
+    }, [type, typeFilteringSupported, typeOptions]);
+
+    const result = React.useMemo<PlanFilterRenderResult>(() => {
+      const filterUI = (
+        <div
+          style={{
+            alignItems: 'flex-end',
+            display: 'flex',
+            flexWrap: 'wrap',
+            gap: '19px',
+            marginBottom: 16,
+          }}
+        >
+          <Select
+            aria-labelledby="plan-filter-generation-label"
+            clearable
+            data-testid="plan-filter-generation"
+            disabled={disabled}
+            id="plan-filter-generation"
+            label="Dedicated Plans"
+            onChange={handleGenerationChange}
+            options={GENERATION_OPTIONS}
+            placeholder="Select a plan"
+            sx={{ width: 446 }}
+            value={selectedGenerationOption}
+          />
+
+          <Select
+            aria-labelledby="plan-filter-type-label"
+            clearable
+            data-testid="plan-filter-type"
+            disabled={isTypeSelectDisabled}
+            id="plan-filter-type"
+            label="Types"
+            onChange={handleTypeChange}
+            options={typeOptions}
+            sx={{ width: 207 }}
+            value={selectedTypeOption}
+          />
+        </div>
+      );
+
+      return {
+        filteredPlans,
+        filterUI,
+        hasActiveFilters: generation !== PLAN_FILTER_GENERATION_ALL,
+      };
+    }, [
+      disabled,
+      filteredPlans,
+      generation,
+      handleGenerationChange,
+      handleTypeChange,
+      isTypeSelectDisabled,
+      selectedGenerationOption,
+      selectedTypeOption,
+      typeOptions,
+    ]);
+
+    // Notify parent component whenever filter result changes
+    React.useEffect(() => {
+      onResult(result);
+    }, [onResult, result]);
+
+    return null;
+  }
+);
+
+DedicatedPlanFiltersComponent.displayName = 'DedicatedPlanFiltersComponent';
+
+export const createDedicatedPlanFiltersRenderProp = () => {
+  return ({
+    onResult,
+    plans,
+    resetPagination,
+    shouldDisableFilters = false,
+  }: PlanFilterRenderArgs): React.ReactNode => (
+    <DedicatedPlanFiltersComponent
+      disabled={shouldDisableFilters}
+      onResult={onResult}
+      plans={plans}
+      resetPagination={resetPagination}
+    />
+  );
+};
diff --git a/packages/manager/src/features/components/PlansPanel/PlanContainer.test.tsx b/packages/manager/src/features/components/PlansPanel/PlanContainer.test.tsx
index e9f8c440cc3..5d31d312c76 100644
--- a/packages/manager/src/features/components/PlansPanel/PlanContainer.test.tsx
+++ b/packages/manager/src/features/components/PlansPanel/PlanContainer.test.tsx
@@ -5,10 +5,21 @@ import { PLAN_SELECTION_NO_REGION_SELECTED_MESSAGE } from 'src/utilities/pricing
 import { renderWithTheme } from 'src/utilities/testHelpers';
 import { mockMatchMedia } from 'src/utilities/testHelpers';
 
-import { PlanContainer } from './PlanContainer';
+import { PLAN_FILTER_NO_RESULTS_MESSAGE } from './constants';
+import { PlanContainer, type PlanFilterRenderArgs } from './PlanContainer';
 
 import type { PlanWithAvailability } from './types';
 
+const queryMocks = vi.hoisted(() => ({
+  useIsGenerationalPlansEnabled: vi.fn(() => ({
+    isGenerationalPlansEnabled: true,
+  })),
+}));
+
+vi.mock('src/utilities/linodes', () => ({
+  useIsGenerationalPlansEnabled: queryMocks.useIsGenerationalPlansEnabled,
+}));
+
 const mockPlans: PlanWithAvailability[] = planSelectionTypeFactory.buildList(2);
 
 beforeAll(() => mockMatchMedia());
@@ -27,4 +38,34 @@ describe('PlanContainer', () => {
 
     expect(getByText(PLAN_SELECTION_NO_REGION_SELECTED_MESSAGE)).toBeVisible();
   });
+
+  it('shows the no plans found message when filters return empty results', async () => {
+    let hasSentResult = false;
+
+    const planFilters = ({ onResult }: PlanFilterRenderArgs) => {
+      if (!hasSentResult) {
+        hasSentResult = true;
+        onResult({
+          filteredPlans: [],
+          filterUI: <div>Filter UI</div>,
+          hasActiveFilters: true,
+        });
+      }
+
+      return null;
+    };
+
+    const { findByText } = renderWithTheme(
+      <PlanContainer
+        allDisabledPlans={[]}
+        hasMajorityOfPlansDisabled={false}
+        onSelect={() => {}}
+        planFilters={planFilters}
+        plans={mockPlans}
+        selectedRegionId="us-east"
+      />
+    );
+
+    expect(await findByText(PLAN_FILTER_NO_RESULTS_MESSAGE)).toBeVisible();
+  });
 });
diff --git a/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx b/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx
index c20b39df527..fe283fcf920 100644
--- a/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx
+++ b/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx
@@ -10,7 +10,10 @@ import { useFlags } from 'src/hooks/useFlags';
 import { useIsGenerationalPlansEnabled } from 'src/utilities/linodes';
 import { PLAN_SELECTION_NO_REGION_SELECTED_MESSAGE } from 'src/utilities/pricing/constants';
 
-import { PLAN_PANEL_PAGE_SIZE_OPTIONS } from './constants';
+import {
+  PLAN_FILTER_NO_RESULTS_MESSAGE,
+  PLAN_PANEL_PAGE_SIZE_OPTIONS,
+} from './constants';
 import { PlanSelection } from './PlanSelection';
 import { PlanSelectionTable } from './PlanSelectionTable';
 
@@ -29,6 +32,50 @@ export interface PlanSelectionDividers {
   tables: PlanSelectionFilterOptionsTable[];
 }
 
+export interface PlanFilterRenderArgs {
+  /**
+   * Callback to notify parent of filter result
+   */
+  onResult: (result: PlanFilterRenderResult) => void;
+
+  /**
+   * All available plans (unfiltered)
+   */
+  plans: PlanWithAvailability[];
+
+  /**
+   * Plan type/class (e.g., 'dedicated', 'gpu')
+   */
+  planType: LinodeTypeClass | undefined;
+
+  /**
+   * Reset pagination back to the first page
+   */
+  resetPagination: () => void;
+
+  /**
+   * Whether filters should be disabled (e.g., no region selected)
+   */
+  shouldDisableFilters?: boolean;
+}
+
+export interface PlanFilterRenderResult {
+  /**
+   * Filtered plans after applying filters
+   */
+  filteredPlans: PlanWithAvailability[];
+
+  /**
+   * The filter UI component
+   */
+  filterUI: React.ReactNode;
+
+  /**
+   * Whether any filters are currently active
+   */
+  hasActiveFilters: boolean;
+}
+
 export interface PlanContainerProps {
   allDisabledPlans: PlanWithAvailability[];
   currentPlanHeading?: string;
@@ -36,6 +83,13 @@ export interface PlanContainerProps {
   isCreate?: boolean;
   linodeID?: number | undefined;
   onSelect: (key: string) => void;
+
+  /**
+   * Render prop for custom filter UI per tab
+   * Receives plan data and pagination helpers, returns a React element
+   */
+  planFilters?: (args: PlanFilterRenderArgs) => React.ReactNode;
+
   plans: PlanWithAvailability[];
   planType?: LinodeTypeClass;
   selectedDiskSize?: number;
@@ -52,6 +106,7 @@ export const PlanContainer = (props: PlanContainerProps) => {
     isCreate,
     linodeID,
     onSelect,
+    planFilters,
     planType,
     plans,
     selectedId,
@@ -63,9 +118,6 @@ export const PlanContainer = (props: PlanContainerProps) => {
   const flags = useFlags();
   const { isGenerationalPlansEnabled } = useIsGenerationalPlansEnabled();
 
-  // Feature gate for pagination functionality
-  const isPlanPaginationEnabled = isGenerationalPlansEnabled;
-
   // Show the Transfer column if, for any plan, the api returned data and we're not in the Database Create flow
   const showTransfer =
     showLimits &&
@@ -155,8 +207,78 @@ export const PlanContainer = (props: PlanContainerProps) => {
     [planType]
   );
 
+  // State to hold filter result from the filter component
+  const [filterResult, setFilterResult] =
+    React.useState<null | PlanFilterRenderResult>(null);
+
+  // Ref to store the pagination handler from Paginate component
+  // This allows us to reset pagination when filters change
+  const handlePageChangeRef = React.useRef<((page: number) => void) | null>(
+    null
+  );
+
+  // Callback for filter component to update result
+  const handleFilterResult = React.useCallback(
+    (result: PlanFilterRenderResult) => {
+      setFilterResult(result);
+    },
+    []
+  );
+
+  // Callback to reset pagination to page 1
+  // Used by filter components when filters change
+  const resetPagination = React.useCallback(() => {
+    // Call the pagination handler to go to page 1
+    handlePageChangeRef.current?.(1);
+  }, []);
+
+  // Create filter state manager component if planFilters render prop is provided
+  // This component returns null but manages filter state via local React state
+  // State persists when switching tabs because Reach UI TabPanels stay mounted
+  // and communicates filtered results back to parent via the onResult callback
+  const filterStateManager = React.useMemo(() => {
+    if (isGenerationalPlansEnabled && planFilters) {
+      return planFilters({
+        onResult: handleFilterResult,
+        planType,
+        plans,
+        resetPagination,
+        shouldDisableFilters: shouldDisplayNoRegionSelectedMessage,
+      });
+    }
+    return null;
+  }, [
+    isGenerationalPlansEnabled,
+    planFilters,
+    planType,
+    plans,
+    handleFilterResult,
+    resetPagination,
+    shouldDisplayNoRegionSelectedMessage,
+  ]);
+
+  // Clear filter result when filters are disabled or removed
+  React.useEffect(() => {
+    if (!planFilters || !isGenerationalPlansEnabled) {
+      setFilterResult(null);
+    }
+  }, [isGenerationalPlansEnabled, planFilters]);
+
+  // Use filtered plans if available, otherwise use all plans
+  const effectiveFilterResult = isGenerationalPlansEnabled
+    ? filterResult
+    : null;
+  const plansToDisplay = effectiveFilterResult?.filteredPlans ?? plans;
+
+  // Automatically show empty state message when filters return no results
+  const tableEmptyState = shouldDisplayNoRegionSelectedMessage
+    ? null
+    : plansToDisplay.length === 0
+      ? { message: PLAN_FILTER_NO_RESULTS_MESSAGE }
+      : null;
+
   // Feature gate: if pagination is disabled, render the old way
-  if (!isPlanPaginationEnabled) {
+  if (!isGenerationalPlansEnabled) {
     return (
       <Grid container spacing={2}>
         <Hidden lgUp={isCreate} mdUp={!isCreate}>
@@ -254,7 +376,7 @@ export const PlanContainer = (props: PlanContainerProps) => {
   // Pagination enabled: use new paginated rendering
   return (
     <Paginate
-      data={plans}
+      data={plansToDisplay}
       key={paginationPrefix}
       // Prevent plans panel page size changes from being persisted to global PAGE_SIZE storage.
       // Plans panel uses custom page size options (15, 25, 50) which should not override
@@ -272,13 +394,21 @@ export const PlanContainer = (props: PlanContainerProps) => {
         page,
         pageSize,
       }) => {
-        const shouldDisplayPagination =
-          !shouldDisplayNoRegionSelectedMessage &&
-          count > PLAN_PANEL_PAGE_SIZE_OPTIONS[0].value;
+        // Store the handlePageChange function in ref so filters can call it
+        handlePageChangeRef.current = handlePageChange;
+
+        const shouldDisplayPagination = !shouldDisplayNoRegionSelectedMessage;
 
         return (
           <>
             <Grid container spacing={2}>
+              {filterStateManager}
+
+              {/* Render filter UI that was passed via callback */}
+              {effectiveFilterResult?.filterUI && (
+                <Grid size={12}>{effectiveFilterResult.filterUI}</Grid>
+              )}
+
               <Hidden lgUp={isCreate} mdUp={!isCreate}>
                 {isCreate && isDatabaseGA && (
                   <Typography
@@ -302,6 +432,16 @@ export const PlanContainer = (props: PlanContainerProps) => {
                     text={PLAN_SELECTION_NO_REGION_SELECTED_MESSAGE}
                     variant="info"
                   />
+                ) : tableEmptyState ? (
+                  <Notice
+                    spacingLeft={8}
+                    spacingTop={8}
+                    sx={(theme) => ({
+                      '& p': { fontSize: theme.tokens.font.FontSize.Xs },
+                    })}
+                    text={tableEmptyState.message}
+                    variant="info"
+                  />
                 ) : (
                   planSelectionDividers.map((planSelectionDivider) =>
                     planType === planSelectionDivider.planType
@@ -356,6 +496,7 @@ export const PlanContainer = (props: PlanContainerProps) => {
                       })
                     ) : (
                       <PlanSelectionTable
+                        filterEmptyStateMessage={tableEmptyState?.message}
                         key={planType}
                         plans={paginatedPlans}
                         planType={planType}
@@ -380,6 +521,7 @@ export const PlanContainer = (props: PlanContainerProps) => {
                 customOptions={PLAN_PANEL_PAGE_SIZE_OPTIONS}
                 handlePageChange={handlePageChange}
                 handleSizeChange={handlePageSizeChange}
+                minPageSize={PLAN_PANEL_PAGE_SIZE_OPTIONS[0].value}
                 page={page}
                 pageSize={pageSize}
                 sx={{
diff --git a/packages/manager/src/features/components/PlansPanel/PlanSelectionTable.tsx b/packages/manager/src/features/components/PlansPanel/PlanSelectionTable.tsx
index fbad4b69c45..289bb7b4ceb 100644
--- a/packages/manager/src/features/components/PlansPanel/PlanSelectionTable.tsx
+++ b/packages/manager/src/features/components/PlansPanel/PlanSelectionTable.tsx
@@ -18,6 +18,7 @@ import type { LinodeTypeClass } from '@linode/api-v4/';
 import type { TooltipIconStatus } from '@linode/ui';
 
 interface PlanSelectionTableProps {
+  filterEmptyStateMessage?: string;
   filterOptions?: PlanSelectionFilterOptionsTable;
   plans?: PlanWithAvailability[];
   planType?: LinodeTypeClass;
@@ -47,6 +48,7 @@ const tableCells = [
 
 export const PlanSelectionTable = (props: PlanSelectionTableProps) => {
   const {
+    filterEmptyStateMessage,
     filterOptions,
     planType,
     plans,
@@ -164,6 +166,11 @@ export const PlanSelectionTable = (props: PlanSelectionTableProps) => {
             colSpan={tableCells.length}
             message={PLAN_SELECTION_NO_REGION_SELECTED_MESSAGE}
           />
+        ) : filterEmptyStateMessage ? (
+          <TableRowEmpty
+            colSpan={tableCells.length}
+            message={filterEmptyStateMessage}
+          />
         ) : (
           ((plans && renderPlanSelection?.(plans)) ?? null)
         )}
diff --git a/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx b/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx
index 7b1491c52ff..fdce685c336 100644
--- a/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx
+++ b/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx
@@ -15,6 +15,7 @@ import {
 import { TabbedPanel } from 'src/components/TabbedPanel/TabbedPanel';
 import { useFlags } from 'src/hooks/useFlags';
 
+import { createDedicatedPlanFiltersRenderProp } from './DedicatedPlanFilters';
 import { DistributedRegionPlanTable } from './DistributedRegionPlanTable';
 import { PlanContainer } from './PlanContainer';
 import { PlanInformation } from './PlanInformation';
@@ -223,6 +224,11 @@ export const PlansPanel = (props: PlansPanelProps) => {
                 isCreate={isCreate}
                 linodeID={linodeID}
                 onSelect={onSelect}
+                planFilters={
+                  plan === 'dedicated'
+                    ? createDedicatedPlanFiltersRenderProp()
+                    : undefined
+                }
                 plans={plansForThisLinodeTypeClass}
                 planType={plan}
                 selectedId={selectedId}
diff --git a/packages/manager/src/features/components/PlansPanel/constants.ts b/packages/manager/src/features/components/PlansPanel/constants.ts
index 24cf0350d08..f2eb165b686 100644
--- a/packages/manager/src/features/components/PlansPanel/constants.ts
+++ b/packages/manager/src/features/components/PlansPanel/constants.ts
@@ -41,6 +41,53 @@ export const PLAN_PANEL_PAGE_SIZE_OPTIONS = [
 // List of plan types that belong to the MTC plan group.
 export const MTC_AVAILABLE_PLAN_TYPES = ['g8-premium-128-ht'];
 
+// ============================================================================
+// Plan Filter Constants
+// ============================================================================
+
+export const PLAN_FILTER_NO_RESULTS_MESSAGE = 'No plans found.';
+
+// G8 Dedicated CPU Plans - Compute Optimized (1:2 RAM:CPU ratio)
+export const G8_DEDICATED_COMPUTE_OPTIMIZED_SLUGS = [
+  'g8-dedicated-4-2', // 4 GB RAM, 2 CPUs
+  'g8-dedicated-8-4', // 8 GB RAM, 4 CPUs
+  'g8-dedicated-16-8', // 16 GB RAM, 8 CPUs
+  'g8-dedicated-32-16', // 32 GB RAM, 16 CPUs
+  'g8-dedicated-64-32', // 64 GB RAM, 32 CPUs
+  'g8-dedicated-96-48', // 96 GB RAM, 48 CPUs
+  'g8-dedicated-128-64', // 128 GB RAM, 64 CPUs
+  'g8-dedicated-256-128', // 256 GB RAM, 128 CPUs
+  'g8-dedicated-512-256', // 512 GB RAM, 256 CPUs
+] as const;
+
+// G8 Dedicated CPU Plans - General Purpose (1:4 RAM:CPU ratio)
+export const G8_DEDICATED_GENERAL_PURPOSE_SLUGS = [
+  'g8-dedicated-8-2', // 8 GB RAM, 2 CPUs
+  'g8-dedicated-16-4', // 16 GB RAM, 4 CPUs
+  'g8-dedicated-32-8', // 32 GB RAM, 8 CPUs
+  'g8-dedicated-64-16', // 64 GB RAM, 16 CPUs
+  'g8-dedicated-96-24', // 96 GB RAM, 24 CPUs
+  'g8-dedicated-128-32', // 128 GB RAM, 32 CPUs
+  'g8-dedicated-256-64', // 256 GB RAM, 64 CPUs
+  'g8-dedicated-512-128', // 512 GB RAM, 128 CPUs
+] as const;
+
+// Combined G8 plans (All)
+export const G8_DEDICATED_ALL_SLUGS = [
+  ...G8_DEDICATED_COMPUTE_OPTIMIZED_SLUGS,
+  ...G8_DEDICATED_GENERAL_PURPOSE_SLUGS,
+] as const;
+
+// Filter option values
+export const PLAN_FILTER_GENERATION_ALL = 'all';
+export const PLAN_FILTER_GENERATION_G8 = 'g8';
+export const PLAN_FILTER_GENERATION_G7 = 'g7';
+export const PLAN_FILTER_GENERATION_G6 = 'g6';
+
+export const PLAN_FILTER_TYPE_ALL = 'all';
+export const PLAN_FILTER_TYPE_COMPUTE_OPTIMIZED = 'compute-optimized';
+export const PLAN_FILTER_TYPE_GENERAL_PURPOSE = 'general-purpose';
+
 export const DEDICATED_512_GB_PLAN: ExtendedType = {
   accelerated_devices: 0,
   addons: {
diff --git a/packages/manager/src/features/components/PlansPanel/types.ts b/packages/manager/src/features/components/PlansPanel/types.ts
index c0ce049a18d..4b41b9a9632 100644
--- a/packages/manager/src/features/components/PlansPanel/types.ts
+++ b/packages/manager/src/features/components/PlansPanel/types.ts
@@ -41,3 +41,14 @@ export interface PlanSelectionAvailabilityTypes {
 export interface DisabledTooltipReasons extends PlanSelectionAvailabilityTypes {
   wholePanelIsDisabled?: boolean;
 }
+
+export type {
+  FilterDropdownConfig,
+  FilterOption,
+  FilterPlansByGenerationFn,
+  FilterPlansByTypeFn,
+  PlanFilterGeneration,
+  PlanFilterResult,
+  PlanFilterState,
+  PlanFilterType,
+} from './types/planFilters';
diff --git a/packages/manager/src/features/components/PlansPanel/types/planFilters.ts b/packages/manager/src/features/components/PlansPanel/types/planFilters.ts
new file mode 100644
index 00000000000..06de06e9855
--- /dev/null
+++ b/packages/manager/src/features/components/PlansPanel/types/planFilters.ts
@@ -0,0 +1,155 @@
+/**
+ * Plan Filter Types
+ *
+ * This file contains TypeScript types and interfaces for the plan filtering system.
+ * Filters allow users to narrow down plans by generation (G8/G7/G6) and type (Compute Optimized/General Purpose).
+ */
+
+import type { PlanWithAvailability } from '../types';
+
+// ============================================================================
+// Filter Value Types
+// ============================================================================
+
+/**
+ * Available plan generations for Dedicated CPU filtering
+ */
+export type PlanFilterGeneration = 'all' | 'g6' | 'g7' | 'g8';
+
+/**
+ * Available plan types for filtering within a generation
+ */
+export type PlanFilterType = 'all' | 'compute-optimized' | 'general-purpose';
+
+// ============================================================================
+// Filter State
+// ============================================================================
+
+/**
+ * Current state of plan filters
+ */
+export interface PlanFilterState {
+  /**
+   * Selected generation (e.g., "g8", "g7", "g6")
+   */
+  generation?: PlanFilterGeneration;
+
+  /**
+   * Selected type within the generation (e.g., "compute-optimized", "general-purpose", "all")
+   */
+  type?: PlanFilterType;
+}
+
+// ============================================================================
+// Filter Options
+// ============================================================================
+
+/**
+ * A single filter option for dropdowns
+ */
+export interface FilterOption<T = string> {
+  /**
+   * Whether this option should be disabled
+   */
+  disabled?: boolean;
+
+  /**
+   * Display label for the option
+   */
+  label: string;
+
+  /**
+   * Underlying value for the option
+   */
+  value: T;
+}
+
+/**
+ * Configuration for a filter dropdown
+ */
+export interface FilterDropdownConfig<T = string> {
+  /**
+   * Whether the dropdown is disabled
+   */
+  disabled?: boolean;
+
+  /**
+   * Label displayed above the dropdown
+   */
+  label: string;
+
+  /**
+   * Callback when selection changes
+   */
+  onChange: (value: T | undefined) => void;
+
+  /**
+   * Available options for this dropdown
+   */
+  options: FilterOption<T>[];
+
+  /**
+   * Placeholder text when no option is selected
+   */
+  placeholder: string;
+
+  /**
+   * Currently selected value
+   */
+  value?: T;
+
+  /**
+   * Width of the dropdown in pixels
+   */
+  width?: number;
+}
+
+// ============================================================================
+// Filter Result
+// ============================================================================
+
+/**
+ * Result of applying filters to a list of plans
+ */
+export interface PlanFilterResult {
+  /**
+   * Total number of plans after filtering
+   */
+  count: number;
+
+  /**
+   * Whether filters are currently active
+   */
+  hasActiveFilters: boolean;
+
+  /**
+   * Whether the filter state results in no plans (empty state)
+   */
+  isEmpty: boolean;
+
+  /**
+   * Filtered list of plans
+   */
+  plans: PlanWithAvailability[];
+}
+
+// ============================================================================
+// Filter Functions
+// ============================================================================
+
+/**
+ * Function type for filtering plans by generation
+ */
+export type FilterPlansByGenerationFn = (
+  plans: PlanWithAvailability[],
+  generation: PlanFilterGeneration
+) => PlanWithAvailability[];
+
+/**
+ * Function type for filtering plans by type within a generation
+ */
+export type FilterPlansByTypeFn = (
+  plans: PlanWithAvailability[],
+  generation: PlanFilterGeneration,
+  type: PlanFilterType
+) => PlanWithAvailability[];
diff --git a/packages/manager/src/features/components/PlansPanel/utils/planFilters.test.ts b/packages/manager/src/features/components/PlansPanel/utils/planFilters.test.ts
new file mode 100644
index 00000000000..c6672f0fd64
--- /dev/null
+++ b/packages/manager/src/features/components/PlansPanel/utils/planFilters.test.ts
@@ -0,0 +1,211 @@
+import { planSelectionTypeFactory } from 'src/factories/types';
+
+import {
+  PLAN_FILTER_TYPE_ALL,
+  PLAN_FILTER_TYPE_COMPUTE_OPTIMIZED,
+  PLAN_FILTER_TYPE_GENERAL_PURPOSE,
+} from '../constants';
+import {
+  applyPlanFilters,
+  filterPlansByGeneration,
+  filterPlansByType,
+  getAvailableTypes,
+  supportsTypeFiltering,
+} from './planFilters';
+
+describe('planFilters utilities', () => {
+  const createPlan = (
+    overrides: Partial<ReturnType<typeof planSelectionTypeFactory.build>>
+  ) => planSelectionTypeFactory.build(overrides);
+
+  const g8ComputePlan = createPlan({
+    id: 'g8-dedicated-8-4',
+    label: 'Dedicated G8 Compute Optimized',
+  });
+
+  const g8GeneralPlan = createPlan({
+    id: 'g8-dedicated-16-4',
+    label: 'Dedicated G8 General Purpose',
+  });
+
+  const g7DedicatedPlan = createPlan({
+    id: 'g7-dedicated-16-8',
+    label: 'Dedicated G7 Plan',
+  });
+
+  const g7PremiumPlan = createPlan({
+    id: 'g7-premium-64-32',
+    label: 'Premium G7 Plan',
+  });
+
+  const g6Plan = createPlan({
+    id: 'g6-dedicated-16-8',
+    label: 'Dedicated G6 Plan',
+  });
+
+  const rogueG8Plan = createPlan({
+    id: 'g8-dedicated-99-999',
+    label: 'Unlisted G8 Plan',
+  });
+
+  describe('filterPlansByGeneration', () => {
+    it('returns only G8 plans that exist in the allow-list', () => {
+      const result = filterPlansByGeneration(
+        [g8ComputePlan, g8GeneralPlan, rogueG8Plan, g7DedicatedPlan],
+        'g8'
+      );
+
+      expect(result).toEqual([g8ComputePlan, g8GeneralPlan]);
+    });
+
+    it('returns all G7 plans based on prefix matching', () => {
+      const result = filterPlansByGeneration(
+        [g7DedicatedPlan, g7PremiumPlan, g8ComputePlan],
+        'g7'
+      );
+
+      expect(result).toEqual([g7DedicatedPlan, g7PremiumPlan]);
+    });
+
+    it('returns all G6 plans based on prefix matching', () => {
+      const result = filterPlansByGeneration(
+        [g6Plan, g7PremiumPlan, g8ComputePlan],
+        'g6'
+      );
+
+      expect(result).toEqual([g6Plan]);
+    });
+
+    it('returns all dedicated plans (G6, G7, G8) when generation is "all"', () => {
+      const result = filterPlansByGeneration(
+        [g8ComputePlan, g8GeneralPlan, g7DedicatedPlan, g7PremiumPlan, g6Plan],
+        'all'
+      );
+
+      expect(result).toEqual([
+        g8ComputePlan,
+        g8GeneralPlan,
+        g7DedicatedPlan,
+        g7PremiumPlan,
+        g6Plan,
+      ]);
+    });
+  });
+
+  describe('filterPlansByType', () => {
+    it('returns all plans when type is "all"', () => {
+      const result = filterPlansByType(
+        [g8ComputePlan, g8GeneralPlan],
+        'g8',
+        PLAN_FILTER_TYPE_ALL
+      );
+
+      expect(result).toEqual([g8ComputePlan, g8GeneralPlan]);
+    });
+
+    it('returns compute optimized plans for G8', () => {
+      const result = filterPlansByType(
+        [g8ComputePlan, g8GeneralPlan],
+        'g8',
+        PLAN_FILTER_TYPE_COMPUTE_OPTIMIZED
+      );
+
+      expect(result).toEqual([g8ComputePlan]);
+    });
+
+    it('returns general purpose plans for G8', () => {
+      const result = filterPlansByType(
+        [g8ComputePlan, g8GeneralPlan],
+        'g8',
+        PLAN_FILTER_TYPE_GENERAL_PURPOSE
+      );
+
+      expect(result).toEqual([g8GeneralPlan]);
+    });
+
+    it('ignores type filtering for G7, G6, and "all" generation', () => {
+      const resultG7 = filterPlansByType(
+        [g7DedicatedPlan],
+        'g7',
+        PLAN_FILTER_TYPE_COMPUTE_OPTIMIZED
+      );
+      const resultG6 = filterPlansByType(
+        [g6Plan],
+        'g6',
+        PLAN_FILTER_TYPE_GENERAL_PURPOSE
+      );
+      const resultAll = filterPlansByType(
+        [g8ComputePlan, g8GeneralPlan],
+        'all',
+        PLAN_FILTER_TYPE_COMPUTE_OPTIMIZED
+      );
+
+      expect(resultG7).toEqual([g7DedicatedPlan]);
+      expect(resultG6).toEqual([g6Plan]);
+      expect(resultAll).toEqual([g8ComputePlan, g8GeneralPlan]);
+    });
+  });
+
+  describe('applyPlanFilters', () => {
+    it('returns an empty array when no generation is selected', () => {
+      const result = applyPlanFilters(
+        [g8ComputePlan, g8GeneralPlan],
+        undefined,
+        PLAN_FILTER_TYPE_ALL
+      );
+
+      expect(result).toEqual([]);
+    });
+
+    it('applies both generation and type filters', () => {
+      const result = applyPlanFilters(
+        [g8ComputePlan, g8GeneralPlan, g7DedicatedPlan, g7PremiumPlan, g6Plan],
+        'g8',
+        PLAN_FILTER_TYPE_GENERAL_PURPOSE
+      );
+
+      expect(result).toEqual([g8GeneralPlan]);
+    });
+
+    it('returns all dedicated plans when generation is "all"', () => {
+      const result = applyPlanFilters(
+        [g8ComputePlan, g8GeneralPlan, g7DedicatedPlan, g7PremiumPlan, g6Plan],
+        'all',
+        PLAN_FILTER_TYPE_ALL
+      );
+
+      expect(result).toEqual([
+        g8ComputePlan,
+        g8GeneralPlan,
+        g7DedicatedPlan,
+        g7PremiumPlan,
+        g6Plan,
+      ]);
+    });
+  });
+
+  describe('supportsTypeFiltering', () => {
+    it('only supports type filtering for G8', () => {
+      expect(supportsTypeFiltering('g8')).toBe(true);
+      expect(supportsTypeFiltering('g7')).toBe(false);
+      expect(supportsTypeFiltering('g6')).toBe(false);
+      expect(supportsTypeFiltering('all')).toBe(false);
+    });
+  });
+
+  describe('getAvailableTypes', () => {
+    it('returns all type options for G8', () => {
+      expect(getAvailableTypes('g8')).toEqual([
+        PLAN_FILTER_TYPE_ALL,
+        PLAN_FILTER_TYPE_COMPUTE_OPTIMIZED,
+        PLAN_FILTER_TYPE_GENERAL_PURPOSE,
+      ]);
+    });
+
+    it('returns only the "all" option for G7, G6, and "all" generation', () => {
+      expect(getAvailableTypes('g7')).toEqual([PLAN_FILTER_TYPE_ALL]);
+      expect(getAvailableTypes('g6')).toEqual([PLAN_FILTER_TYPE_ALL]);
+      expect(getAvailableTypes('all')).toEqual([PLAN_FILTER_TYPE_ALL]);
+    });
+  });
+});
diff --git a/packages/manager/src/features/components/PlansPanel/utils/planFilters.ts b/packages/manager/src/features/components/PlansPanel/utils/planFilters.ts
new file mode 100644
index 00000000000..c62bcf6c7fb
--- /dev/null
+++ b/packages/manager/src/features/components/PlansPanel/utils/planFilters.ts
@@ -0,0 +1,207 @@
+/**
+ * Plan Filtering Utilities
+ *
+ * Functions for filtering plans by generation (G8/G7/G6) and type (Compute Optimized/General Purpose).
+ * Uses explicit slug mappings for precise filtering.
+ */
+
+import {
+  G8_DEDICATED_ALL_SLUGS,
+  G8_DEDICATED_COMPUTE_OPTIMIZED_SLUGS,
+  G8_DEDICATED_GENERAL_PURPOSE_SLUGS,
+  PLAN_FILTER_TYPE_ALL,
+  PLAN_FILTER_TYPE_COMPUTE_OPTIMIZED,
+  PLAN_FILTER_TYPE_GENERAL_PURPOSE,
+} from '../constants';
+
+import type {
+  PlanFilterGeneration,
+  PlanFilterType,
+  PlanWithAvailability,
+} from '../types';
+
+// ============================================================================
+// Generation Filtering
+// ============================================================================
+
+/**
+ * Filter plans by generation (G8, G7, G6, or All)
+ *
+ * @param plans - Array of all plans (mostly pre-filtered by plan type/class)
+ * @param generation - The generation to filter by ('all', 'g8', 'g7', or 'g6')
+ * @returns Filtered array of plans matching the generation
+ *
+ * @example
+ * ```ts
+ * const g8Plans = filterPlansByGeneration(allPlans, 'g8');
+ * // Returns all plans with IDs starting with 'g8-dedicated-'
+ *
+ * const allDedicatedPlans = filterPlansByGeneration(allPlans, 'all');
+ * // Returns all plans as-is (already filtered by plan type in parent)
+ * ```
+ */
+export const filterPlansByGeneration = (
+  plans: PlanWithAvailability[],
+  generation: PlanFilterGeneration
+): PlanWithAvailability[] => {
+  // For "All", return all plans as-is
+  // The plans array is already filtered to only dedicated plans by the parent component
+  if (generation === 'all') {
+    return plans;
+  }
+
+  // For G8, use explicit slug list for precise filtering
+  if (generation === 'g8') {
+    const g8Slugs = new Set<string>(G8_DEDICATED_ALL_SLUGS);
+    return plans.filter((plan) => g8Slugs.has(plan.id));
+  }
+
+  // For G7 and G6, use ID prefix matching
+  // G7: IDs start with 'g7-dedicated-' or 'g7-premium-'
+  // G6: IDs start with 'g6-dedicated-'
+  const prefix = `${generation}-`;
+  return plans.filter((plan) => plan.id.startsWith(prefix));
+};
+
+// ============================================================================
+// Type Filtering
+// ============================================================================
+
+/**
+ * Filter plans by type within a generation
+ *
+ * @param plans - Array of plans (should be pre-filtered by generation)
+ * @param generation - The generation context ('all', 'g8', 'g7', or 'g6')
+ * @param type - The type to filter by ('all', 'compute-optimized', 'general-purpose')
+ * @returns Filtered array of plans matching the type
+ *
+ * @example
+ * ```ts
+ * // Get all G8 Compute Optimized plans
+ * const g8Plans = filterPlansByGeneration(allPlans, 'g8');
+ * const g8CO = filterPlansByType(g8Plans, 'g8', 'compute-optimized');
+ * ```
+ */
+export const filterPlansByType = (
+  plans: PlanWithAvailability[],
+  generation: PlanFilterGeneration,
+  type: PlanFilterType
+): PlanWithAvailability[] => {
+  // "All" returns all plans unchanged
+  if (type === PLAN_FILTER_TYPE_ALL) {
+    return plans;
+  }
+
+  // G7, G6, and "All" generation only have "All" option (no sub-types)
+  if (generation === 'g7' || generation === 'g6' || generation === 'all') {
+    return plans;
+  }
+
+  // G8 has Compute Optimized and General Purpose sub-types
+  if (generation === 'g8') {
+    if (type === PLAN_FILTER_TYPE_COMPUTE_OPTIMIZED) {
+      const computeOptimizedSlugs = new Set<string>(
+        G8_DEDICATED_COMPUTE_OPTIMIZED_SLUGS
+      );
+      return plans.filter((plan) => computeOptimizedSlugs.has(plan.id));
+    }
+
+    if (type === PLAN_FILTER_TYPE_GENERAL_PURPOSE) {
+      const generalPurposeSlugs = new Set<string>(
+        G8_DEDICATED_GENERAL_PURPOSE_SLUGS
+      );
+      return plans.filter((plan) => generalPurposeSlugs.has(plan.id));
+    }
+  }
+
+  // Default: return all plans
+  return plans;
+};
+
+// ============================================================================
+// Combined Filtering
+// ============================================================================
+
+/**
+ * Apply both generation and type filters to a list of plans
+ *
+ * @param plans - Array of all plans
+ * @param generation - The generation to filter by (optional)
+ * @param type - The type to filter by (optional, defaults to 'all')
+ * @returns Filtered array of plans, or all plans if no filters applied
+ *
+ * @example
+ * ```ts
+ * // Get G8 Compute Optimized plans
+ * const filtered = applyPlanFilters(allPlans, 'g8', 'compute-optimized');
+ *
+ * // Get all G7 plans
+ * const g7All = applyPlanFilters(allPlans, 'g7', 'all');
+ *
+ * // Get all dedicated plans (G6, G7, G8)
+ * const allDedicated = applyPlanFilters(allPlans, 'all', 'all');
+ *
+ * // No filters - return empty array
+ * const none = applyPlanFilters(allPlans);
+ * ```
+ */
+export const applyPlanFilters = (
+  plans: PlanWithAvailability[],
+  generation?: PlanFilterGeneration,
+  type: PlanFilterType = PLAN_FILTER_TYPE_ALL
+): PlanWithAvailability[] => {
+  // No filters - return empty array
+  if (!generation) {
+    return [];
+  }
+
+  // Apply generation filter first
+  const generationFiltered = filterPlansByGeneration(plans, generation);
+
+  // Then apply type filter
+  return filterPlansByType(generationFiltered, generation, type);
+};
+
+// ============================================================================
+// Helper Functions
+// ============================================================================
+
+/**
+ * Check if a generation supports type filtering
+ *
+ * @param generation - The generation to check
+ * @returns True if the generation has multiple types (G8), false otherwise
+ */
+export const supportsTypeFiltering = (
+  generation: PlanFilterGeneration
+): boolean => {
+  return generation === 'g8';
+};
+
+/**
+ * Get available type options for a generation
+ *
+ * @param generation - The generation to get types for
+ * @returns Array of available type values
+ *
+ * @example
+ * ```ts
+ * getAvailableTypes('g8'); // ['all', 'compute-optimized', 'general-purpose']
+ * getAvailableTypes('g7'); // ['all']
+ * getAvailableTypes('all'); // ['all']
+ * ```
+ */
+export const getAvailableTypes = (
+  generation: PlanFilterGeneration
+): PlanFilterType[] => {
+  if (generation === 'g8') {
+    return [
+      PLAN_FILTER_TYPE_ALL,
+      PLAN_FILTER_TYPE_COMPUTE_OPTIMIZED,
+      PLAN_FILTER_TYPE_GENERAL_PURPOSE,
+    ];
+  }
+
+  // G7, G6, and "All" only have "All" type option
+  return [PLAN_FILTER_TYPE_ALL];
+};

From ced04e1a50e76f51a3faa66ca0f9460d9b6c6d06 Mon Sep 17 00:00:00 2001
From: jdamore-linode <97627410+jdamore-linode@users.noreply.github.com>
Date: Wed, 19 Nov 2025 11:35:10 -0500
Subject: [PATCH 19/91] test: [UIE-9677] - Misc. Cypress test fixes following
 v1.155.0 release (#13107)

* Mock `udp` feature flag to be enabled in NodeBalancer create form validation smoke tests

* Remove obsolete LDE disk delete test now that deletion works as expected

* Fix LKE-E field validation test when running against non-local Cloud by fixing intercept URL

* Restore disk deletion test for LDE, update assertions for success response

* Added changeset: Fixed various test failures when running tests against Prod environment

* Avoid cleaning up Linodes that are busy

* Swallow errors and log a warning on resource clean up errors
---
 .../pr-13107-tests-1763492424120.md           |   5 +
 .../kubernetes/lke-enterprise-create.spec.ts  |  28 ++--
 .../e2e/core/linodes/linode-storage.spec.ts   |  20 +--
 .../nodebalancer-create-validation.spec.ts    |   5 +
 .../manager/cypress/support/api/linodes.ts    |   6 +-
 .../manager/cypress/support/intercepts/lke.ts |   6 +-
 .../cypress/support/setup/defer-command.ts    | 145 +-----------------
 packages/manager/cypress/support/util/api.ts  | 145 +++++++++++++++++-
 .../manager/cypress/support/util/cleanup.ts   |  16 +-
 9 files changed, 199 insertions(+), 177 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13107-tests-1763492424120.md

diff --git a/packages/manager/.changeset/pr-13107-tests-1763492424120.md b/packages/manager/.changeset/pr-13107-tests-1763492424120.md
new file mode 100644
index 00000000000..5f1b879f190
--- /dev/null
+++ b/packages/manager/.changeset/pr-13107-tests-1763492424120.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Tests
+---
+
+Fixed various test failures when running tests against Prod environment ([#13107](https://github.com/linode/manager/pull/13107))
diff --git a/packages/manager/cypress/e2e/core/kubernetes/lke-enterprise-create.spec.ts b/packages/manager/cypress/e2e/core/kubernetes/lke-enterprise-create.spec.ts
index 32d93f7b6e7..b1a5509a488 100644
--- a/packages/manager/cypress/e2e/core/kubernetes/lke-enterprise-create.spec.ts
+++ b/packages/manager/cypress/e2e/core/kubernetes/lke-enterprise-create.spec.ts
@@ -289,21 +289,19 @@ describe('LKE Cluster Creation with LKE-E', () => {
      */
     it('surfaces field-level errors on VPC fields', () => {
       // Intercept the create cluster request and force an error response
-      cy.intercept('POST', '/v4beta/lke/clusters', {
-        statusCode: 400,
-        body: {
-          errors: [
-            {
-              reason: 'There is an error configuring this VPC.',
-              field: 'vpc_id',
-            },
-            {
-              reason: 'There is an error configuring this subnet.',
-              field: 'subnet_id',
-            },
-          ],
-        },
-      }).as('createClusterError');
+      mockCreateClusterError(
+        [
+          {
+            reason: 'There is an error configuring this VPC.',
+            field: 'vpc_id',
+          },
+          {
+            reason: 'There is an error configuring this subnet.',
+            field: 'subnet_id',
+          },
+        ],
+        400
+      ).as('createClusterError');
 
       cy.findByLabelText('Cluster Label').type(clusterLabel);
       cy.findByText('LKE Enterprise').click();
diff --git a/packages/manager/cypress/e2e/core/linodes/linode-storage.spec.ts b/packages/manager/cypress/e2e/core/linodes/linode-storage.spec.ts
index 8814b12c700..50c52ea14bb 100644
--- a/packages/manager/cypress/e2e/core/linodes/linode-storage.spec.ts
+++ b/packages/manager/cypress/e2e/core/linodes/linode-storage.spec.ts
@@ -160,12 +160,10 @@ describe('linode storage tab', () => {
   });
 
   /*
-   * - Confirms UI flow end-to-end when a user attempts to delete a Linode disk with encryption enabled.
-   * - Confirms that disk deletion fails and toast notification appears.
+   * - Confirms UI flow end-to-end when a user deletes a Linode disk with encryption enabled.
+   * - Confirms that disk deletion succeeds and toast notification appears.
    */
-  // TODO: Disk cannot be deleted if disk_encryption is 'enabled'
-  // TODO: edit result of this test if/when behavior of backend is updated. uncertain what expected behavior is for this disk config
-  it('delete disk fails when Linode uses disk encryption', () => {
+  it('deletes a disk when Linode Disk Encryption is enabled', () => {
     const diskName = randomLabel();
     cy.defer(() =>
       createTestLinode({
@@ -195,19 +193,17 @@ describe('linode storage tab', () => {
       cy.wait('@deleteDisk').its('response.statusCode').should('eq', 200);
       cy.findByText('Deleting', { exact: false }).should('be.visible');
       ui.button.findByTitle('Add a Disk').should('be.enabled');
-      //   ui.toast.assertMessage(
-      //     `Disk ${diskName} on Linode ${linode.label} has been deleted.`
-      //   );
+      ui.toast.assertMessage(
+        `Disk ${diskName} on Linode ${linode.label} has been deleted.`
+      );
       ui.toast
         .findByMessage(
           `Disk ${diskName} on Linode ${linode.label} has been deleted.`
         )
         .should('not.exist');
-      //   cy.findByLabelText('List of Disks').within(() => {
-      //     cy.contains(diskName).should('not.exist');
-      //   });
+
       cy.findByLabelText('List of Disks').within(() => {
-        cy.contains(diskName).should('be.visible');
+        cy.contains(diskName).should('not.exist');
       });
     });
   });
diff --git a/packages/manager/cypress/e2e/core/nodebalancers/nodebalancer-create-validation.spec.ts b/packages/manager/cypress/e2e/core/nodebalancers/nodebalancer-create-validation.spec.ts
index 458e437b44f..6a2f6d0b78e 100644
--- a/packages/manager/cypress/e2e/core/nodebalancers/nodebalancer-create-validation.spec.ts
+++ b/packages/manager/cypress/e2e/core/nodebalancers/nodebalancer-create-validation.spec.ts
@@ -1,3 +1,5 @@
+import { mockAppendFeatureFlags } from 'support/intercepts/feature-flags';
+
 describe('NodeBalancer create page validation', () => {
   /**
    * This test ensures that the user sees a uniqueness error when
@@ -5,6 +7,9 @@ describe('NodeBalancer create page validation', () => {
    * - they configure many UDP configs to use the same port
    */
   it('renders a port uniqueness errors when you try to create a nodebalancer with configs using the same port and protocol', () => {
+    mockAppendFeatureFlags({
+      udp: true,
+    });
     cy.visitWithLogin('/nodebalancers/create');
 
     // Configure the first config to use TCP on port 8080
diff --git a/packages/manager/cypress/support/api/linodes.ts b/packages/manager/cypress/support/api/linodes.ts
index 7d8a15e66e5..2e128b90ac0 100644
--- a/packages/manager/cypress/support/api/linodes.ts
+++ b/packages/manager/cypress/support/api/linodes.ts
@@ -30,7 +30,11 @@ export const deleteAllTestLinodes = async (): Promise<void> => {
   );
 
   const deletePromises = linodes
-    .filter((linode: Linode) => isTestLabel(linode.label))
+    .filter(
+      (linode: Linode) =>
+        isTestLabel(linode.label) &&
+        ['offline', 'running'].includes(linode.status)
+    )
     .map((linode: Linode) => deleteLinode(linode.id));
 
   await Promise.all(deletePromises);
diff --git a/packages/manager/cypress/support/intercepts/lke.ts b/packages/manager/cypress/support/intercepts/lke.ts
index 4c2b6935e9a..280a5a7946e 100644
--- a/packages/manager/cypress/support/intercepts/lke.ts
+++ b/packages/manager/cypress/support/intercepts/lke.ts
@@ -10,7 +10,7 @@ import {
   latestEnterpriseTierKubernetesVersion,
   latestStandardTierKubernetesVersion,
 } from 'support/constants/lke';
-import { makeErrorResponse } from 'support/util/errors';
+import { APIErrorContents, makeErrorResponse } from 'support/util/errors';
 import { apiMatcher } from 'support/util/intercepts';
 import { paginateResponse } from 'support/util/paginate';
 import { randomDomainName } from 'support/util/random';
@@ -185,7 +185,9 @@ export const mockCreateCluster = (
  * @returns Cypress chainable.
  */
 export const mockCreateClusterError = (
-  errorMessage: string = 'An unknown error occurred.',
+  errorMessage:
+    | APIErrorContents
+    | APIErrorContents[] = 'An unknown error occurred.',
   statusCode: number = 500
 ): Cypress.Chainable<null> => {
   return cy.intercept(
diff --git a/packages/manager/cypress/support/setup/defer-command.ts b/packages/manager/cypress/support/setup/defer-command.ts
index 6196b6e976f..bc1c38bf225 100644
--- a/packages/manager/cypress/support/setup/defer-command.ts
+++ b/packages/manager/cypress/support/setup/defer-command.ts
@@ -1,150 +1,7 @@
 import { LINODE_CREATE_TIMEOUT } from 'support/constants/linodes';
+import { enhanceError, isAxiosError } from 'support/util/api';
 import { timeout } from 'support/util/backoff';
 
-import type { APIError } from '@linode/api-v4';
-import type { AxiosError } from 'axios';
-
-type LinodeApiV4Error = {
-  errors: APIError[];
-};
-
-/**
- * Returns `true` if the given error is a Linode API schema validation error.
- *
- * Type guards `e` as an array of `APIError` objects.
- *
- * @param e - Error.
- *
- * @returns `true` if `e` is a Linode API schema validation error.
- */
-const isValidationError = (e: any): e is APIError[] => {
-  // When a Linode APIv4 schema validation error occurs, an array of `APIError`
-  // objects is thrown rather than a typical `Error` type.
-  return (
-    Array.isArray(e) &&
-    e.every((item: any) => {
-      return 'reason' in item;
-    })
-  );
-};
-
-/**
- * Returns `true` if the given error is an Axios error.
- *
- * Type guards `e` as an `AxiosError` instance.
- *
- * @param e - Error.
- *
- * @returns `true` if `e` is an `AxiosError`.
- */
-const isAxiosError = (e: any): e is AxiosError => {
-  return !!e.isAxiosError;
-};
-
-/**
- * Returns `true` if the given error is a Linode API v4 request error.
- *
- * Type guards `e` as an `AxiosError<LinodeApiV4Error>` instance.
- *
- * @param e - Error.
- *
- * @returns `true` if `e` is a Linode API v4 request error.
- */
-const isLinodeApiError = (e: any): e is AxiosError<LinodeApiV4Error> => {
-  if (isAxiosError(e)) {
-    const responseData = e.response?.data as any;
-    return (
-      responseData.errors &&
-      Array.isArray(responseData.errors) &&
-      responseData.errors.every((item: any) => {
-        return 'reason' in item;
-      })
-    );
-  }
-  return false;
-};
-
-/**
- * Detects known error types and returns a new Error with more detailed message.
- *
- * Unknown error types are returned without modification.
- *
- * @param e - Error.
- *
- * @returns A new error with added information in message, or `e`.
- */
-const enhanceError = (e: Error) => {
-  // Check for most specific error types first.
-  if (isLinodeApiError(e)) {
-    // If `e` is a Linode APIv4 error response, show the status code, error messages,
-    // and request URL when applicable.
-    const summary = e.response?.status
-      ? `Linode APIv4 request failed with status code ${e.response.status}`
-      : `Linode APIv4 request failed`;
-
-    const errorDetails = e.response!.data.errors.map((error: APIError) => {
-      return error.field
-        ? `- ${error.reason} (field '${error.field}')`
-        : `- ${error.reason}`;
-    });
-
-    const requestInfo =
-      !!e.request?.responseURL && !!e.config?.method
-        ? `\nRequest: ${e.config.method.toUpperCase()} ${e.request.responseURL}`
-        : '';
-
-    return new Error(`${summary}\n${errorDetails.join('\n')}${requestInfo}`);
-  }
-
-  if (isAxiosError(e)) {
-    // If `e` is an Axios error (but not a Linode API error specifically), show the
-    // status code, error messages, and request URL when applicable.
-    const summary = e.response?.status
-      ? `Request failed with status code ${e.response.status}`
-      : `Request failed`;
-
-    const requestInfo =
-      !!e.request?.responseURL && !!e.config?.method
-        ? `\nRequest: ${e.config.method.toUpperCase()} ${e.request.responseURL}`
-        : '';
-
-    return new Error(`${summary}${requestInfo}`);
-  }
-
-  // Handle cases where a validation error is thrown.
-  // These are arrays containing `APIError` objects; no additional request context
-  // is included so we only have the validation error messages themselves to work with.
-  if (isValidationError(e)) {
-    // Validation errors do not contain any additional context (request URL, payload, etc.).
-    // Show the validation error messages instead.
-    const multipleErrors = e.length > 1;
-    const summary = multipleErrors
-      ? 'Request failed with Linode schema validation errors'
-      : 'Request failed with Linode schema validation error';
-
-    // Format, accounting for 0, 1, or more errors.
-    const validationErrorMessage = multipleErrors
-      ? e
-          .map((error) =>
-            error.field
-              ? `- ${error.reason} (field '${error.field}')`
-              : `- ${error.reason}`
-          )
-          .join('\n')
-      : e
-          .map((error) =>
-            error.field
-              ? `${error.reason} (field '${error.field}')`
-              : `${error.reason}`
-          )
-          .join('\n');
-
-    return new Error(`${summary}\n${validationErrorMessage}`);
-  }
-  // Return `e` unmodified if it's not handled by any of the above cases.
-  return e;
-};
-
 /**
  * Describes an object which can contain a label.
  */
diff --git a/packages/manager/cypress/support/util/api.ts b/packages/manager/cypress/support/util/api.ts
index fd55777be19..b90bbaab130 100644
--- a/packages/manager/cypress/support/util/api.ts
+++ b/packages/manager/cypress/support/util/api.ts
@@ -2,14 +2,155 @@
  * @file Utilities to help configure @linode/api-v4 package.
  */
 
-import { baseRequest } from '@linode/api-v4';
-import { AxiosHeaders } from 'axios';
+import { APIError, baseRequest } from '@linode/api-v4';
+import { AxiosError, AxiosHeaders } from 'axios';
 
 // Note: This file is imported by Cypress plugins, and indirectly by Cypress
 // tests. Because Cypress has not been initiated when plugins are executed, we
 // cannot use any Cypress functionality in this module without causing a crash
 // at startup.
 
+type LinodeApiV4Error = {
+  errors: APIError[];
+};
+
+/**
+ * Returns `true` if the given error is a Linode API schema validation error.
+ *
+ * Type guards `e` as an array of `APIError` objects.
+ *
+ * @param e - Error.
+ *
+ * @returns `true` if `e` is a Linode API schema validation error.
+ */
+export const isValidationError = (e: any): e is APIError[] => {
+  // When a Linode APIv4 schema validation error occurs, an array of `APIError`
+  // objects is thrown rather than a typical `Error` type.
+  return (
+    Array.isArray(e) &&
+    e.every((item: any) => {
+      return 'reason' in item;
+    })
+  );
+};
+
+/**
+ * Returns `true` if the given error is an Axios error.
+ *
+ * Type guards `e` as an `AxiosError` instance.
+ *
+ * @param e - Error.
+ *
+ * @returns `true` if `e` is an `AxiosError`.
+ */
+export const isAxiosError = (e: any): e is AxiosError => {
+  return !!e.isAxiosError;
+};
+
+/**
+ * Returns `true` if the given error is a Linode API v4 request error.
+ *
+ * Type guards `e` as an `AxiosError<LinodeApiV4Error>` instance.
+ *
+ * @param e - Error.
+ *
+ * @returns `true` if `e` is a Linode API v4 request error.
+ */
+export const isLinodeApiError = (e: any): e is AxiosError<LinodeApiV4Error> => {
+  if (isAxiosError(e)) {
+    const responseData = e.response?.data as any;
+    return (
+      responseData.errors &&
+      Array.isArray(responseData.errors) &&
+      responseData.errors.every((item: any) => {
+        return 'reason' in item;
+      })
+    );
+  }
+  return false;
+};
+
+/**
+ * Detects known error types and returns a new Error with more detailed message.
+ *
+ * Unknown error types are returned without modification.
+ *
+ * @param e - Error.
+ *
+ * @returns A new error with added information in message, or `e`.
+ */
+export const enhanceError = (e: Error) => {
+  // Check for most specific error types first.
+  if (isLinodeApiError(e)) {
+    // If `e` is a Linode APIv4 error response, show the status code, error messages,
+    // and request URL when applicable.
+    const summary = e.response?.status
+      ? `Linode APIv4 request failed with status code ${e.response.status}`
+      : `Linode APIv4 request failed`;
+
+    const errorDetails = e.response!.data.errors.map((error: APIError) => {
+      return error.field
+        ? `- ${error.reason} (field '${error.field}')`
+        : `- ${error.reason}`;
+    });
+
+    const requestInfo =
+      !!e.request?.responseURL && !!e.config?.method
+        ? `\nRequest: ${e.config.method.toUpperCase()} ${e.request.responseURL}`
+        : '';
+
+    return new Error(`${summary}\n${errorDetails.join('\n')}${requestInfo}`);
+  }
+
+  if (isAxiosError(e)) {
+    // If `e` is an Axios error (but not a Linode API error specifically), show the
+    // status code, error messages, and request URL when applicable.
+    const summary = e.response?.status
+      ? `Request failed with status code ${e.response.status}`
+      : `Request failed`;
+
+    const requestInfo =
+      !!e.request?.responseURL && !!e.config?.method
+        ? `\nRequest: ${e.config.method.toUpperCase()} ${e.request.responseURL}`
+        : '';
+
+    return new Error(`${summary}${requestInfo}`);
+  }
+
+  // Handle cases where a validation error is thrown.
+  // These are arrays containing `APIError` objects; no additional request context
+  // is included so we only have the validation error messages themselves to work with.
+  if (isValidationError(e)) {
+    // Validation errors do not contain any additional context (request URL, payload, etc.).
+    // Show the validation error messages instead.
+    const multipleErrors = e.length > 1;
+    const summary = multipleErrors
+      ? 'Request failed with Linode schema validation errors'
+      : 'Request failed with Linode schema validation error';
+
+    // Format, accounting for 0, 1, or more errors.
+    const validationErrorMessage = multipleErrors
+      ? e
+          .map((error) =>
+            error.field
+              ? `- ${error.reason} (field '${error.field}')`
+              : `- ${error.reason}`
+          )
+          .join('\n')
+      : e
+          .map((error) =>
+            error.field
+              ? `${error.reason} (field '${error.field}')`
+              : `${error.reason}`
+          )
+          .join('\n');
+
+    return new Error(`${summary}\n${validationErrorMessage}`);
+  }
+  // Return `e` unmodified if it's not handled by any of the above cases.
+  return e;
+};
+
 /**
  * Default API root URL to use for replacement logic when using a URL override.
  *
diff --git a/packages/manager/cypress/support/util/cleanup.ts b/packages/manager/cypress/support/util/cleanup.ts
index 11432ce0ff7..847e1f79408 100644
--- a/packages/manager/cypress/support/util/cleanup.ts
+++ b/packages/manager/cypress/support/util/cleanup.ts
@@ -15,6 +15,7 @@ import { deleteAllTestSSHKeys } from 'support/api/profile';
 import { deleteAllTestStackScripts } from 'support/api/stackscripts';
 import { deleteAllTestTags } from 'support/api/tags';
 import { deleteAllTestVolumes } from 'support/api/volumes';
+import { enhanceError } from 'support/util/api';
 
 /** Types of resources that can be cleaned up. */
 export type CleanUpResource =
@@ -75,7 +76,20 @@ export const cleanUp = (resources: CleanUpResource | CleanUpResource[]) => {
     for (const resource of resourcesArray) {
       const cleanFunction = cleanUpMap[resource];
       // Perform clean-up sequentially to avoid API rate limiting.
-      await cleanFunction();
+      try {
+        await cleanFunction();
+      } catch (e: any) {
+        // Log a warning but otherwise swallow errors if any resources fail to
+        // be cleaned up. There are a few cases where this is especially helpful:
+        //
+        // - Unplanned API issues or outages resulting in 5xx errors
+        // - 400 errors when inadevertently attempting to delete resources that are still busy (e.g. cleaning up a Linode that is the target of a clone operation)
+        const enhancedError = enhanceError(e);
+        console.warn(
+          'An API error occurred while attempting to clean up one or more resources:'
+        );
+        console.warn(enhancedError.message);
+      }
     }
   };
   return cy.defer(

From 959e2c4b32f3ea8527f03b012898206c7e6990ef Mon Sep 17 00:00:00 2001
From: santoshp210-akamai
 <159890961+santoshp210-akamai@users.noreply.github.com>
Date: Thu, 20 Nov 2025 10:14:04 +0530
Subject: [PATCH 20/91] upcoming: [DI-28227] - Integrating
 Firewall-nodebalancers to ACLP-Alerting (#13089)

* upcoming: [DI-28227] - Integrating Firewall-nobalancers to ACLP-Alerting

* fixing a file naming typo

* add changeset

* upcoming: [DI-28227] - addressing review comments
---
 ...r-13089-upcoming-features-1763100678421.md |   5 +
 .../src/factories/cloudpulse/alerts.ts        |  95 +++++++++++--
 .../RenderAlertsMetricsAndDimensions.tsx      |  28 +++-
 .../Alerts/AlertsDetail/constants.ts          |   1 +
 .../Alerts/AlertsDetail/utils.test.ts         |  21 ++-
 .../CloudPulse/Alerts/AlertsDetail/utils.ts   |  13 ++
 .../AlertsResources/AlertsResources.tsx       |  15 +-
 .../CreateAlert/CreateAlertDefinition.tsx     |  24 +++-
 .../Criteria/DimensionFilterField.tsx         |   5 +
 ...orageDimensionFilterAutocomplete.test.tsx} |   0
 ...rewallDimensionFilterAutocomplete.test.tsx |  10 +-
 .../FirewallDimensionFilterAutocomplete.tsx   |  21 +--
 .../ValueFieldRenderer.tsx                    |  16 ++-
 .../DimensionFilterValue/constants.ts         |   4 +
 .../useFirewallFetchOptions.ts                |  24 +++-
 .../Criteria/DimensionFilterValue/utils.ts    |  19 +++
 .../Alerts/CreateAlert/Criteria/Metric.tsx    |  17 ++-
 .../EntityTypeSelect.test.tsx                 | 132 ++++++++++++++++++
 .../GeneralInformation/EntityTypeSelect.tsx   |  66 +++++++++
 .../CloudPulseModifyAlertResources.tsx        |   3 +-
 .../CloudPulse/Alerts/CreateAlert/schemas.ts  |   8 ++
 .../CloudPulse/Alerts/CreateAlert/types.ts    |   2 +
 .../Alerts/CreateAlert/utilities.ts           |   1 +
 .../Alerts/EditAlert/EditAlertDefinition.tsx  |  35 ++++-
 .../features/CloudPulse/Alerts/constants.ts   |   5 +
 .../CloudPulse/shared/DimensionTransform.ts   |   2 +
 packages/manager/src/mocks/serverHandlers.ts  |  63 ++++++++-
 27 files changed, 594 insertions(+), 41 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13089-upcoming-features-1763100678421.md
 rename packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/{BlockStorageDimensionFilterAutcomplete.test.tsx => BlockStorageDimensionFilterAutocomplete.test.tsx} (100%)
 create mode 100644 packages/manager/src/features/CloudPulse/Alerts/CreateAlert/GeneralInformation/EntityTypeSelect.test.tsx
 create mode 100644 packages/manager/src/features/CloudPulse/Alerts/CreateAlert/GeneralInformation/EntityTypeSelect.tsx

diff --git a/packages/manager/.changeset/pr-13089-upcoming-features-1763100678421.md b/packages/manager/.changeset/pr-13089-upcoming-features-1763100678421.md
new file mode 100644
index 00000000000..0ee6419cf61
--- /dev/null
+++ b/packages/manager/.changeset/pr-13089-upcoming-features-1763100678421.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Integrate Firewall-nodebalancer support for ACLP-Alerting ([#13089](https://github.com/linode/manager/pull/13089))
diff --git a/packages/manager/src/factories/cloudpulse/alerts.ts b/packages/manager/src/factories/cloudpulse/alerts.ts
index bd5c92c220d..81e061542b0 100644
--- a/packages/manager/src/factories/cloudpulse/alerts.ts
+++ b/packages/manager/src/factories/cloudpulse/alerts.ts
@@ -245,7 +245,7 @@ export const alertFactory = Factory.Sync.makeFactory<Alert>({
   updated_by: 'system',
 });
 
-const firewallDimensions: Dimension[] = [
+const firewallLinodeDimensions: Dimension[] = [
   { label: 'VPC-Subnet', dimension_label: 'vpc_subnet_id', values: [] },
   {
     label: 'Interface Type',
@@ -257,29 +257,84 @@ const firewallDimensions: Dimension[] = [
   { label: 'Linode Region', dimension_label: 'region_id', values: [] },
 ];
 
+const firewallNodebalancerDimensions: Dimension[] = [
+  { label: 'Protocol', dimension_label: 'protocol', values: ['TCP', 'UDP'] },
+  { label: 'IP Version', dimension_label: 'ip_version', values: ['v4', 'v6'] },
+  { label: 'NodeBalancer', dimension_label: 'nodebalancer_id', values: [] },
+];
+
 export const firewallMetricDefinitionFactory =
   Factory.Sync.makeFactory<MetricDefinition>({
-    label: 'Firewall Metric',
-    metric: 'firewall_metric',
-    unit: 'metric_unit',
+    label: 'Current connections (Linode)',
+    metric: 'fw_active_connections',
+    unit: 'Count',
     metric_type: 'gauge',
-    scrape_interval: '300s',
+    scrape_interval: '60s',
     is_alertable: true,
-    available_aggregate_functions: ['avg', 'sum', 'max', 'min', 'count'],
-    dimensions: firewallDimensions,
+    available_aggregate_functions: ['avg', 'max', 'min'],
+    dimensions: firewallLinodeDimensions,
   });
+
 export const firewallMetricDefinitionsResponse: MetricDefinition[] = [
   firewallMetricDefinitionFactory.build({
-    label: 'Current connections',
+    label: 'Current connections (Linode)',
     metric: 'fw_active_connections',
-    unit: 'count',
+    unit: 'Count',
     available_aggregate_functions: ['avg', 'max', 'min'],
+    dimensions: firewallLinodeDimensions,
   }),
   firewallMetricDefinitionFactory.build({
-    label: 'Ingress packets accepted',
+    label: 'Ingress Packets Accepted (Linode)',
     metric: 'fw_ingress_packets_accepted',
-    unit: 'packets_per_second',
+    unit: 'packets/s',
     available_aggregate_functions: ['sum'],
+    dimensions: firewallLinodeDimensions,
+  }),
+  firewallMetricDefinitionFactory.build({
+    label: 'Available Connections (Linode)',
+    metric: 'fw_available_connections',
+    unit: 'Count',
+    available_aggregate_functions: ['avg', 'max', 'min'],
+    dimensions: firewallLinodeDimensions,
+  }),
+  firewallMetricDefinitionFactory.build({
+    label: 'Ingress Bytes Accepted (Linode)',
+    metric: 'fw_ingress_bytes_accepted',
+    unit: 'Bps',
+    available_aggregate_functions: ['sum'],
+    dimensions: firewallLinodeDimensions,
+  }),
+  firewallMetricDefinitionFactory.build({
+    label: 'Ingress Bytes Accepted (Node Balancer)',
+    metric: 'nb_ingress_bytes_accepted',
+    unit: 'Bps',
+    scrape_interval: '300s',
+    available_aggregate_functions: ['sum'],
+    dimensions: firewallNodebalancerDimensions,
+  }),
+  firewallMetricDefinitionFactory.build({
+    label: 'Ingress Bytes Dropped  (Node Balancer)',
+    metric: 'nb_ingress_bytes_dropped',
+    unit: 'Bps',
+    scrape_interval: '300s',
+    available_aggregate_functions: ['sum'],
+    dimensions: firewallNodebalancerDimensions,
+  }),
+  firewallMetricDefinitionFactory.build({
+    label: 'Ingress Packets Accepted  (Node Balancer)',
+    metric: 'nb_ingress_packets_accepted',
+    unit: 'packets/s',
+    scrape_interval: '300s',
+    available_aggregate_functions: ['sum'],
+    dimensions: firewallNodebalancerDimensions,
+  }),
+  firewallMetricDefinitionFactory.build({
+    label: 'Ingress Packets Dropped  (Node Balancer)',
+    metric: 'nb_ingress_packets_dropped',
+    unit: 'packets/s',
+    scrape_interval: '300s',
+    available_aggregate_functions: ['sum'],
+    dimensions: firewallNodebalancerDimensions,
   }),
 ];
 
@@ -579,3 +634,21 @@ export const blockStorageMetricCriteria =
       },
     ],
   });
+
+export const firewallNodebalancerMetricCriteria =
+  Factory.Sync.makeFactory<AlertDefinitionMetricCriteria>({
+    label: 'Ingress Packets Dropped  (Node Balancer)',
+    metric: 'nb_ingress_packets_dropped',
+    unit: 'packets/s',
+    aggregate_function: 'sum',
+    operator: 'gt',
+    threshold: 1000,
+    dimension_filters: [
+      {
+        label: 'NodeBalancer',
+        dimension_label: 'nodebalancer_id',
+        operator: 'in',
+        value: '333',
+      },
+    ],
+  });
diff --git a/packages/manager/src/features/CloudPulse/Alerts/AlertsDetail/RenderAlertsMetricsAndDimensions.tsx b/packages/manager/src/features/CloudPulse/Alerts/AlertsDetail/RenderAlertsMetricsAndDimensions.tsx
index 64852742b49..7d98225443f 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/AlertsDetail/RenderAlertsMetricsAndDimensions.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/AlertsDetail/RenderAlertsMetricsAndDimensions.tsx
@@ -2,7 +2,11 @@ import {
   type AlertDefinitionMetricCriteria,
   type CloudPulseServiceType,
 } from '@linode/api-v4';
-import { useAllLinodesQuery, useAllVPCsQuery } from '@linode/queries';
+import {
+  useAllLinodesQuery,
+  useAllNodeBalancersQuery,
+  useAllVPCsQuery,
+} from '@linode/queries';
 import { Divider } from '@linode/ui';
 import { GridLegacy } from '@mui/material';
 import React, { useMemo } from 'react';
@@ -17,6 +21,7 @@ import {
 import { getVPCSubnets } from '../CreateAlert/Criteria/DimensionFilterValue/utils';
 import {
   LINODE_DIMENSION_LABEL,
+  NODEBALANCER_DIMENSION_LABEL,
   VPC_SUBNET_DIMENSION_LABEL,
 } from './constants';
 import { DisplayAlertDetailChips } from './DisplayAlertDetailChips';
@@ -47,9 +52,18 @@ export const RenderAlertMetricsAndDimensions = React.memo(
       ruleCriteria,
       VPC_SUBNET_DIMENSION_LABEL
     );
+    const isNodebalancersRequired = isCheckRequired(
+      ruleCriteria,
+      NODEBALANCER_DIMENSION_LABEL
+    );
     // Initialize the query, but only run when needed
     const { data: linodes } = useAllLinodesQuery({}, {}, isLinodeRequired);
     const { data: vpcs } = useAllVPCsQuery({ enabled: isVPCRequired });
+    const { data: nodebalancers } = useAllNodeBalancersQuery(
+      isNodebalancersRequired,
+      {},
+      {}
+    );
 
     // create a map of id to labels for lookup
     const linodeMap = useMemo(
@@ -73,6 +87,17 @@ export const RenderAlertMetricsAndDimensions = React.memo(
       }, {});
     }, [vpcs]);
 
+    const nodebalancersMap = useMemo(() => {
+      return (
+        nodebalancers?.reduce<Record<string, string>>((acc, nodebalancer) => {
+          return {
+            ...acc,
+            [String(nodebalancer.id)]: nodebalancer.label,
+          };
+        }, {}) ?? {}
+      );
+    }, [nodebalancers]);
+
     if (!ruleCriteria.rules?.length) {
       return <NullComponent />;
     }
@@ -125,6 +150,7 @@ export const RenderAlertMetricsAndDimensions = React.memo(
                       serviceType,
                       value,
                       vpcSubnetMap,
+                      nodebalancersMap,
                     }),
                   ]
                 )}
diff --git a/packages/manager/src/features/CloudPulse/Alerts/AlertsDetail/constants.ts b/packages/manager/src/features/CloudPulse/Alerts/AlertsDetail/constants.ts
index af2ac6bbd96..46e1684ca22 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/AlertsDetail/constants.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/AlertsDetail/constants.ts
@@ -8,3 +8,4 @@ export const transformationAllowedOperators: DimensionFilterOperatorType[] = [
 
 export const LINODE_DIMENSION_LABEL = 'linode_id';
 export const VPC_SUBNET_DIMENSION_LABEL = 'vpc_subnet_id';
+export const NODEBALANCER_DIMENSION_LABEL = 'nodebalancer_id';
diff --git a/packages/manager/src/features/CloudPulse/Alerts/AlertsDetail/utils.test.ts b/packages/manager/src/features/CloudPulse/Alerts/AlertsDetail/utils.test.ts
index 5526f2b9401..6e8b8b339e6 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/AlertsDetail/utils.test.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/AlertsDetail/utils.test.ts
@@ -82,7 +82,10 @@ describe('getResolvedDimensionValue', () => {
     'subnet-1': 'VPC-1_subnet-1',
     'subnet-2': 'VPC-1_subnet-2',
   };
-
+  const nodebalancersMap = {
+    '33': 'nodebalancer-a',
+    '44': 'nodebalancer-b',
+  };
   it('should return correct transformed value', () => {
     const linodeResult = getResolvedDimensionValue({
       dimensionFilterKey: 'linode_id',
@@ -91,6 +94,7 @@ describe('getResolvedDimensionValue', () => {
       serviceType: 'firewall',
       linodeMap,
       vpcSubnetMap,
+      nodebalancersMap,
     });
     expect(linodeResult).toBe('linode-a, linode-b');
 
@@ -101,10 +105,23 @@ describe('getResolvedDimensionValue', () => {
       serviceType: 'firewall',
       linodeMap,
       vpcSubnetMap,
+      nodebalancersMap,
     });
     expect(vpcResult).toBe('VPC-1_subnet-1');
   });
 
+  it('should return correct transformed value for nodebalancer_id', () => {
+    const nodebalancerResult = getResolvedDimensionValue({
+      dimensionFilterKey: 'nodebalancer_id',
+      dimensionOperator: 'in',
+      value: '33,44',
+      serviceType: 'firewall',
+      linodeMap,
+      vpcSubnetMap,
+      nodebalancersMap,
+    });
+    expect(nodebalancerResult).toBe('nodebalancer-a, nodebalancer-b');
+  });
   it('should not transform value if operator is not in allowed list', () => {
     const result = getResolvedDimensionValue({
       dimensionFilterKey: 'linode_id',
@@ -113,6 +130,7 @@ describe('getResolvedDimensionValue', () => {
       serviceType: 'firewall',
       linodeMap,
       vpcSubnetMap,
+      nodebalancersMap,
     });
     expect(result).toBe('linode-c, linode-d');
   });
@@ -125,6 +143,7 @@ describe('getResolvedDimensionValue', () => {
       serviceType: 'firewall',
       linodeMap,
       vpcSubnetMap,
+      nodebalancersMap,
     });
     expect(nullResult).toBe('');
   });
diff --git a/packages/manager/src/features/CloudPulse/Alerts/AlertsDetail/utils.ts b/packages/manager/src/features/CloudPulse/Alerts/AlertsDetail/utils.ts
index d56f165a53f..12467410ed3 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/AlertsDetail/utils.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/AlertsDetail/utils.ts
@@ -1,6 +1,7 @@
 import { transformDimensionValue } from '../Utils/utils';
 import {
   LINODE_DIMENSION_LABEL,
+  NODEBALANCER_DIMENSION_LABEL,
   transformationAllowedOperators,
   VPC_SUBNET_DIMENSION_LABEL,
 } from './constants';
@@ -82,6 +83,10 @@ export interface ResolvedDimensionValueProps {
    * linode id to label map
    */
   linodeMap: Record<string, string>;
+  /**
+   * nodebalancer id to label map.
+   */
+  nodebalancersMap: Record<string, string>;
   /**
    * Service type of the alert.
    */
@@ -108,6 +113,7 @@ export const getResolvedDimensionValue = (
     serviceType,
     value,
     vpcSubnetMap,
+    nodebalancersMap,
   } = props;
   if (!value) return '';
 
@@ -127,6 +133,13 @@ export const getResolvedDimensionValue = (
     resolvedValue = resolveIds(value, vpcSubnetMap);
   }
 
+  if (
+    dimensionFilterKey === NODEBALANCER_DIMENSION_LABEL &&
+    transformationAllowedOperators.includes(dimensionOperator)
+  ) {
+    resolvedValue = resolveIds(value, nodebalancersMap);
+  }
+
   return transformationAllowedOperators.includes(dimensionOperator)
     ? transformCommaSeperatedDimensionValues(
         resolvedValue,
diff --git a/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsResources.tsx b/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsResources.tsx
index cbc5daf1d74..837f6b45c1b 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsResources.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsResources.tsx
@@ -7,6 +7,7 @@ import EntityIcon from 'src/assets/icons/entityIcons/alertsresources.svg';
 import { DebouncedSearchTextField } from 'src/components/DebouncedSearchTextField';
 import { useResourcesQuery } from 'src/queries/cloudpulse/resources';
 
+import { filterFirewallResources } from '../../Utils/utils';
 import { StyledPlaceholder } from '../AlertsDetail/AlertDetail';
 import { MULTILINE_ERROR_SEPARATOR } from '../constants';
 import { AlertListNoticeMessages } from '../Utils/AlertListNoticeMessages';
@@ -41,6 +42,7 @@ import type {
   AlertDefinitionType,
   CloudPulseServiceType,
   Filter,
+  Firewall,
   Region,
 } from '@linode/api-v4';
 
@@ -64,6 +66,11 @@ export interface AlertResourcesProp {
    */
   alertType: AlertDefinitionType;
 
+  /**
+   * The entity type for firewall filtering (linode or nodebalancer)
+   */
+  entityType?: 'linode' | 'nodebalancer';
+
   /**
    * The error text that needs to displayed incase needed
    */
@@ -106,6 +113,7 @@ export const AlertResources = React.memo((props: AlertResourcesProp) => {
     alertLabel,
     alertResourceIds = [],
     alertType,
+    entityType,
     errorText,
     handleResourcesSelection,
     hideLabel,
@@ -194,7 +202,12 @@ export const AlertResources = React.memo((props: AlertResourcesProp) => {
     ), // Enable query only if serviceType and supportedRegionIds are available, in case of firewall only serviceType is needed
     serviceType,
     {},
-    xFilterToBeApplied
+    xFilterToBeApplied,
+    serviceType === 'firewall' && entityType ? entityType : undefined,
+    serviceType === 'firewall' && entityType
+      ? (resources: Firewall[]) =>
+          filterFirewallResources(resources, entityType)
+      : undefined
   );
 
   const regionFilteredResources = React.useMemo(() => {
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/CreateAlertDefinition.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/CreateAlertDefinition.tsx
index 251f26c56cb..a920ed1a2a3 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/CreateAlertDefinition.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/CreateAlertDefinition.tsx
@@ -28,6 +28,7 @@ import { TriggerConditions } from './Criteria/TriggerConditions';
 import { EntityScopeRenderer } from './EntityScopeRenderer';
 import { AlertEntityScopeSelect } from './GeneralInformation/AlertEntityScopeSelect';
 import { CloudPulseAlertSeveritySelect } from './GeneralInformation/AlertSeveritySelect';
+import { EntityTypeSelect } from './GeneralInformation/EntityTypeSelect';
 import { CloudPulseServiceSelect } from './GeneralInformation/ServiceTypeSelect';
 import { AddChannelListing } from './NotificationChannels/AddChannelListing';
 import { alertDefinitionFormSchema } from './schemas';
@@ -56,16 +57,17 @@ const criteriaInitialValues: MetricCriteriaForm = {
 };
 const initialValues: CreateAlertDefinitionForm = {
   channel_ids: [],
+  entity_ids: [],
+  entity_type: 'linode',
   label: '',
   rule_criteria: {
     rules: [criteriaInitialValues],
   },
+  scope: null,
   serviceType: null,
   severity: null,
   tags: [''],
   trigger_conditions: triggerConditionInitialValues,
-  entity_ids: [],
-  scope: null,
 };
 
 const overrides: CrumbOverridesProps[] = [
@@ -105,7 +107,7 @@ export const CreateAlertDefinition = () => {
 
   const { enqueueSnackbar } = useSnackbar();
   const { mutateAsync: createAlert } = useCreateAlertDefinition(
-    getValues('serviceType')!
+    getValues('serviceType') ?? ''
   );
 
   const serviceTypeWatcher = useWatch({ control, name: 'serviceType' });
@@ -162,6 +164,14 @@ export const CreateAlertDefinition = () => {
       defaultValue: triggerConditionInitialValues,
     });
     resetField('scope', { defaultValue: null });
+    resetField('entity_type', { defaultValue: 'linode' });
+  }, [resetField]);
+
+  const handleEntityTypeChange = React.useCallback(() => {
+    // Reset the criteria when entity type changes
+    resetField('rule_criteria.rules', {
+      defaultValue: [{ ...criteriaInitialValues }],
+    });
   }, [resetField]);
 
   React.useEffect(() => {
@@ -220,6 +230,12 @@ export const CreateAlertDefinition = () => {
               handleServiceTypeChange={handleServiceTypeChange}
               name="serviceType"
             />
+            {serviceTypeWatcher === 'firewall' && (
+              <EntityTypeSelect
+                name="entity_type"
+                onEntityTypeChange={handleEntityTypeChange}
+              />
+            )}
             <CloudPulseAlertSeveritySelect name="severity" />
             <AlertEntityScopeSelect
               name="scope"
@@ -228,7 +244,7 @@ export const CreateAlertDefinition = () => {
             <EntityScopeRenderer scope={scopeWatcher} />
             <MetricCriteriaField
               name="rule_criteria.rules"
-              serviceType={serviceTypeWatcher!}
+              serviceType={serviceTypeWatcher ?? null}
               setMaxInterval={(interval: number) =>
                 setMaxScrapeInterval(interval)
               }
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterField.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterField.tsx
index d581d51a0d2..3f6212cc472 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterField.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterField.tsx
@@ -74,6 +74,10 @@ export const DimensionFilterField = (props: DimensionFilterFieldProps) => {
     control,
     name: 'entity_ids',
   });
+  const entityType = useWatch({
+    control,
+    name: 'entity_type',
+  });
   const serviceType = useWatch({
     control,
     name: 'serviceType',
@@ -169,6 +173,7 @@ export const DimensionFilterField = (props: DimensionFilterFieldProps) => {
               dimensionLabel={dimensionFieldWatcher}
               disabled={!dimensionFieldWatcher}
               entities={entities}
+              entityType={entityType ?? undefined}
               errorText={fieldState.error?.message}
               name={name}
               onBlur={field.onBlur}
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/BlockStorageDimensionFilterAutcomplete.test.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/BlockStorageDimensionFilterAutocomplete.test.tsx
similarity index 100%
rename from packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/BlockStorageDimensionFilterAutcomplete.test.tsx
rename to packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/BlockStorageDimensionFilterAutocomplete.test.tsx
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/FirewallDimensionFilterAutocomplete.test.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/FirewallDimensionFilterAutocomplete.test.tsx
index 7a5dfee8293..0d178ecd584 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/FirewallDimensionFilterAutocomplete.test.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/FirewallDimensionFilterAutocomplete.test.tsx
@@ -14,11 +14,10 @@ const queryMocks = vi.hoisted(() => ({
 
 vi.mock('@linode/queries', async (importOriginal) => ({
   ...(await importOriginal()),
-  useRegionsQuery: queryMocks.useRegionsQuery.mockReturnValue({ data: [] }),
+  useRegionsQuery: queryMocks.useRegionsQuery,
 }));
 
 vi.mock('./useFirewallFetchOptions', () => ({
-  ...vi.importActual('./useFirewallFetchOptions'),
   useFirewallFetchOptions: queryMocks.useFirewallFetchOptions,
 }));
 
@@ -39,10 +38,17 @@ describe('<FirewallDimensionFilterAutocomplete />', () => {
     scope: 'account',
     serviceType: 'firewall',
     type: 'alerts',
+    entityType: 'linode',
   };
 
   beforeEach(() => {
     vi.clearAllMocks();
+    queryMocks.useRegionsQuery.mockReturnValue({ data: [] });
+    queryMocks.useFirewallFetchOptions.mockReturnValue({
+      values: [],
+      isLoading: false,
+      isError: false,
+    });
   });
 
   it('renders with options when values are provided', () => {
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/FirewallDimensionFilterAutocomplete.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/FirewallDimensionFilterAutocomplete.tsx
index 5dd6f3f1f2d..09b482f646d 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/FirewallDimensionFilterAutocomplete.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/FirewallDimensionFilterAutocomplete.tsx
@@ -17,28 +17,31 @@ export const FirewallDimensionFilterAutocomplete = (
 ) => {
   const {
     dimensionLabel,
-    serviceType,
-    scope,
+    disabled,
     entities,
+    entityType,
+    errorText,
+    fieldOnBlur,
+    fieldOnChange,
+    fieldValue,
     multiple,
     name,
-    fieldOnChange,
-    disabled,
-    fieldOnBlur,
     placeholderText,
-    errorText,
-    fieldValue,
+    scope,
+    serviceType,
     type,
   } = props;
 
   const { data: regions } = useRegionsQuery();
+
   const { values, isLoading, isError } = useFirewallFetchOptions({
+    associatedEntityType: entityType,
     dimensionLabel,
-    regions,
     entities,
+    regions,
+    scope,
     serviceType,
     type,
-    scope,
   });
 
   useCleanupStaleValues({
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/ValueFieldRenderer.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/ValueFieldRenderer.tsx
index 3bb1ce9d033..40a5e2ef8ed 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/ValueFieldRenderer.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/ValueFieldRenderer.tsx
@@ -19,6 +19,7 @@ import type {
   CloudPulseServiceType,
   DimensionFilterOperatorType,
 } from '@linode/api-v4';
+import type { AssociatedEntityType } from 'src/features/CloudPulse/shared/types';
 
 interface ValueFieldRendererProps {
   /**
@@ -35,6 +36,10 @@ interface ValueFieldRendererProps {
    * List of entity IDs used to filter resources like firewalls.
    */
   entities?: string[];
+  /**
+   * The entity type for firewall filtering (linode or nodebalancer).
+   */
+  entityType?: AssociatedEntityType;
   /**
    * Error message to be displayed under the input field, if any.
    */
@@ -87,20 +92,21 @@ interface ValueFieldRendererProps {
 
 export const ValueFieldRenderer = (props: ValueFieldRendererProps) => {
   const {
-    serviceType,
-    scope,
     dimensionLabel,
     disabled,
     entities,
+    entityType,
     errorText,
     name,
     onBlur,
     onChange,
     operator,
-    value,
-    values,
+    scope,
     selectedRegions,
+    serviceType,
     type = 'alerts',
+    value,
+    values,
   } = props;
   // Use operator group for config lookup
   const operatorGroup = getOperatorGroup(operator);
@@ -185,6 +191,8 @@ export const ValueFieldRenderer = (props: ValueFieldRendererProps) => {
           <FirewallDimensionFilterAutocomplete
             {...commonAutocompleteProps}
             entities={entities}
+            entityType={entityType}
+            placeholderText={config.placeholder ?? autocompletePlaceholder}
             scope={scope}
           />
         );
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/constants.ts b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/constants.ts
index 146eb7884ad..ff218f9c9a1 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/constants.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/constants.ts
@@ -408,6 +408,10 @@ export interface DimensionFilterAutocompleteProps {
    * List of entity IDs selected in the entity scope.
    */
   entities?: string[];
+  /**
+   * The entity type for firewall filtering (linode or nodebalancer).
+   */
+  entityType?: AssociatedEntityType;
   /**
    * Optional error message to display beneath the input.
    */
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/useFirewallFetchOptions.ts b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/useFirewallFetchOptions.ts
index e452d640931..9ccc7f688fc 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/useFirewallFetchOptions.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/useFirewallFetchOptions.ts
@@ -5,19 +5,21 @@ import {
 } from '@linode/queries';
 import { useMemo } from 'react';
 
+import { filterFirewallResources } from 'src/features/CloudPulse/Utils/utils';
 import { useResourcesQuery } from 'src/queries/cloudpulse/resources';
 
 import { filterRegionByServiceType } from '../../../Utils/utils';
 import {
   getFilteredFirewallParentEntities,
   getFirewallLinodes,
+  getFirewallNodebalancers,
   getLinodeRegions,
   getNodebalancerRegions,
   getVPCSubnets,
 } from './utils';
 
 import type { FetchOptions, FetchOptionsProps } from './constants';
-import type { Filter } from '@linode/api-v4';
+import type { Filter, Firewall } from '@linode/api-v4';
 
 /**
  * Custom hook to return selectable options based on the dimension type.
@@ -58,6 +60,7 @@ export function useFirewallFetchOptions(
     'linode_id',
     'region_id',
     'associated_entity_region',
+    'nodebalancer_id',
   ];
 
   // Fetch all firewall resources when dimension requires it
@@ -70,7 +73,12 @@ export function useFirewallFetchOptions(
     'firewall',
     {},
     {},
-    associatedEntityType // To avoid fetching resources for which the associated entity type is not supported
+    associatedEntityType,
+    associatedEntityType
+      ? (resources: Firewall[]) =>
+          filterFirewallResources(resources, associatedEntityType)
+      : undefined
+    // To avoid fetching resources for which the associated entity type is not supported
   );
   // Decide firewall resource IDs based on scope
   const filteredFirewallParentEntityIds = useMemo(() => {
@@ -140,6 +148,12 @@ export function useFirewallFetchOptions(
     [linodes]
   );
 
+  // Extract nodebalancers from filtered firewall resources
+  const firewallNodebalancers = useMemo(
+    () => getFirewallNodebalancers(nodebalancers ?? []),
+    [nodebalancers]
+  );
+
   // Extract unique regions from linodes
   const linodeRegions = useMemo(
     () => getLinodeRegions(linodes ?? []),
@@ -187,6 +201,12 @@ export function useFirewallFetchOptions(
         isError: isLinodesError || isResourcesError,
         isLoading: isLinodesLoading || isResourcesLoading,
       };
+    case 'nodebalancer_id':
+      return {
+        values: firewallNodebalancers,
+        isError: isNodebalancersError || isResourcesError,
+        isLoading: isNodebalancersLoading || isResourcesLoading,
+      };
     case 'region_id':
       return {
         values: linodeRegions,
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/utils.ts b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/utils.ts
index ab8be225fab..11498b8db95 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/utils.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/utils.ts
@@ -132,6 +132,25 @@ export const getFirewallLinodes = (
   }));
 };
 
+/**
+ * Extracts nodebalancer items from firewall resources.
+ * @param nodebalancers - List of nodebalancers.
+ * @returns - Flattened list of nodebalancer ID/label pairs as options.
+ */
+export const getFirewallNodebalancers = (
+  nodebalancers: NodeBalancer[]
+): Item<string, string>[] => {
+  if (!nodebalancers) return [];
+  return nodebalancers.map((nodebalancer) => ({
+    label: transformDimensionValue(
+      'firewall',
+      'nodebalancer_id',
+      nodebalancer.label
+    ),
+    value: String(nodebalancer.id),
+  }));
+};
+
 /**
  * Extracts unique region values from a list of linodes.
  * @param linodes - Linode objects with region information.
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/Metric.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/Metric.tsx
index e28bb635df9..d72bf2bdba0 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/Metric.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/Metric.tsx
@@ -6,6 +6,7 @@ import { Controller, useFormContext, useWatch } from 'react-hook-form';
 import type { FieldPathByValue } from 'react-hook-form';
 
 import {
+  entityLabelMap,
   metricAggregationOptions,
   metricOperatorOptions,
 } from '../../constants';
@@ -78,15 +79,25 @@ export const Metric = (props: MetricCriteriaProps) => {
       resetField(name, { defaultValue: fieldValue });
     }
   };
+  const serviceType = useWatch({ control, name: 'serviceType' });
+  const entityType = useWatch({ control, name: 'entity_type' });
 
   const metricOptions = React.useMemo(() => {
-    return data
-      ? data.map((metric) => ({
+    let filteredData = data;
+
+    // Filter firewall metrics based on entity type
+    if (serviceType === 'firewall' && entityType) {
+      const entityLabel = entityLabelMap[entityType];
+      filteredData = data.filter(({ label }) => label.includes(entityLabel));
+    }
+
+    return filteredData
+      ? filteredData.map((metric) => ({
           label: metric.label,
           value: metric.metric,
         }))
       : [];
-  }, [data]);
+  }, [data, entityType, serviceType]);
 
   const metricWatcher = useWatch({ control, name: `${name}.metric` });
 
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/GeneralInformation/EntityTypeSelect.test.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/GeneralInformation/EntityTypeSelect.test.tsx
new file mode 100644
index 00000000000..952574122dd
--- /dev/null
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/GeneralInformation/EntityTypeSelect.test.tsx
@@ -0,0 +1,132 @@
+import { screen, within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import * as React from 'react';
+
+import { renderWithThemeAndHookFormContext } from 'src/utilities/testHelpers';
+
+import { EntityTypeSelect } from './EntityTypeSelect';
+
+describe('EntityTypeSelect component tests', () => {
+  const onEntityChange = vi.fn();
+  const ENTITY_TYPE_SELECT_TEST_ID = 'entity-type-select';
+
+  it('should render the Autocomplete component', () => {
+    const { getAllByText, getByTestId } = renderWithThemeAndHookFormContext({
+      component: (
+        <EntityTypeSelect
+          name="entity_type"
+          onEntityTypeChange={onEntityChange}
+        />
+      ),
+    });
+    getByTestId(ENTITY_TYPE_SELECT_TEST_ID);
+    getAllByText('Entity Type');
+  });
+
+  it('should render entity type options', async () => {
+    renderWithThemeAndHookFormContext({
+      component: (
+        <EntityTypeSelect
+          name="entity_type"
+          onEntityTypeChange={onEntityChange}
+        />
+      ),
+    });
+    await userEvent.click(screen.getByRole('button', { name: 'Open' }));
+    expect(
+      await screen.findByRole('option', {
+        name: 'Linodes',
+      })
+    ).toBeVisible();
+    expect(
+      screen.getByRole('option', {
+        name: 'NodeBalancers',
+      })
+    ).toBeVisible();
+  });
+
+  it('should be able to select an entity type', async () => {
+    renderWithThemeAndHookFormContext({
+      component: (
+        <EntityTypeSelect
+          name="entity_type"
+          onEntityTypeChange={onEntityChange}
+        />
+      ),
+    });
+    await userEvent.click(screen.getByRole('button', { name: 'Open' }));
+    await userEvent.click(
+      await screen.findByRole('option', { name: 'Linodes' })
+    );
+    expect(screen.getByRole('combobox')).toHaveAttribute('value', 'Linodes');
+  });
+
+  it('should call onEntityTypeChange when selection changes', async () => {
+    renderWithThemeAndHookFormContext({
+      component: (
+        <EntityTypeSelect
+          name="entity_type"
+          onEntityTypeChange={onEntityChange}
+        />
+      ),
+    });
+    await userEvent.click(screen.getByRole('button', { name: 'Open' }));
+    await userEvent.click(
+      await screen.findByRole('option', { name: 'NodeBalancers' })
+    );
+    expect(onEntityChange).toHaveBeenCalled();
+  });
+
+  it('should not have a clear button since disableClearable is true', () => {
+    renderWithThemeAndHookFormContext({
+      component: (
+        <EntityTypeSelect
+          name="entity_type"
+          onEntityTypeChange={onEntityChange}
+        />
+      ),
+      useFormOptions: {
+        defaultValues: {
+          entity_type: 'linode',
+        },
+      },
+    });
+    const entityTypeDropdown = screen.getByTestId(ENTITY_TYPE_SELECT_TEST_ID);
+    expect(
+      within(entityTypeDropdown).queryByRole('button', { name: 'Clear' })
+    ).not.toBeInTheDocument();
+  });
+
+  it('should maintain selection and not allow clearing', async () => {
+    renderWithThemeAndHookFormContext({
+      component: (
+        <EntityTypeSelect
+          name="entity_type"
+          onEntityTypeChange={onEntityChange}
+        />
+      ),
+      useFormOptions: {
+        defaultValues: {
+          entity_type: 'linode',
+        },
+      },
+    });
+    expect(screen.getByRole('combobox')).toHaveAttribute('value', 'Linodes');
+
+    // Select a different option
+    await userEvent.click(screen.getByRole('button', { name: 'Open' }));
+    await userEvent.click(
+      await screen.findByRole('option', { name: 'NodeBalancers' })
+    );
+    expect(screen.getByRole('combobox')).toHaveAttribute(
+      'value',
+      'NodeBalancers'
+    );
+
+    // Verify there's no clear button
+    const entityTypeDropdown = screen.getByTestId(ENTITY_TYPE_SELECT_TEST_ID);
+    expect(
+      within(entityTypeDropdown).queryByRole('button', { name: 'Clear' })
+    ).not.toBeInTheDocument();
+  });
+});
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/GeneralInformation/EntityTypeSelect.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/GeneralInformation/EntityTypeSelect.tsx
new file mode 100644
index 00000000000..b5f00f52aed
--- /dev/null
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/GeneralInformation/EntityTypeSelect.tsx
@@ -0,0 +1,66 @@
+import { Autocomplete } from '@linode/ui';
+import * as React from 'react';
+import { Controller, useFormContext } from 'react-hook-form';
+import type { ControllerRenderProps, FieldPathByValue } from 'react-hook-form';
+
+import type { Item } from '../../constants';
+import type { CreateAlertDefinitionForm } from '../types';
+
+interface EntityTypeSelectProps {
+  /**
+   * name used for the component in the form
+   */
+  name: FieldPathByValue<
+    CreateAlertDefinitionForm,
+    'linode' | 'nodebalancer' | undefined
+  >;
+  /**
+   * Callback function triggered when entity type changes
+   */
+  onEntityTypeChange: () => void;
+}
+
+const entityTypeOptions: Item<string, 'linode' | 'nodebalancer'>[] = [
+  { label: 'Linodes', value: 'linode' },
+  { label: 'NodeBalancers', value: 'nodebalancer' },
+];
+
+export const EntityTypeSelect = (props: EntityTypeSelectProps) => {
+  const { name, onEntityTypeChange } = props;
+  const { control } = useFormContext<CreateAlertDefinitionForm>();
+
+  const handleAutocompleteChange = (
+    field: ControllerRenderProps<CreateAlertDefinitionForm, 'entity_type'>,
+    selected: null | { label: string; value: 'linode' | 'nodebalancer' }
+  ) => {
+    if (selected) {
+      field.onChange(selected.value);
+      onEntityTypeChange();
+    }
+  };
+
+  return (
+    <Controller
+      control={control}
+      name={name}
+      render={({ field, fieldState }) => (
+        <Autocomplete
+          data-testid="entity-type-select"
+          disableClearable
+          errorText={fieldState.error?.message}
+          fullWidth
+          label="Entity Type"
+          onBlur={field.onBlur}
+          onChange={(_, selected) => handleAutocompleteChange(field, selected)}
+          options={entityTypeOptions}
+          placeholder="Select an Entity Type"
+          sx={{ marginTop: '5px' }}
+          value={
+            entityTypeOptions.find((option) => option.value === field.value) ??
+            undefined
+          }
+        />
+      )}
+    />
+  );
+};
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Resources/CloudPulseModifyAlertResources.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Resources/CloudPulseModifyAlertResources.tsx
index fb3b97f1da1..9abedb51d48 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Resources/CloudPulseModifyAlertResources.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Resources/CloudPulseModifyAlertResources.tsx
@@ -22,7 +22,7 @@ export const CloudPulseModifyAlertResources = React.memo(
     const { name } = props;
     const { control, setValue } = useFormContext<CreateAlertDefinitionForm>();
     const serviceTypeWatcher = useWatch({ control, name: 'serviceType' });
-
+    const entityTypeWatcher = useWatch({ control, name: 'entity_type' });
     const flags = useFlags();
 
     const maxSelectionCount = React.useMemo(() => {
@@ -63,6 +63,7 @@ export const CloudPulseModifyAlertResources = React.memo(
               <AlertResources
                 alertResourceIds={field.value ?? []}
                 alertType="user"
+                entityType={entityTypeWatcher}
                 errorText={fieldState.error?.message}
                 handleResourcesSelection={handleResourcesSelection}
                 hideLabel
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/schemas.ts b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/schemas.ts
index 263aa285705..04f48098d79 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/schemas.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/schemas.ts
@@ -8,6 +8,7 @@ import { array, lazy, mixed, number, object, string } from 'yup';
 
 import { getDimensionFilterValueSchema } from './Criteria/DimensionFilterValue/ValueSchemas';
 
+import type { AssociatedEntityType } from '../../shared/types';
 import type { AlertSeverityType, CloudPulseServiceType } from '@linode/api-v4';
 import type { AlertDefinitionScope } from '@linode/api-v4';
 
@@ -72,6 +73,13 @@ export const triggerConditionSchema = triggerConditionValidation.concat(
 export const alertDefinitionFormSchema = createAlertDefinitionSchema.concat(
   object({
     entity_ids: array().of(string().defined()).optional(),
+    entity_type: mixed<AssociatedEntityType>()
+      .oneOf(['linode', 'nodebalancer'])
+      .when('serviceType', {
+        is: 'firewall',
+        then: (schema) => schema.required(fieldErrorMessage),
+        otherwise: (schema) => schema.optional(),
+      }),
     rule_criteria: object({
       rules: array()
         .of(metricCriteriaSchema)
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/types.ts b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/types.ts
index 831fef99561..2e4f1319e06 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/types.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/types.ts
@@ -1,3 +1,4 @@
+import type { AssociatedEntityType } from '../../shared/types';
 import type {
   AlertDefinitionScope,
   AlertSeverityType,
@@ -18,6 +19,7 @@ export interface CreateAlertDefinitionForm
     'rule_criteria' | 'severity' | 'trigger_conditions'
   > {
   entity_ids?: string[];
+  entity_type?: AssociatedEntityType;
   regions?: string[];
   rule_criteria: {
     rules: MetricCriteriaForm[];
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/utilities.ts b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/utilities.ts
index c97ab56fa34..d5a18e9cfca 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/utilities.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/utilities.ts
@@ -25,6 +25,7 @@ export const filterFormValues = (
     'severity',
     'rule_criteria',
     'trigger_conditions',
+    'entity_type',
   ]);
   const severity = formValues.severity ?? 1;
   const entityIds = formValues.entity_ids;
diff --git a/packages/manager/src/features/CloudPulse/Alerts/EditAlert/EditAlertDefinition.tsx b/packages/manager/src/features/CloudPulse/Alerts/EditAlert/EditAlertDefinition.tsx
index fde8e754be3..a9a39877065 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/EditAlert/EditAlertDefinition.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/EditAlert/EditAlertDefinition.tsx
@@ -14,6 +14,7 @@ import { useCloudPulseServiceByServiceType } from 'src/queries/cloudpulse/servic
 
 import {
   CREATE_ALERT_ERROR_FIELD_MAP as EDIT_ALERT_ERROR_FIELD_MAP,
+  entityLabelMap,
   MULTILINE_ERROR_SEPARATOR,
   SINGLELINE_ERROR_SEPARATOR,
   UPDATE_ALERT_SUCCESS_MESSAGE,
@@ -23,6 +24,7 @@ import { TriggerConditions } from '../CreateAlert/Criteria/TriggerConditions';
 import { EntityScopeRenderer } from '../CreateAlert/EntityScopeRenderer';
 import { AlertEntityScopeSelect } from '../CreateAlert/GeneralInformation/AlertEntityScopeSelect';
 import { CloudPulseAlertSeveritySelect } from '../CreateAlert/GeneralInformation/AlertSeveritySelect';
+import { EntityTypeSelect } from '../CreateAlert/GeneralInformation/EntityTypeSelect';
 import { CloudPulseServiceSelect } from '../CreateAlert/GeneralInformation/ServiceTypeSelect';
 import { AddChannelListing } from '../CreateAlert/NotificationChannels/AddChannelListing';
 import { alertDefinitionFormSchema } from '../CreateAlert/schemas';
@@ -64,12 +66,23 @@ export const EditAlertDefinition = (props: EditAlertProps) => {
     alertDetails,
     serviceType
   );
+
+  const entityType =
+    serviceType === 'firewall'
+      ? alertDetails.rule_criteria.rules[0]?.label.includes(
+          entityLabelMap['nodebalancer']
+        )
+        ? 'nodebalancer'
+        : 'linode'
+      : undefined;
+
   const flags = useFlags();
   const formMethods = useForm<EditAlertDefintionForm>({
     defaultValues: {
       ...filteredAlertDefinitionValues,
       serviceType,
       scope: alertDetails.scope,
+      entity_type: entityType,
     },
     mode: 'onBlur',
     resolver: yupResolver(
@@ -135,7 +148,21 @@ export const EditAlertDefinition = (props: EditAlertProps) => {
       position: 1,
     },
   ];
-
+  const { resetField } = formMethods;
+  const handleEntityTypeChange = React.useCallback(() => {
+    // Reset the criteria when entity type changes
+    resetField('rule_criteria.rules', {
+      defaultValue: [
+        {
+          aggregate_function: null,
+          dimension_filters: [],
+          metric: null,
+          operator: null,
+          threshold: 0,
+        },
+      ],
+    });
+  }, [resetField]);
   const previousSubmitCount = React.useRef<number>(0);
   React.useEffect(() => {
     if (
@@ -187,6 +214,12 @@ export const EditAlertDefinition = (props: EditAlertProps) => {
             )}
           />
           <CloudPulseServiceSelect isDisabled name="serviceType" />
+          {serviceType === 'firewall' && (
+            <EntityTypeSelect
+              name="entity_type"
+              onEntityTypeChange={handleEntityTypeChange}
+            />
+          )}
           <CloudPulseAlertSeveritySelect name="severity" />
           <AlertEntityScopeSelect
             disabled
diff --git a/packages/manager/src/features/CloudPulse/Alerts/constants.ts b/packages/manager/src/features/CloudPulse/Alerts/constants.ts
index f5d0b2b309f..d796dad6c75 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/constants.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/constants.ts
@@ -269,3 +269,8 @@ export const HELPER_TEXT_MAP: Record<string, Record<string, string>> = {
     default: CONFIG_ERROR_MESSAGE,
   },
 };
+
+export const entityLabelMap = {
+  linode: 'Linode',
+  nodebalancer: 'Node Balancer',
+};
diff --git a/packages/manager/src/features/CloudPulse/shared/DimensionTransform.ts b/packages/manager/src/features/CloudPulse/shared/DimensionTransform.ts
index d90b7c1d669..6546b576342 100644
--- a/packages/manager/src/features/CloudPulse/shared/DimensionTransform.ts
+++ b/packages/manager/src/features/CloudPulse/shared/DimensionTransform.ts
@@ -31,6 +31,8 @@ export const DIMENSION_TRANSFORM_CONFIG: Partial<
     interface_type: TRANSFORMS.uppercase,
     linode_id: TRANSFORMS.original,
     nodebalancer_id: TRANSFORMS.original,
+    ip_version: TRANSFORMS.original,
+    region_id: TRANSFORMS.original,
   },
   nodebalancer: {
     protocol: TRANSFORMS.uppercase,
diff --git a/packages/manager/src/mocks/serverHandlers.ts b/packages/manager/src/mocks/serverHandlers.ts
index 4c98a005962..ee7e446336b 100644
--- a/packages/manager/src/mocks/serverHandlers.ts
+++ b/packages/manager/src/mocks/serverHandlers.ts
@@ -66,6 +66,7 @@ import {
   firewallFactory,
   firewallMetricDefinitionsResponse,
   firewallMetricRulesFactory,
+  firewallNodebalancerMetricCriteria,
   firewallPrefixListFactory,
   firewallRuleFactory,
   firewallRuleSetFactory,
@@ -1304,6 +1305,18 @@ export const handlers = [
           }),
         ],
       }),
+      firewallFactory.build({
+        label: 'Firewall - Nodebalancer',
+        id: 25,
+        entities: [
+          firewallEntityfactory.build({
+            type: 'nodebalancer',
+            label: 'Nodebalancer-test',
+            parent_entity: null,
+            id: 333,
+          }),
+        ],
+      }),
       // Firewall with the Rule and RuleSet Reference
       firewallFactory.build({
         id: 1001,
@@ -1407,6 +1420,13 @@ export const handlers = [
   }),
   http.get('*/v4/nodebalancers', () => {
     const nodeBalancers = nodeBalancerFactory.buildList(3);
+    nodeBalancers.push(
+      nodeBalancerFactory.build({
+        id: 333,
+        label: 'NodeBalancer-33',
+        region: 'ap-west',
+      })
+    );
     return HttpResponse.json(makeResourcePage(nodeBalancers));
   }),
   http.get('*/v4/nodebalancers/types', () => {
@@ -3189,6 +3209,16 @@ export const handlers = [
           rules: [blockStorageMetricCriteria.build()],
         },
       }),
+      alertFactory.build({
+        id: 650,
+        label: 'Firewall - nodebalancer',
+        type: 'user',
+        service_type: 'firewall',
+        entity_ids: ['25'],
+        rule_criteria: {
+          rules: [firewallNodebalancerMetricCriteria.build()],
+        },
+      }),
     ];
     return HttpResponse.json(makeResourcePage(alerts));
   }),
@@ -3198,11 +3228,12 @@ export const handlers = [
       if (params.id === '999' && params.serviceType === 'firewall') {
         return HttpResponse.json(
           alertFactory.build({
+            scope: 'entity',
+            entity_ids: ['1', '2', '3'],
             id: 999,
             label: 'Firewall - testing',
             service_type: 'firewall',
             type: 'user',
-            scope: 'account',
             rule_criteria: {
               rules: [firewallMetricRulesFactory.build()],
             },
@@ -3240,6 +3271,21 @@ export const handlers = [
           })
         );
       }
+      if (params.id === '650' && params.serviceType === 'firewall') {
+        return HttpResponse.json(
+          alertFactory.build({
+            id: 650,
+            label: 'Firewall - nodebalancer',
+            type: 'user',
+            scope: 'entity',
+            service_type: 'firewall',
+            entity_ids: ['25'],
+            rule_criteria: {
+              rules: [firewallNodebalancerMetricCriteria.build()],
+            },
+          })
+        );
+      }
       if (params.id !== undefined) {
         return HttpResponse.json(
           alertFactory.build({
@@ -3306,6 +3352,21 @@ export const handlers = [
           })
         );
       }
+      if (params.id === '650' && params.serviceType === 'firewall') {
+        return HttpResponse.json(
+          alertFactory.build({
+            id: 650,
+            label: 'Firewall - nodebalancer',
+            type: 'user',
+            scope: 'entity',
+            service_type: 'firewall',
+            entity_ids: ['25'],
+            rule_criteria: {
+              rules: [firewallNodebalancerMetricCriteria.build()],
+            },
+          })
+        );
+      }
       const body: any = request.json();
       return HttpResponse.json(
         alertFactory.build({

From ad6aaa2c43c0a71108f6da0bd04689d0c6ffd8a5 Mon Sep 17 00:00:00 2001
From: Alban Bailly <130582365+abailly-akamai@users.noreply.github.com>
Date: Thu, 20 Nov 2025 09:16:39 +0100
Subject: [PATCH 21/91] fix: [UIE-9657] - Alignment with Linode row backup cell
 icon (#13098)

* fix alignment

* Added changeset: Alignment with Linode row backup cell icon
---
 packages/manager/.changeset/pr-13098-fixed-1763371721536.md  | 5 +++++
 .../manager/src/components/BackupStatus/BackupStatus.tsx     | 4 ++++
 2 files changed, 9 insertions(+)
 create mode 100644 packages/manager/.changeset/pr-13098-fixed-1763371721536.md

diff --git a/packages/manager/.changeset/pr-13098-fixed-1763371721536.md b/packages/manager/.changeset/pr-13098-fixed-1763371721536.md
new file mode 100644
index 00000000000..c7e5164cde8
--- /dev/null
+++ b/packages/manager/.changeset/pr-13098-fixed-1763371721536.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+Alignment with Linode row backup cell icon ([#13098](https://github.com/linode/manager/pull/13098))
diff --git a/packages/manager/src/components/BackupStatus/BackupStatus.tsx b/packages/manager/src/components/BackupStatus/BackupStatus.tsx
index 32b1a2751c0..95d5a831c44 100644
--- a/packages/manager/src/components/BackupStatus/BackupStatus.tsx
+++ b/packages/manager/src/components/BackupStatus/BackupStatus.tsx
@@ -12,11 +12,13 @@ const useStyles = makeStyles<void, 'icon'>()(
   (theme: Theme, _params, classes) => ({
     backupLink: {
       '&:hover': {
+        textDecoration: 'none',
         [`& .${classes.icon}`]: {
           fill: theme.palette.primary.main,
         },
       },
       display: 'flex',
+      alignItems: 'center',
     },
     backupNotApplicable: {
       marginRight: theme.spacing(),
@@ -30,6 +32,8 @@ const useStyles = makeStyles<void, 'icon'>()(
     icon: {
       fill: theme.color.grey1,
       fontSize: 18,
+      top: -1,
+      position: 'relative',
     },
     tooltip: {
       maxWidth: 275,

From f9d97e8a3f2fe744025e07641688009e8cd8acb8 Mon Sep 17 00:00:00 2001
From: Purvesh Makode <pmakode@akamai.com>
Date: Thu, 20 Nov 2025 14:31:35 +0530
Subject: [PATCH 22/91] fix: [M3-10709] - `firewall_id` error on LKE pool
 update (#13109)

* Fix firewall_id error on LKE E pool update

* Added changeset: The `firewall_id` error on LKE pool update

* Add comments and update false check instances

* Revert accidental removal of update_strategy
---
 .../manager/.changeset/pr-13109-fixed-1763535418420.md |  5 +++++
 .../ConfigureNodePool/ConfigureNodePoolForm.tsx        | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13109-fixed-1763535418420.md

diff --git a/packages/manager/.changeset/pr-13109-fixed-1763535418420.md b/packages/manager/.changeset/pr-13109-fixed-1763535418420.md
new file mode 100644
index 00000000000..5ed542147bf
--- /dev/null
+++ b/packages/manager/.changeset/pr-13109-fixed-1763535418420.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+The `firewall_id` error on LKE pool update ([#13109](https://github.com/linode/manager/pull/13109))
diff --git a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/NodePoolsDisplay/ConfigureNodePool/ConfigureNodePoolForm.tsx b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/NodePoolsDisplay/ConfigureNodePool/ConfigureNodePoolForm.tsx
index e450fdfef2e..bd19c9844aa 100644
--- a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/NodePoolsDisplay/ConfigureNodePool/ConfigureNodePoolForm.tsx
+++ b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/NodePoolsDisplay/ConfigureNodePool/ConfigureNodePoolForm.tsx
@@ -46,7 +46,13 @@ export const ConfigureNodePoolForm = (props: Props) => {
       // @TODO allow users to edit Node Pool `label` and `tags` because the API supports it. (ECE-353)
       // label: nodePool.label,
       // tags: nodePool.tags,
-      firewall_id: nodePool.firewall_id,
+
+      /**
+       * We set the default value of the form field to `undefined` if `nodePool.firewall_id` is null.
+       * This ensures the field remains controlled in React Hook Form and is properly initialized,
+       * preventing unexpected validation errors when the initial value is null.
+       */
+      firewall_id: nodePool.firewall_id ?? undefined,
       update_strategy: nodePool.update_strategy,
       k8s_version: nodePool.k8s_version,
     },
@@ -87,7 +93,7 @@ export const ConfigureNodePoolForm = (props: Props) => {
             clusterTier={clusterTier ?? 'standard'}
             firewallSelectOptions={{
               allowFirewallRemoval: clusterTier === 'standard',
-              ...(nodePool.firewall_id !== 0 && {
+              ...(nodePool.firewall_id !== null && {
                 disableDefaultFirewallRadio: true,
                 defaultFirewallRadioTooltip:
                   "You can't use this option once an existing Firewall has been selected.",

From 73a7ca40d559ef88e1d3ec46f82d0e57a6a3da45 Mon Sep 17 00:00:00 2001
From: Harsh Shankar Rao <hrao@akamai.com>
Date: Fri, 21 Nov 2025 10:09:47 +0530
Subject: [PATCH 23/91] upcoming: [UIE-6561] - Add NLB Detail Paper (#13103)

* upcoming: [UIE-9559, UIE-9560] - Implement routing for Network Load Balancer

* upcoming: [UIE-9558] - Add new API endpoints, types and queries for Network Load Balancer

* added support for feature flag

* PR feedback @tanushree-akamai

* add unit test for Network Load Balancers Item in primary nav component

* Adding changesets

* Fix type specification for NLB.

* Use named parameter interfaces for api-v4 client functions with 3+ arguments.

* Added changeset: Implement feature flag and routing for NLB

* upcoming: [UIE-6561] - Add NLB Detail Paper

* remove body border from detail paper

* small fixes

* PR feedback

* fixed failing unit test

* fix responsiveness

* remove template literals for variables

* correct the kubernetes hyperlink

---------

Co-authored-by: Tanushree Bhattacharji <tbhattac@akamai.com>
---
 packages/api-v4/src/regions/types.ts          |   1 +
 ...torageDimensionFilterAutocomplete.test.tsx |   2 +-
 .../NetworkLoadBalancerDetailBody.tsx         | 139 ++++++++++++++++++
 .../NetworkLoadBalancerDetailHeader.tsx       |  53 +++++++
 .../NetworkLoadBalancerDetailLazyRoute.ts     |   9 ++
 .../NetworkLoadBalancersDetail.test.tsx       | 126 ++++++++++++++++
 .../NetworkLoadBalancersDetail.tsx            |  70 +++++++++
 .../src/routes/networkLoadBalancer/index.ts   |  35 ++++-
 8 files changed, 432 insertions(+), 3 deletions(-)
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerDetailBody.tsx
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerDetailHeader.tsx
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerDetailLazyRoute.ts
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersDetail.test.tsx
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersDetail.tsx

diff --git a/packages/api-v4/src/regions/types.ts b/packages/api-v4/src/regions/types.ts
index 4da65b28c95..e4fa034d08a 100644
--- a/packages/api-v4/src/regions/types.ts
+++ b/packages/api-v4/src/regions/types.ts
@@ -19,6 +19,7 @@ export type Capabilities =
   | 'Managed Databases'
   | 'Metadata'
   | 'NETINT Quadra T1U'
+  | 'Network LoadBalancer'
   | 'NodeBalancers'
   | 'Object Storage'
   | 'Placement Group'
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/BlockStorageDimensionFilterAutocomplete.test.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/BlockStorageDimensionFilterAutocomplete.test.tsx
index 013d6248fc7..4cc6895b63f 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/BlockStorageDimensionFilterAutocomplete.test.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/BlockStorageDimensionFilterAutocomplete.test.tsx
@@ -317,4 +317,4 @@ describe('<BlockStorageDimensionFilterAutocomplete />', () => {
       expect(fieldOnChange).toHaveBeenCalledWith('');
     });
   });
-});
\ No newline at end of file
+});
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerDetailBody.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerDetailBody.tsx
new file mode 100644
index 00000000000..234d51b27a9
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerDetailBody.tsx
@@ -0,0 +1,139 @@
+import { useProfile, useRegionQuery } from '@linode/queries';
+import { Box, Stack, Typography } from '@linode/ui';
+import { Grid, styled } from '@mui/material';
+import * as React from 'react';
+
+import { Link } from 'src/components/Link';
+import { AccessTable } from 'src/features/Linodes/AccessTable';
+import { StyledBodyGrid } from 'src/features/Linodes/LinodeEntityDetail.styles';
+import { formatDate } from 'src/utilities/formatDate';
+
+import type { LKEClusterInfo } from '@linode/api-v4';
+
+interface NetworkLoadBalancerDetailBodyInterface {
+  addressV4: string;
+  addressV6: string;
+  createdDate: string;
+  lkeCluster?: LKEClusterInfo;
+  nlbId: number;
+  region: string;
+  updatedDate: string;
+}
+
+export const NetworkLoadBalancerDetailBody = (
+  props: NetworkLoadBalancerDetailBodyInterface
+) => {
+  const {
+    addressV4,
+    addressV6,
+    createdDate,
+    lkeCluster,
+    nlbId,
+    region,
+    updatedDate,
+  } = props;
+
+  const { data: profile } = useProfile();
+  const { data: regionData } = useRegionQuery(region);
+
+  const regionLabel = regionData?.label ?? region;
+
+  return (
+    <StyledBodyGrid container spacing={2} sx={{ mb: 0 }}>
+      <Grid
+        container
+        direction="row"
+        size={{
+          sm: 6,
+          xs: 12,
+        }}
+      >
+        <Grid
+          size={{
+            sm: 6,
+          }}
+        >
+          <Stack spacing={2}>
+            <Box>
+              <StyledTypography>Region</StyledTypography>
+              {regionLabel}
+            </Box>
+            <Box>
+              <StyledTypography>LKE-E Cluster</StyledTypography>
+              {lkeCluster ? (
+                <>
+                  <Link
+                    accessibleAriaLabel={`LKE-E Cluster ${lkeCluster.label}`}
+                    className="secondaryLink"
+                    to={`/kubernetes/clusters/${lkeCluster.id}`}
+                  >
+                    {lkeCluster.label}
+                  </Link>
+                  {` (ID: ${lkeCluster.id})`}
+                </>
+              ) : (
+                'N/A'
+              )}
+            </Box>
+            <Box>
+              <StyledTypography>Network Load Balancer ID</StyledTypography>
+              {nlbId}
+            </Box>
+          </Stack>
+        </Grid>
+        <Grid
+          size={{
+            sm: 6,
+          }}
+        >
+          <Stack spacing={2}>
+            <Box>
+              <StyledTypography>Created</StyledTypography>
+              {formatDate(createdDate, {
+                timezone: profile?.timezone,
+              })}
+            </Box>
+            <Box>
+              <StyledTypography>Updated</StyledTypography>
+              {formatDate(updatedDate, {
+                timezone: profile?.timezone,
+              })}
+            </Box>
+          </Stack>
+        </Grid>
+      </Grid>
+      <Grid
+        container
+        direction="row"
+        size={{
+          sm: 6,
+          xs: 12,
+        }}
+      >
+        <Grid container size={12}>
+          <AccessTable
+            gridSize={{ lg: 12, xs: 12 }}
+            rows={[
+              {
+                heading: 'Virtual IP (IPv4)',
+                isMasked: false,
+                text: addressV4,
+              },
+              {
+                heading: 'Virtual IP (IPv6)',
+                isMasked: false,
+                text: addressV6,
+              },
+            ]}
+            sx={{ padding: 0 }}
+            title=""
+          />
+        </Grid>
+      </Grid>
+    </StyledBodyGrid>
+  );
+};
+
+const StyledTypography = styled(Typography)(({ theme }) => ({
+  font: theme.font.bold,
+}));
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerDetailHeader.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerDetailHeader.tsx
new file mode 100644
index 00000000000..e03cfb13f28
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerDetailHeader.tsx
@@ -0,0 +1,53 @@
+import { Box, Stack, Typography } from '@linode/ui';
+import * as React from 'react';
+
+import { EntityHeader } from 'src/components/EntityHeader/EntityHeader';
+import { StatusIcon } from 'src/components/StatusIcon/StatusIcon';
+
+import type { NetworkLoadBalancerStatus } from '@linode/api-v4';
+
+export const NetworkLoadBalancerDetailHeader = (props: {
+  status: NetworkLoadBalancerStatus;
+}) => {
+  const { status } = props;
+
+  const statusIcon = () => {
+    if (status === 'active') {
+      return 'active';
+    }
+    if (['canceled', 'suspended'].includes(status)) {
+      return 'inactive';
+    }
+    return 'other';
+  };
+
+  return (
+    <EntityHeader>
+      <Box
+        sx={(theme) => ({
+          alignItems: 'center',
+          display: 'flex',
+          flexWrap: 'wrap',
+          padding: `${theme.spacingFunction(13)} 0 ${theme.spacingFunction(13)} ${theme.spacingFunction(16)}`,
+        })}
+      >
+        <Stack
+          alignItems="center"
+          aria-label={`nlb status ${status}`}
+          data-qa-nlb-status
+          direction="row"
+          spacing={1.25}
+        >
+          <StatusIcon status={statusIcon()} />
+          <Typography
+            sx={(theme) => ({
+              font: theme.font.bold,
+            })}
+          >
+            {status.toUpperCase()}
+          </Typography>
+        </Stack>
+      </Box>
+    </EntityHeader>
+  );
+};
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerDetailLazyRoute.ts b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerDetailLazyRoute.ts
new file mode 100644
index 00000000000..b8b45c46826
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerDetailLazyRoute.ts
@@ -0,0 +1,9 @@
+import { createLazyRoute } from '@tanstack/react-router';
+
+import NetworkLoadBalancersDetail from './NetworkLoadBalancersDetail';
+
+export const networkLoadBalancerDetailLazyRoute = createLazyRoute(
+  '/netloadbalancers/$id'
+)({
+  component: NetworkLoadBalancersDetail,
+});
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersDetail.test.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersDetail.test.tsx
new file mode 100644
index 00000000000..e1da99e0a4e
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersDetail.test.tsx
@@ -0,0 +1,126 @@
+import { regionFactory } from '@linode/utilities';
+import * as React from 'react';
+
+import { networkLoadBalancerFactory } from 'src/factories/networkLoadBalancer';
+import { formatDate } from 'src/utilities/formatDate';
+import { mockMatchMedia, renderWithTheme } from 'src/utilities/testHelpers';
+
+import NetworkLoadBalancersDetail from './NetworkLoadBalancersDetail';
+
+const queryMocks = vi.hoisted(() => ({
+  useNetworkLoadBalancerQuery: vi.fn().mockReturnValue({}),
+  useParams: vi.fn().mockReturnValue({}),
+  useProfile: vi.fn().mockReturnValue({}),
+  useRegionQuery: vi.fn().mockReturnValue({}),
+}));
+
+vi.mock('@linode/queries', async () => {
+  const actual = await vi.importActual('@linode/queries');
+  return {
+    ...actual,
+    useProfile: queryMocks.useProfile,
+    useRegionQuery: queryMocks.useRegionQuery,
+    useNetworkLoadBalancerQuery: queryMocks.useNetworkLoadBalancerQuery,
+  };
+});
+
+vi.mock('@tanstack/react-router', async () => {
+  const actual = await vi.importActual('@tanstack/react-router');
+  return {
+    ...actual,
+    useParams: queryMocks.useParams,
+  };
+});
+
+beforeAll(() => mockMatchMedia());
+
+const mockRegion = regionFactory.build({
+  id: 'us-east',
+  capabilities: ['Network LoadBalancer'],
+  label: 'US, Newark, NJ',
+});
+
+describe('NetworkLoadBalancersDetail', () => {
+  beforeEach(() => {
+    queryMocks.useParams.mockReturnValue({
+      id: 1,
+    });
+    queryMocks.useRegionQuery.mockReturnValue({ data: mockRegion });
+  });
+
+  it('renders a loading state', () => {
+    queryMocks.useNetworkLoadBalancerQuery.mockReturnValue({
+      isLoading: true,
+    });
+
+    const { getByTestId } = renderWithTheme(<NetworkLoadBalancersDetail />);
+
+    expect(getByTestId('circle-progress')).toBeInTheDocument();
+  });
+
+  it('renders an error state', () => {
+    queryMocks.useNetworkLoadBalancerQuery.mockReturnValue({
+      isLoading: false,
+      error: true,
+    });
+
+    const { getByText } = renderWithTheme(<NetworkLoadBalancersDetail />);
+
+    expect(
+      getByText('There was a problem retrieving your NLB. Please try again.')
+    ).toBeInTheDocument();
+  });
+
+  it('renders the NLB details', () => {
+    const nlbFactory = networkLoadBalancerFactory.build();
+    queryMocks.useNetworkLoadBalancerQuery.mockReturnValue({
+      isLoading: false,
+      data: nlbFactory,
+    });
+
+    const { getByText } = renderWithTheme(<NetworkLoadBalancersDetail />);
+
+    expect(getByText('ACTIVE')).toBeInTheDocument();
+
+    expect(getByText('Virtual IP (IPv4)')).toBeInTheDocument();
+    expect(getByText(nlbFactory.address_v4)).toBeInTheDocument();
+
+    expect(getByText('Virtual IP (IPv6)')).toBeInTheDocument();
+    expect(getByText(nlbFactory.address_v6)).toBeInTheDocument();
+
+    expect(getByText('Region')).toBeInTheDocument();
+    expect(getByText('US, Newark, NJ')).toBeInTheDocument();
+
+    expect(getByText('LKE-E Cluster')).toBeInTheDocument();
+    expect(getByText('N/A')).toBeInTheDocument();
+
+    expect(getByText('Network Load Balancer ID')).toBeInTheDocument();
+    expect(getByText(nlbFactory.id)).toBeInTheDocument();
+
+    expect(getByText('Created')).toBeInTheDocument();
+    expect(getByText(formatDate(nlbFactory.created))).toBeInTheDocument();
+
+    expect(getByText('Updated')).toBeInTheDocument();
+    expect(getByText(formatDate(nlbFactory.updated))).toBeInTheDocument();
+  });
+
+  it('renders LKE Details if the NLB is associated with an LKE cluster', () => {
+    const nlbFactory = networkLoadBalancerFactory.build({
+      lke_cluster: { id: 1, label: 'Test Cluster' },
+    });
+    queryMocks.useNetworkLoadBalancerQuery.mockReturnValue({
+      isLoading: false,
+      data: nlbFactory,
+    });
+
+    const { getByText } = renderWithTheme(<NetworkLoadBalancersDetail />);
+
+    expect(getByText('LKE-E Cluster')).toBeInTheDocument();
+    expect(getByText(nlbFactory.lke_cluster!.label)).toBeInTheDocument();
+    expect(
+      getByText(`(ID: ${nlbFactory.lke_cluster!.id})`, {
+        exact: false,
+      })
+    ).toBeInTheDocument();
+  });
+});
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersDetail.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersDetail.tsx
new file mode 100644
index 00000000000..545d4fcad59
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersDetail.tsx
@@ -0,0 +1,70 @@
+import { useNetworkLoadBalancerQuery } from '@linode/queries';
+import { CircleProgress, ErrorState } from '@linode/ui';
+import { useParams } from '@tanstack/react-router';
+import * as React from 'react';
+
+import { DocumentTitleSegment } from 'src/components/DocumentTitle';
+import { EntityDetail } from 'src/components/EntityDetail/EntityDetail';
+import { LandingHeader } from 'src/components/LandingHeader';
+
+import { NetworkLoadBalancerDetailBody } from './NetworkLoadBalancerDetailBody';
+import { NetworkLoadBalancerDetailHeader } from './NetworkLoadBalancerDetailHeader';
+
+const NetworkLoadBalancersDetail = () => {
+  const params = useParams({ strict: false });
+  const { id } = params;
+
+  const {
+    data: nlb,
+    error,
+    isLoading,
+  } = useNetworkLoadBalancerQuery(Number(id) || -1, true);
+
+  if (isLoading) {
+    return <CircleProgress />;
+  }
+
+  if (!nlb || error) {
+    return (
+      <ErrorState errorText="There was a problem retrieving your NLB. Please try again." />
+    );
+  }
+
+  return (
+    <>
+      <DocumentTitleSegment segment="Network Load Balancer" />
+      <LandingHeader
+        breadcrumbProps={{
+          labelOptions: { noCap: true },
+          crumbOverrides: [
+            {
+              label: 'Network Load Balancer',
+              position: 1,
+            },
+          ],
+          pathname: `/netloadbalancers/${nlb.id}`,
+        }}
+        docsLabel="Docs"
+        docsLink="https://techdocs.akamai.com/linode-api/changelog/network-load-balancers"
+        title={nlb.label}
+      />
+      <EntityDetail
+        body={
+          <NetworkLoadBalancerDetailBody
+            addressV4={nlb.address_v4}
+            addressV6={nlb.address_v6}
+            createdDate={nlb.created}
+            lkeCluster={nlb.lke_cluster}
+            nlbId={nlb.id}
+            region={nlb.region}
+            updatedDate={nlb.updated}
+          />
+        }
+        header={<NetworkLoadBalancerDetailHeader status={nlb.status} />}
+        noBodyBottomBorder={true}
+      />
+    </>
+  );
+};
+
+export default NetworkLoadBalancersDetail;
diff --git a/packages/manager/src/routes/networkLoadBalancer/index.ts b/packages/manager/src/routes/networkLoadBalancer/index.ts
index 80427760f2f..fb2421fef67 100644
--- a/packages/manager/src/routes/networkLoadBalancer/index.ts
+++ b/packages/manager/src/routes/networkLoadBalancer/index.ts
@@ -1,4 +1,4 @@
-import { createRoute } from '@tanstack/react-router';
+import { createRoute, redirect } from '@tanstack/react-router';
 
 import { rootRoute } from '../root';
 import { NetworkLoadBalancersRoute } from './networkLoadBalancersRoute';
@@ -18,5 +18,36 @@ const networkLoadBalancersIndexRoute = createRoute({
   ).then((m) => m.networkLoadBalancersLazyRoute)
 );
 
+const networkLoadBalancerDetailRoute = createRoute({
+  beforeLoad: async ({ params }) => {
+    throw redirect({
+      params: {
+        id: params.id,
+      },
+      to: '/netloadbalancers/$id/listeners',
+    });
+  },
+  getParentRoute: () => networkLoadBalancersRoute,
+  path: '$id',
+}).lazy(() =>
+  import(
+    'src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerDetailLazyRoute'
+  ).then((m) => m.networkLoadBalancerDetailLazyRoute)
+);
+
+const networkLoadBalancerListenersRoute = createRoute({
+  getParentRoute: () => networkLoadBalancersRoute,
+  path: '$id/listeners',
+}).lazy(() =>
+  import(
+    'src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerDetailLazyRoute'
+  ).then((m) => m.networkLoadBalancerDetailLazyRoute)
+);
+
 export const networkLoadBalancersRouteTree =
-  networkLoadBalancersRoute.addChildren([networkLoadBalancersIndexRoute]);
+  networkLoadBalancersRoute.addChildren([
+    networkLoadBalancersIndexRoute,
+    networkLoadBalancerDetailRoute.addChildren([
+      networkLoadBalancerListenersRoute,
+    ]),
+  ]);

From 1a4c5c0b1b108e7e6c59a1e7d2eccd6b3fb72cf9 Mon Sep 17 00:00:00 2001
From: Alban Bailly <130582365+abailly-akamai@users.noreply.github.com>
Date: Fri, 21 Nov 2025 09:29:15 +0100
Subject: [PATCH 24/91] fix: [UIE-9655] - Disabled Tab + Tooltip styles &
 accessibility (#13113)

* save progress

* styles and accessibility

* hover styles

* Added changeset: Disabled Tab + Tooltip styles & accessibility
---
 .../pr-13113-fixed-1763631318653.md           |  5 ++
 .../components/TabbedPanel/TabbedPanel.tsx    | 48 ++++++++++++-------
 packages/manager/src/components/Tabs/Tab.tsx  |  6 +++
 3 files changed, 41 insertions(+), 18 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13113-fixed-1763631318653.md

diff --git a/packages/manager/.changeset/pr-13113-fixed-1763631318653.md b/packages/manager/.changeset/pr-13113-fixed-1763631318653.md
new file mode 100644
index 00000000000..5789752b6ca
--- /dev/null
+++ b/packages/manager/.changeset/pr-13113-fixed-1763631318653.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+Disabled Tab + Tooltip styles & accessibility ([#13113](https://github.com/linode/manager/pull/13113))
diff --git a/packages/manager/src/components/TabbedPanel/TabbedPanel.tsx b/packages/manager/src/components/TabbedPanel/TabbedPanel.tsx
index a882a95e0c4..be26da4d87e 100644
--- a/packages/manager/src/components/TabbedPanel/TabbedPanel.tsx
+++ b/packages/manager/src/components/TabbedPanel/TabbedPanel.tsx
@@ -54,13 +54,6 @@ const TabbedPanel = React.memo((props: TabbedPanelProps) => {
 
   const [tabIndex, setTabIndex] = useState<number | undefined>(initTab);
 
-  const sxHelpIcon = {
-    height: 20,
-    m: 0.5,
-    verticalAlign: 'sub',
-    width: 20,
-  };
-
   const tabChangeHandler = (index: number) => {
     setTabIndex(index);
     if (handleTabChange) {
@@ -99,20 +92,39 @@ const TabbedPanel = React.memo((props: TabbedPanelProps) => {
         <StyledTabs index={tabIndex} onChange={tabChangeHandler}>
           <StyledTabList>
             {tabs.map((tab, idx) => (
-              <StyledTab
-                data-pendo-id={tab.title}
-                disabled={tab.disabled}
-                key={`tabs-${tab.title}-${idx}`}
-              >
-                {tab.title}
+              <>
+                <StyledTab
+                  data-pendo-id={tab.title}
+                  disabled={tab.disabled}
+                  key={`tabs-${tab.title}-${idx}`}
+                >
+                  {tab.title}
+                </StyledTab>
                 {tab.disabled && props.tabDisabledMessage && (
-                  <Tooltip title={props.tabDisabledMessage}>
-                    <span>
-                      <HelpOutline fontSize="small" sx={sxHelpIcon} />
-                    </span>
+                  <Tooltip tabIndex={0} title={props.tabDisabledMessage}>
+                    <Box
+                      sx={(theme) => ({
+                        marginLeft: `-${theme.spacingFunction(12)}`,
+                        marginTop: theme.spacingFunction(10),
+                      })}
+                    >
+                      <HelpOutline
+                        fontSize="small"
+                        sx={(theme) => ({
+                          height: 20,
+                          m: 0.5,
+                          width: 20,
+                          color: theme.tokens.component.Tab.Disabled.Icon,
+                          '&:hover': {
+                            color: theme.tokens.component.Tab.Hover.Icon,
+                            cursor: 'pointer',
+                          },
+                        })}
+                      />
+                    </Box>
                   </Tooltip>
                 )}
-              </StyledTab>
+              </>
             ))}
           </StyledTabList>
           <TabPanels>
diff --git a/packages/manager/src/components/Tabs/Tab.tsx b/packages/manager/src/components/Tabs/Tab.tsx
index e990b44eea9..fa45b47d67d 100644
--- a/packages/manager/src/components/Tabs/Tab.tsx
+++ b/packages/manager/src/components/Tabs/Tab.tsx
@@ -14,6 +14,12 @@ const useStyles = makeStyles()((theme: Theme) => ({
       '&:hover': {
         backgroundColor: theme.color.grey7,
       },
+      '&:disabled': {
+        opacity: 1,
+        color: theme.tokens.component.Tab.Disabled.Text,
+        cursor: 'not-allowed',
+        pointerEvents: 'none',
+      },
       alignItems: 'center',
       borderBottom: '2px solid transparent',
       color: theme.textColors.linkActiveLight,

From 664bcde9e9880b8d27b2fa8b4d613b9f5787bcec Mon Sep 17 00:00:00 2001
From: Alban Bailly <130582365+abailly-akamai@users.noreply.github.com>
Date: Fri, 21 Nov 2025 10:08:34 +0100
Subject: [PATCH 25/91] Bump glob from 10.4.5 to 10.5.0 (#13114)

---
 packages/manager/package.json |  2 +-
 pnpm-lock.yaml                | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/manager/package.json b/packages/manager/package.json
index d3b16ad2d23..11169d99914 100644
--- a/packages/manager/package.json
+++ b/packages/manager/package.json
@@ -171,7 +171,7 @@
     "cypress-vite": "^1.8.0",
     "dotenv": "^16.0.3",
     "factory.ts": "^0.5.1",
-    "glob": "^10.3.1",
+    "glob": "^10.5.0",
     "globals": "^16.0.0",
     "history": "4",
     "jsdom": "^24.1.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7bccdfcdc81..e99605e90e6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -492,8 +492,8 @@ importers:
         specifier: ^0.5.1
         version: 0.5.2
       glob:
-        specifier: ^10.3.1
-        version: 10.4.5
+        specifier: ^10.5.0
+        version: 10.5.0
       globals:
         specifier: ^16.0.0
         version: 16.0.0
@@ -4207,8 +4207,8 @@ packages:
     resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
     engines: {node: '>=10.13.0'}
 
-  glob@10.4.5:
-    resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==}
+  glob@10.5.0:
+    resolution: {integrity: sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==}
     hasBin: true
 
   glob@7.2.3:
@@ -7352,7 +7352,7 @@ snapshots:
 
   '@joshwooding/vite-plugin-react-docgen-typescript@0.6.0(typescript@5.7.3)(vite@7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))':
     dependencies:
-      glob: 10.4.5
+      glob: 10.5.0
       magic-string: 0.30.17
       react-docgen-typescript: 2.2.2(typescript@5.7.3)
       vite: 7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
@@ -10213,7 +10213,7 @@ snapshots:
     dependencies:
       is-glob: 4.0.3
 
-  glob@10.4.5:
+  glob@10.5.0:
     dependencies:
       foreground-child: 3.3.1
       jackspeak: 3.4.3
@@ -12096,7 +12096,7 @@ snapshots:
     dependencies:
       '@jridgewell/gen-mapping': 0.3.8
       commander: 4.1.1
-      glob: 10.4.5
+      glob: 10.5.0
       lines-and-columns: 1.2.4
       mz: 2.7.0
       pirates: 4.0.6
@@ -12143,7 +12143,7 @@ snapshots:
   test-exclude@7.0.1:
     dependencies:
       '@istanbuljs/schema': 0.1.3
-      glob: 10.4.5
+      glob: 10.5.0
       minimatch: 9.0.5
 
   text-segmentation@1.0.3:

From f76c020090fda2d4638b578c5cd305d61c96836f Mon Sep 17 00:00:00 2001
From: Alban Bailly <130582365+abailly-akamai@users.noreply.github.com>
Date: Fri, 21 Nov 2025 14:04:15 +0100
Subject: [PATCH 26/91] change: [UIE-9700] - Await permissions before rendering
 Linode Detail Header (#13124)

* Await permissions before loading Linode Detail Header

* Added changeset: Await permissions before rendering Linode Detail Header
---
 .../manager/.changeset/pr-13124-changed-1763726824931.md     | 5 +++++
 .../LinodesDetail/LinodesDetailHeader/LinodeDetailHeader.tsx | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13124-changed-1763726824931.md

diff --git a/packages/manager/.changeset/pr-13124-changed-1763726824931.md b/packages/manager/.changeset/pr-13124-changed-1763726824931.md
new file mode 100644
index 00000000000..6e3faa3a17b
--- /dev/null
+++ b/packages/manager/.changeset/pr-13124-changed-1763726824931.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Changed
+---
+
+Await permissions before rendering Linode Detail Header ([#13124](https://github.com/linode/manager/pull/13124))
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetailHeader/LinodeDetailHeader.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetailHeader/LinodeDetailHeader.tsx
index 22ef7bc94e3..6b603bea58a 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetailHeader/LinodeDetailHeader.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetailHeader/LinodeDetailHeader.tsx
@@ -56,7 +56,7 @@ export const LinodeDetailHeader = () => {
   const { mutateAsync: updateLinode } =
     useLinodeUpdateMutation(matchedLinodeId);
 
-  const { data: permissions } = usePermissions(
+  const { data: permissions, isLoading: isPermissionsLoading } = usePermissions(
     'linode',
     ['update_linode'],
     linodeId
@@ -163,7 +163,7 @@ export const LinodeDetailHeader = () => {
     onOpenResizeDialog,
   };
 
-  if (isLoading) {
+  if (isLoading || isPermissionsLoading) {
     return <CircleProgress />;
   }
 

From 095c9046cbbd58d976ff0c4c33f829ad556164b4 Mon Sep 17 00:00:00 2001
From: Purvesh Makode <pmakode@akamai.com>
Date: Fri, 21 Nov 2025 22:39:56 +0530
Subject: [PATCH 27/91] upcoming: [UIE-9514] - Update Firewall Rule Drawer to
 support referencing Rule Set (#13094)

* Save progress

* Update tests

* Few more changes

* Add more changes

* Clean up tests

* Few changes

* Layout updates

* Update tests

* Add ruleset loading state

* Clean up mocks

* Fix mocks

* Add comments to the type

* Added changeset: Update FirewallRuleType to support ruleset

* Added changeset: Update FirewallRuleTypeSchema to support ruleset

* Added changeset: Add new Firewall RuleSet row layout

* Update ruleset action text - Delete to Remove

* Save progress...

* Update comment

* Exclude 'addresses' from rulesets reference payloads

* Some fixes

* Add more details to the drawer for rulset

* More changes...

* Move Action column and improve table responsiveness for long labels

* Update Cypress component test

* Add more changes to the drawer for rulesets

* Update gap & fontsize of firwall add rules selection card

* Fix Chip shrink issue

* Revert Action column movement since its not yet confirmed

* More Refactoring + better formstate typesaftey

* Add renderOptions for Add ruleset Autocomplete

* Fix typos

* Few updates

* Few fixes

* Update cypress component tests

* More changes

* Update Add rulesets button copy

* More Updates

* Feature flag create entity selection for ruleset

* More refactoring - separating form states

* Some clean up...

* Show only rulsets in dropdown applicable to the given catergory

* Update date format

* Update badge color tokens

* Capitalize action label in chip

* Update Chip width

* Added changeset: Update Firewall Rule Drawer to support referencing Rule Set

* Update placeholder for Select Rule Set

* Few updates and clean up

* Make cy test work

* Clean up: remove duplicate validation

* Add cancel btn for rules form + some design tokens for dropdown options

* Add unit tests for Add Rule Set Drawer

* Update test title

* Mock useIsFirewallRulesetsPrefixlistsEnabled instead of feature flag

* Fix styling and a bit of clean up
---
 ...r-13094-upcoming-features-1763558731421.md |   5 +
 .../Rules/FirewallRuleDrawer.test.tsx         |  78 ++++++
 .../Rules/FirewallRuleDrawer.tsx              | 197 ++++++++++++---
 .../Rules/FirewallRuleDrawer.types.ts         |  14 ++
 .../FirewallDetail/Rules/FirewallRuleForm.tsx |  19 +-
 .../Rules/FirewallRuleSetForm.tsx             | 237 ++++++++++++++++++
 .../Rules/FirewallRuleTable.tsx               |  16 +-
 .../Rules/firewallRuleEditor.ts               |   5 +
 .../FirewallDetail/Rules/shared.styles.ts     |  31 +++
 .../Firewalls/FirewallDetail/Rules/shared.ts  |  11 +
 packages/manager/src/mocks/serverHandlers.ts  |   2 +-
 11 files changed, 546 insertions(+), 69 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13094-upcoming-features-1763558731421.md
 create mode 100644 packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx
 create mode 100644 packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.styles.ts

diff --git a/packages/manager/.changeset/pr-13094-upcoming-features-1763558731421.md b/packages/manager/.changeset/pr-13094-upcoming-features-1763558731421.md
new file mode 100644
index 00000000000..825c65ad24d
--- /dev/null
+++ b/packages/manager/.changeset/pr-13094-upcoming-features-1763558731421.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Update Firewall Rule Drawer to support referencing Rule Set ([#13094](https://github.com/linode/manager/pull/13094))
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
index 30b54ba63bf..10f2c67b2a6 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
@@ -5,6 +5,7 @@ import { allIPs } from 'src/features/Firewalls/shared';
 import { stringToExtendedIP } from 'src/utilities/ipUtils';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
+import * as shared from '../../shared';
 import { FirewallRuleDrawer } from './FirewallRuleDrawer';
 import {
   classifyIPs,
@@ -37,8 +38,12 @@ const props: FirewallRuleDrawerProps = {
   onSubmit: mockOnSubmit,
 };
 
+const spy = vi.spyOn(shared, 'useIsFirewallRulesetsPrefixlistsEnabled');
+
 describe('AddRuleDrawer', () => {
   it('renders the title', () => {
+    spy.mockReturnValue({ isFirewallRulesetsPrefixlistsEnabled: false });
+
     const { getByText } = renderWithTheme(
       <FirewallRuleDrawer {...props} category="inbound" mode="create" />
     );
@@ -66,6 +71,79 @@ describe('AddRuleDrawer', () => {
   });
 });
 
+describe('AddRuleSetDrawer', () => {
+  beforeEach(() => {
+    spy.mockReturnValue({ isFirewallRulesetsPrefixlistsEnabled: true });
+  });
+
+  it('renders the drawer title', () => {
+    const { getByText } = renderWithTheme(
+      <FirewallRuleDrawer {...props} category="inbound" mode="create" />
+    );
+
+    expect(getByText('Add an Inbound Rule or Rule Set')).toBeVisible();
+  });
+
+  it('renders the selection cards', () => {
+    const { getByText } = renderWithTheme(
+      <FirewallRuleDrawer {...props} category="inbound" mode="create" />
+    );
+
+    expect(getByText(/Create a Rule/i)).toBeVisible();
+    expect(getByText(/Reference Rule Set/i)).toBeVisible();
+  });
+
+  it('renders the Rule Set form and its elements when selection card is clicked', async () => {
+    const { getByText, getByPlaceholderText, getByRole } = renderWithTheme(
+      <FirewallRuleDrawer {...props} category="inbound" mode="create" />
+    );
+
+    const ruleSetCard = getByText(/Reference Rule Set/i);
+    await userEvent.click(ruleSetCard);
+
+    // Description
+    expect(
+      getByText(
+        'RuleSets are reusable collections of Cloud Firewall rules that use the same fields as individual rules. They let you manage and update multiple rules as a group. You can then apply them across different firewalls by reference.'
+      )
+    ).toBeVisible();
+
+    // Autocomplete field
+    expect(getByText('Rule Set')).toBeVisible();
+    expect(
+      getByPlaceholderText('Type to search or select a Rule Set')
+    ).toBeVisible();
+
+    // Action buttons
+    expect(getByRole('button', { name: 'Add Rule' })).toBeVisible();
+    expect(getByRole('button', { name: 'Cancel' })).toBeVisible();
+
+    // Footer text
+    expect(
+      getByText(
+        'Rule changes don’t take effect immediately. You can add or delete rules before saving all your changes to this Firewall.'
+      )
+    ).toBeVisible();
+  });
+
+  it('shows validation message when Rule Set form is submitted without selecting a value', async () => {
+    const { getByText, getByRole } = renderWithTheme(
+      <FirewallRuleDrawer {...props} category="inbound" mode="create" />
+    );
+
+    // Click the Rule Set Selection card to open the Rule Set form
+    const ruleSetCard = getByText(/Reference Rule Set/i);
+    await userEvent.click(ruleSetCard);
+
+    // Click the "Add Rule" button without selecting the Autocomplete field
+    const addRuleButton = getByRole('button', { name: 'Add Rule' });
+    await userEvent.click(addRuleButton);
+
+    // Expect the validation message to appear
+    getByText('Rule Set is required.');
+  });
+});
+
 describe('utilities', () => {
   describe('formValueToIPs', () => {
     it('returns a complete set of IPs given a string form value', () => {
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
index fce7f71f829..cdf612bef2c 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
@@ -1,8 +1,15 @@
-import { Drawer, Typography } from '@linode/ui';
+import { Drawer, Notice, Radio, Typography } from '@linode/ui';
 import { capitalize } from '@linode/utilities';
+import { Grid } from '@mui/material';
 import { Formik } from 'formik';
 import * as React from 'react';
 
+import { SelectionCard } from 'src/components/SelectionCard/SelectionCard';
+
+import {
+  type FirewallOptionItem,
+  useIsFirewallRulesetsPrefixlistsEnabled,
+} from '../../shared';
 import {
   formValueToIPs,
   getInitialFormValues,
@@ -13,10 +20,13 @@ import {
   validateIPs,
 } from './FirewallRuleDrawer.utils';
 import { FirewallRuleForm } from './FirewallRuleForm';
+import { FirewallRuleSetForm } from './FirewallRuleSetForm';
+import { firewallRuleCreateOptions } from './shared';
 
-import type { FirewallOptionItem } from '../../shared';
 import type {
+  FirewallCreateEntityType,
   FirewallRuleDrawerProps,
+  FormRuleSetState,
   FormState,
 } from './FirewallRuleDrawer.types';
 import type {
@@ -32,6 +42,17 @@ export const FirewallRuleDrawer = React.memo(
   (props: FirewallRuleDrawerProps) => {
     const { category, isOpen, mode, onClose, ruleToModify } = props;
 
+    const { isFirewallRulesetsPrefixlistsEnabled } =
+      useIsFirewallRulesetsPrefixlistsEnabled();
+
+    /**
+     * State for the type of entity being created: either a firewall 'rule' or
+     * referencing an existing 'ruleset' in the firewall.
+     * Only relevant when `mode === 'create'`.
+     */
+    const [createEntityType, setCreateEntityType] =
+      React.useState<FirewallCreateEntityType>('rule');
+
     // Custom IPs are tracked separately from the form. The <MultipleIPs />
     // component consumes this state. We use this on form submission if the
     // `addresses` form value is "ip/netmask", which indicates the user has
@@ -45,9 +66,9 @@ export const FirewallRuleDrawer = React.memo(
       FirewallOptionItem<string>[]
     >([]);
 
-    // Reset state. If we're in EDIT mode, set IPs to the addresses of the rule we're modifying
-    // (along with any errors we may have).
     React.useEffect(() => {
+      // Reset state. If we're in EDIT mode, set IPs to the addresses of the rule we're modifying
+      // (along with any errors we may have).
       if (mode === 'edit' && ruleToModify) {
         setIPs(getInitialIPs(ruleToModify));
         setPresetPorts(portStringToItems(ruleToModify.ports)[0]);
@@ -56,20 +77,30 @@ export const FirewallRuleDrawer = React.memo(
       } else {
         setIPs([{ address: '' }]);
       }
-    }, [mode, isOpen, ruleToModify]);
+
+      // Reset the Create entity selection to 'rule' in two cases:
+      // 1. The ruleset feature flag is disabled - 'ruleset' is not allowed.
+      // 2. The drawer is closed - ensures the next time it opens, it starts with the default 'rule' selection.
+      if (
+        mode === 'create' &&
+        (!isFirewallRulesetsPrefixlistsEnabled || !isOpen)
+      ) {
+        setCreateEntityType('rule');
+      }
+    }, [mode, isOpen, ruleToModify, isFirewallRulesetsPrefixlistsEnabled]);
 
     const title =
-      mode === 'create' ? `Add an ${capitalize(category)} Rule` : 'Edit Rule';
+      mode === 'create'
+        ? `Add an ${capitalize(category)} Rule${
+            isFirewallRulesetsPrefixlistsEnabled ? ' or Rule Set' : ''
+          }`
+        : 'Edit Rule';
 
     const addressesLabel = category === 'inbound' ? 'source' : 'destination';
 
-    const onValidate = ({
-      addresses,
-      description,
-      label,
-      ports,
-      protocol,
-    }: FormState) => {
+    const onValidateRule = (values: FormState) => {
+      const { addresses, description, label, ports, protocol } = values;
+
       // The validated IPs may have errors, so set them to state so we see the errors.
       const validatedIPs = validateIPs(ips, {
         allowEmptyAddress: addresses !== 'ip/netmask',
@@ -93,7 +124,7 @@ export const FirewallRuleDrawer = React.memo(
       };
     };
 
-    const onSubmit = (values: FormState) => {
+    const onSubmitRule = (values: FormState) => {
       const ports = itemsToPortString(presetPorts, values.ports!);
       const protocol = values.protocol as FirewallRuleProtocol;
       const addresses = formValueToIPs(values.addresses!, ips);
@@ -103,41 +134,125 @@ export const FirewallRuleDrawer = React.memo(
         addresses,
         ports,
         protocol,
+        label: values.label || null,
+        description: values.description || null,
       };
-
-      payload.label = values.label === '' ? null : values.label;
-      payload.description =
-        values.description === '' ? null : values.description;
-
       props.onSubmit(category, payload);
       onClose();
     };
 
+    const onValidateRuleSet = (values: FormRuleSetState) => {
+      const errors: Record<string, string> = {};
+      if (!values.ruleset || values.ruleset === -1) {
+        errors.ruleset = 'Rule Set is required.';
+      }
+      if (typeof values.ruleset !== 'number') {
+        errors.ruleset = 'Rule Set should be a number.';
+      }
+      return errors;
+    };
+
     return (
       <Drawer onClose={onClose} open={isOpen} title={title}>
-        <Formik
-          initialValues={getInitialFormValues(ruleToModify)}
-          onSubmit={onSubmit}
-          validate={onValidate}
-          validateOnBlur={false}
-          validateOnChange={false}
-        >
-          {(formikProps) => {
-            return (
-              <FirewallRuleForm
-                addressesLabel={addressesLabel}
-                category={category}
-                ips={ips}
-                mode={mode}
-                presetPorts={presetPorts}
-                ruleErrors={ruleToModify?.errors}
-                setIPs={setIPs}
-                setPresetPorts={setPresetPorts}
-                {...formikProps}
+        {mode === 'create' && isFirewallRulesetsPrefixlistsEnabled && (
+          <Grid container spacing={2}>
+            {firewallRuleCreateOptions.map((option) => (
+              <SelectionCard
+                checked={createEntityType === option.value}
+                gridSize={{
+                  md: 6,
+                  sm: 12,
+                  xs: 12,
+                }}
+                heading={option.label}
+                key={option.value}
+                onClick={() => setCreateEntityType(option.value)}
+                renderIcon={() => (
+                  <Radio checked={createEntityType === option.value} />
+                )}
+                subheadings={[]}
+                sxCardBase={(theme) => ({
+                  gap: 0,
+                  '& .cardSubheadingTitle': {
+                    fontSize: theme.tokens.font.FontSize.Xs,
+                  },
+                })}
+                sxCardBaseIcon={(theme) => ({
+                  svg: { fontSize: theme.tokens.font.FontSize.L },
+                })}
               />
-            );
-          }}
-        </Formik>
+            ))}
+          </Grid>
+        )}
+
+        {(mode === 'edit' || createEntityType === 'rule') && (
+          <Formik<FormState>
+            initialValues={getInitialFormValues(ruleToModify)}
+            onSubmit={onSubmitRule}
+            validate={onValidateRule}
+            validateOnBlur={false}
+            validateOnChange={false}
+          >
+            {(formikProps) => (
+              <>
+                {formikProps.status && (
+                  <Notice
+                    data-qa-error
+                    key={formikProps.status}
+                    text={formikProps.status.generalError}
+                    variant="error"
+                  />
+                )}
+                <FirewallRuleForm
+                  addressesLabel={addressesLabel}
+                  category={category}
+                  closeDrawer={onClose}
+                  ips={ips}
+                  mode={mode}
+                  presetPorts={presetPorts}
+                  ruleErrors={ruleToModify?.errors}
+                  setIPs={setIPs}
+                  setPresetPorts={setPresetPorts}
+                  {...formikProps}
+                />
+              </>
+            )}
+          </Formik>
+        )}
+
+        {mode === 'create' &&
+          createEntityType === 'ruleset' &&
+          isFirewallRulesetsPrefixlistsEnabled && (
+            <Formik<FormRuleSetState>
+              initialValues={{ ruleset: -1 }}
+              onSubmit={(values) => {
+                props.onSubmit(category, values);
+                onClose();
+              }}
+              validate={onValidateRuleSet}
+              validateOnBlur={true}
+              validateOnChange={true}
+            >
+              {(formikProps) => (
+                <>
+                  {formikProps.status && (
+                    <Notice
+                      data-qa-error
+                      key={formikProps.status}
+                      text={formikProps.status.generalError}
+                      variant="error"
+                    />
+                  )}
+                  <FirewallRuleSetForm
+                    category={category}
+                    closeDrawer={onClose}
+                    ruleErrors={ruleToModify?.errors}
+                    {...formikProps}
+                  />
+                </>
+              )}
+            </Formik>
+          )}
         <Typography variant="body1">
           Rule changes don&rsquo;t take effect immediately. You can add or
           delete rules before saving all your changes to this Firewall.
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts
index d344e3146ab..f08c91d190d 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts
@@ -29,9 +29,16 @@ export interface FormState {
   type: string;
 }
 
+export interface FormRuleSetState {
+  ruleset: number;
+}
+
+export type FirewallCreateEntityType = 'rule' | 'ruleset';
+
 export interface FirewallRuleFormProps extends FormikProps<FormState> {
   addressesLabel: string;
   category: Category;
+  closeDrawer: () => void;
   ips: ExtendedIP[];
   mode: FirewallRuleDrawerMode;
   presetPorts: FirewallOptionItem<string>[];
@@ -39,3 +46,10 @@ export interface FirewallRuleFormProps extends FormikProps<FormState> {
   setIPs: (ips: ExtendedIP[]) => void;
   setPresetPorts: (selected: FirewallOptionItem<string>[]) => void;
 }
+
+export interface FirewallRuleSetFormProps
+  extends FormikProps<FormRuleSetState> {
+  category: Category;
+  closeDrawer: () => void;
+  ruleErrors?: FirewallRuleError[];
+}
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx
index 26bc0c6db29..c94082dd44b 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx
@@ -2,7 +2,6 @@ import {
   ActionsPanel,
   Autocomplete,
   FormControlLabel,
-  Notice,
   Radio,
   RadioGroup,
   Select,
@@ -39,6 +38,7 @@ export const FirewallRuleForm = React.memo((props: FirewallRuleFormProps) => {
   const {
     addressesLabel,
     category,
+    closeDrawer,
     errors,
     handleBlur,
     handleChange,
@@ -51,7 +51,6 @@ export const FirewallRuleForm = React.memo((props: FirewallRuleFormProps) => {
     setFieldValue,
     setIPs,
     setPresetPorts,
-    status,
     touched,
     values,
   } = props;
@@ -202,14 +201,6 @@ export const FirewallRuleForm = React.memo((props: FirewallRuleFormProps) => {
 
   return (
     <form onSubmit={handleSubmit}>
-      {status && (
-        <Notice
-          data-qa-error
-          key={status}
-          text={status.generalError}
-          variant="error"
-        />
-      )}
       <Autocomplete
         aria-label="Preset for firewall rule"
         autoHighlight
@@ -351,17 +342,21 @@ export const FirewallRuleForm = React.memo((props: FirewallRuleFormProps) => {
           label: mode === 'create' ? 'Add Rule' : 'Add Changes',
           onClick: () => handleSubmit(),
         }}
+        secondaryButtonProps={{
+          label: 'Cancel',
+          onClick: closeDrawer,
+        }}
       />
     </form>
   );
 });
 
 const StyledDiv = styled('div', { label: 'StyledDiv' })(({ theme }) => ({
-  marginTop: theme.spacing(2),
+  marginTop: theme.spacingFunction(16),
 }));
 
 const StyledMultipleIPInput = styled(MultipleIPInput, {
   label: 'StyledMultipleIPInput',
 })(({ theme }) => ({
-  marginTop: theme.spacing(2),
+  marginTop: theme.spacingFunction(16),
 }));
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx
new file mode 100644
index 00000000000..0b1283ba3a0
--- /dev/null
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx
@@ -0,0 +1,237 @@
+import { useAllFirewallRuleSetsQuery } from '@linode/queries';
+import {
+  ActionsPanel,
+  Autocomplete,
+  Box,
+  Chip,
+  Paper,
+  SelectedIcon,
+  Stack,
+  Typography,
+} from '@linode/ui';
+import { capitalize } from '@linode/utilities';
+import * as React from 'react';
+
+import { CopyTooltip } from 'src/components/CopyTooltip/CopyTooltip';
+import { DateTimeDisplay } from 'src/components/DateTimeDisplay';
+
+import {
+  generateAddressesLabel,
+  useIsFirewallRulesetsPrefixlistsEnabled,
+} from '../../shared';
+import { StyledLabel, StyledListItem, useStyles } from './shared.styles';
+
+import type { FirewallRuleSetFormProps } from './FirewallRuleDrawer.types';
+
+export const FirewallRuleSetForm = React.memo(
+  (props: FirewallRuleSetFormProps) => {
+    const {
+      category,
+      errors,
+      handleSubmit,
+      setFieldTouched,
+      setFieldValue,
+      touched,
+      closeDrawer,
+      values,
+    } = props;
+
+    const { classes } = useStyles();
+
+    const { isFirewallRulesetsPrefixlistsEnabled } =
+      useIsFirewallRulesetsPrefixlistsEnabled();
+
+    const { data, error, isLoading } = useAllFirewallRuleSetsQuery(
+      isFirewallRulesetsPrefixlistsEnabled
+    );
+
+    const ruleSets = data ?? [];
+
+    // Find the selected ruleset once
+    const selectedRuleSet = React.useMemo(
+      () => ruleSets.find((r) => r.id === values.ruleset) ?? null,
+      [ruleSets, values.ruleset]
+    );
+
+    // Build dropdown options
+    const ruleSetDropdownOptions = React.useMemo(
+      () =>
+        ruleSets
+          .filter((ruleSet) => ruleSet.type === category) // Display only rule sets applicable to the given category
+          .map((ruleSet) => ({
+            label: ruleSet.label,
+            value: ruleSet.id,
+          })),
+      [ruleSets]
+    );
+
+    const errorText =
+      error?.[0].reason ?? (touched.ruleset ? errors.ruleset : undefined);
+
+    return (
+      <form onSubmit={handleSubmit}>
+        <Box>
+          <Typography
+            sx={(theme) => ({ marginTop: theme.spacingFunction(16) })}
+          >
+            RuleSets are reusable collections of Cloud Firewall rules that use
+            the same fields as individual rules. They let you manage and update
+            multiple rules as a group. You can then apply them across different
+            firewalls by reference.
+          </Typography>
+          <Autocomplete
+            disableClearable={ruleSets.length > 0}
+            errorText={errorText}
+            label="Rule Set"
+            loading={isLoading}
+            onBlur={() => setFieldTouched('ruleset')}
+            onChange={(_, selectedRuleSet) => {
+              setFieldValue('ruleset', selectedRuleSet?.value);
+            }}
+            options={ruleSetDropdownOptions}
+            placeholder="Type to search or select a Rule Set"
+            renderOption={(props, option, { selected }) => {
+              const { key, ...rest } = props;
+              return (
+                <li key={key} {...rest}>
+                  <Stack
+                    alignItems="center"
+                    direction="row"
+                    justifyContent="space-between"
+                    width="100%"
+                  >
+                    <Stack direction="column">
+                      <Box
+                        sx={(theme) => ({
+                          // eslint-disable-next-line @linode/cloud-manager/no-custom-fontWeight
+                          fontWeight: theme.tokens.font.FontWeight.Semibold,
+                        })}
+                      >
+                        {option.label}
+                      </Box>
+                      <Box
+                        sx={(theme) => ({
+                          color:
+                            theme.tokens.component.Dropdown.Text.Description,
+                        })}
+                      >
+                        ID: {option.value}
+                      </Box>
+                    </Stack>
+                    {selected && <SelectedIcon visible />}
+                  </Stack>
+                </li>
+              );
+            }}
+            value={
+              ruleSetDropdownOptions.find((o) => o.value === values.ruleset) ??
+              null
+            }
+          />
+
+          {selectedRuleSet && (
+            <Box mt={2}>
+              {[
+                { label: 'Label', value: selectedRuleSet.label },
+                { label: 'ID', value: selectedRuleSet.id, copy: true },
+                { label: null, value: selectedRuleSet.description },
+                {
+                  label: 'Service Defined',
+                  value: selectedRuleSet.is_service_defined ? 'Yes' : 'No',
+                },
+                { label: 'Version', value: selectedRuleSet.version },
+                {
+                  label: 'Created',
+                  value: selectedRuleSet.created && (
+                    <DateTimeDisplay value={selectedRuleSet.created} />
+                  ),
+                },
+                {
+                  label: 'Updated',
+                  value: selectedRuleSet.updated && (
+                    <DateTimeDisplay value={selectedRuleSet.updated} />
+                  ),
+                },
+              ].map((item, idx) => (
+                <StyledListItem key={`item-${idx}`}>
+                  {item.label && (
+                    <StyledLabel component="span">{item.label}: </StyledLabel>
+                  )}
+                  {item.value}
+
+                  {item.copy && (
+                    <CopyTooltip
+                      className={classes.copyIcon}
+                      text={String(selectedRuleSet.id)}
+                    />
+                  )}
+                </StyledListItem>
+              ))}
+
+              <Paper
+                sx={(theme) => ({
+                  backgroundColor: theme.tokens.alias.Background.Neutral,
+                  padding: theme.spacingFunction(12),
+                  marginTop: theme.spacingFunction(8),
+                })}
+              >
+                <StyledLabel
+                  sx={(theme) => ({ marginBottom: theme.spacingFunction(4) })}
+                >
+                  {capitalize(category)} Rules
+                </StyledLabel>
+                {selectedRuleSet.rules.map((rule, idx) => (
+                  <StyledListItem
+                    component="span"
+                    key={`firewall-ruleset-rule-${idx}`}
+                    sx={(theme) => ({
+                      padding: `${theme.spacingFunction(4)} 0`,
+                    })}
+                  >
+                    <Chip
+                      label={capitalize(rule.action?.toLowerCase() ?? '')}
+                      sx={(theme) => ({
+                        background:
+                          rule.action === 'ACCEPT'
+                            ? theme.tokens.component.Badge.Positive.Subtle
+                                .Background
+                            : theme.tokens.component.Badge.Negative.Subtle
+                                .Background,
+                        color:
+                          rule.action === 'ACCEPT'
+                            ? theme.tokens.component.Badge.Positive.Subtle.Text
+                            : theme.tokens.component.Badge.Negative.Subtle.Text,
+                        font: theme.font.bold,
+                        width: '51px',
+                        fontSize: theme.tokens.font.FontSize.Xxxs,
+                        marginRight: theme.spacingFunction(6),
+                        flexShrink: 0,
+                        alignSelf: 'flex-start',
+                      })}
+                    />
+                    <Box>
+                      {rule.protocol};&nbsp;{rule.ports};&nbsp;
+                      {generateAddressesLabel(rule.addresses)}
+                    </Box>
+                  </StyledListItem>
+                ))}
+              </Paper>
+            </Box>
+          )}
+        </Box>
+
+        <ActionsPanel
+          primaryButtonProps={{
+            'data-testid': 'submit',
+            label: 'Add Rule',
+            type: 'submit',
+          }}
+          secondaryButtonProps={{
+            label: 'Cancel',
+            onClick: closeDrawer,
+          }}
+        />
+      </form>
+    );
+  }
+);
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
index 2999b46c527..eedfe2cd508 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
@@ -23,7 +23,6 @@ import { useTheme } from '@mui/material/styles';
 import useMediaQuery from '@mui/material/useMediaQuery';
 import { prop, uniqBy } from 'ramda';
 import * as React from 'react';
-import { makeStyles } from 'tss-react/mui';
 
 import Undo from 'src/assets/icons/undo.svg';
 import { CopyTooltip } from 'src/components/CopyTooltip/CopyTooltip';
@@ -55,13 +54,13 @@ import {
   StyledTableRow,
 } from './FirewallRuleTable.styles';
 import { sortPortString } from './shared';
+import { useStyles } from './shared.styles';
 
 import type { FirewallRuleDrawerMode } from './FirewallRuleDrawer.types';
 import type { ExtendedFirewallRule, RuleStatus } from './firewallRuleEditor';
 import type { Category, FirewallRuleError } from './shared';
 import type { DragEndEvent } from '@dnd-kit/core';
 import type { FirewallPolicyType } from '@linode/api-v4/lib/firewalls/types';
-import type { Theme } from '@linode/ui';
 import type { FirewallOptionItem } from 'src/features/Firewalls/shared';
 
 interface RuleRow {
@@ -362,19 +361,6 @@ const FirewallRuleTableRow = React.memo((props: FirewallRuleTableRowProps) => {
     zIndex: isDragging ? 9999 : 0,
   } as const;
 
-  const useStyles = makeStyles()((theme: Theme) => ({
-    copyIcon: {
-      '& svg': {
-        height: '1em',
-        width: '1em',
-      },
-      color: theme.palette.primary.main,
-      display: 'inline-block',
-      position: 'relative',
-      marginTop: theme.spacingFunction(2),
-    },
-  }));
-
   const { classes } = useStyles();
 
   if (isRuleSetLoading) {
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/firewallRuleEditor.ts b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/firewallRuleEditor.ts
index 2e07ec070e1..7614b2e8371 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/firewallRuleEditor.ts
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/firewallRuleEditor.ts
@@ -250,6 +250,11 @@ export const removeICMPPort = (
 
 const removeEmptyAddressArrays = (rules: ExtendedFirewallRule[]) => {
   return rules.map((rule) => {
+    // Ruleset references do not have addresses
+    if (rule.ruleset !== null && rule.ruleset !== undefined) {
+      return { ...rule };
+    }
+
     const keepIPv4 = rule.addresses?.ipv4 && rule.addresses.ipv4.length > 0;
     const keepIPv6 = rule.addresses?.ipv6 && rule.addresses.ipv6.length > 0;
 
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.styles.ts b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.styles.ts
new file mode 100644
index 00000000000..deace8a6d08
--- /dev/null
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.styles.ts
@@ -0,0 +1,31 @@
+import { Box, Typography } from '@linode/ui';
+import { styled } from '@mui/material';
+import { makeStyles } from 'tss-react/mui';
+
+export const StyledListItem = styled(Typography, { label: 'StyledTypography' })(
+  ({ theme }) => ({
+    alignItems: 'center',
+    display: 'flex',
+    padding: `${theme.spacingFunction(4)} 0`,
+  })
+);
+
+export const StyledLabel = styled(Box, {
+  label: 'StyledLabelBox',
+})(({ theme }) => ({
+  font: theme.font.bold,
+  marginRight: theme.spacingFunction(4),
+}));
+
+export const useStyles = makeStyles()((theme) => ({
+  copyIcon: {
+    '& svg': {
+      height: '1em',
+      width: '1em',
+    },
+    color: theme.palette.primary.main,
+    display: 'inline-block',
+    position: 'relative',
+    marginTop: theme.spacingFunction(4),
+  },
+}));
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.ts b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.ts
index 45b3a0a0115..46d9b8aba2a 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.ts
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.ts
@@ -115,3 +115,14 @@ export const sortString = (_a: string, _b: string) => {
 const stripHyphen = (str: string) => {
   return str.match(/-/) ? str.split('-')[0] : str;
 };
+
+export const firewallRuleCreateOptions = [
+  {
+    label: 'Create a Rule',
+    value: 'rule',
+  },
+  {
+    label: 'Reference Rule Set',
+    value: 'ruleset',
+  },
+] as const;
diff --git a/packages/manager/src/mocks/serverHandlers.ts b/packages/manager/src/mocks/serverHandlers.ts
index ee7e446336b..dcf176ec753 100644
--- a/packages/manager/src/mocks/serverHandlers.ts
+++ b/packages/manager/src/mocks/serverHandlers.ts
@@ -1325,7 +1325,7 @@ export const handlers = [
           inbound: [
             firewallRuleFactory.build({ ruleset: 123 }), // Referenced Ruleset to the Firewall (ID 123)
             firewallRuleFactory.build({ ruleset: 123456789 }), // Referenced Ruleset to the Firewall (ID 123456789)
-            ...firewallRuleFactory.buildList(2),
+            ...firewallRuleFactory.buildList(1),
           ],
         }),
       }),

From 6b0b08323ff8aab3aab4cf5cb566aa1f85cb406d Mon Sep 17 00:00:00 2001
From: Jaalah Ramos <125309814+jaalah-akamai@users.noreply.github.com>
Date: Sun, 23 Nov 2025 19:42:08 -0500
Subject: [PATCH 28/91] fix: [VMP-2536] - Maintenance date from local to utc
 (#13059)

* fix: maintenance local to utc

* More tests

* Adjust the when field logic

* Added changeset: Fix incorrect maintenance time display in the Upcoming maintenance table

---------

Co-authored-by: Jaalah Ramos <jaalah.ramos@gmail.com>
---
 .../pr-13059-fixed-1762972220664.md           |   5 +
 .../Maintenance/MaintenanceTableRow.tsx       |  25 ++--
 .../Account/Maintenance/utilities.test.ts     | 108 ++++++++++++------
 .../features/Account/Maintenance/utilities.ts |  77 +++++++------
 4 files changed, 128 insertions(+), 87 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13059-fixed-1762972220664.md

diff --git a/packages/manager/.changeset/pr-13059-fixed-1762972220664.md b/packages/manager/.changeset/pr-13059-fixed-1762972220664.md
new file mode 100644
index 00000000000..8279d18f00f
--- /dev/null
+++ b/packages/manager/.changeset/pr-13059-fixed-1762972220664.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+Fix incorrect maintenance time display in the Upcoming maintenance table ([#13059](https://github.com/linode/manager/pull/13059))
diff --git a/packages/manager/src/features/Account/Maintenance/MaintenanceTableRow.tsx b/packages/manager/src/features/Account/Maintenance/MaintenanceTableRow.tsx
index d4fc3505a55..9645722c188 100644
--- a/packages/manager/src/features/Account/Maintenance/MaintenanceTableRow.tsx
+++ b/packages/manager/src/features/Account/Maintenance/MaintenanceTableRow.tsx
@@ -1,7 +1,4 @@
-import {
-  useAccountMaintenancePoliciesQuery,
-  useProfile,
-} from '@linode/queries';
+import { useProfile } from '@linode/queries';
 import { Stack, Tooltip } from '@linode/ui';
 import { Hidden } from '@linode/ui';
 import { capitalize, getFormattedStatus, truncate } from '@linode/utilities';
@@ -84,22 +81,18 @@ export const MaintenanceTableRow = (props: MaintenanceTableRowProps) => {
   const dateField = getMaintenanceDateField(tableType);
   const dateValue = props.maintenance[dateField];
 
-  // Fetch policies to derive a start time when the API doesn't provide one
-  const { data: policies } = useAccountMaintenancePoliciesQuery();
-
   // Precompute for potential use; currently used via getUpcomingRelativeLabel
   React.useMemo(
-    () => deriveMaintenanceStartISO(props.maintenance, policies),
-    [policies, props.maintenance]
+    () => deriveMaintenanceStartISO(props.maintenance),
+    [props.maintenance]
   );
 
-  const upcomingRelativeLabel = React.useMemo(
-    () =>
-      tableType === 'upcoming'
-        ? getUpcomingRelativeLabel(props.maintenance, policies)
-        : undefined,
-    [policies, props.maintenance, tableType]
-  );
+  const upcomingRelativeLabel = React.useMemo(() => {
+    if (tableType !== 'upcoming') {
+      return undefined;
+    }
+    return getUpcomingRelativeLabel(props.maintenance);
+  }, [props.maintenance, tableType]);
 
   return (
     <TableRow key={entity.id}>
diff --git a/packages/manager/src/features/Account/Maintenance/utilities.test.ts b/packages/manager/src/features/Account/Maintenance/utilities.test.ts
index b2c19304751..a79abd20356 100644
--- a/packages/manager/src/features/Account/Maintenance/utilities.test.ts
+++ b/packages/manager/src/features/Account/Maintenance/utilities.test.ts
@@ -5,30 +5,12 @@ import {
   getUpcomingRelativeLabel,
 } from './utilities';
 
-import type { AccountMaintenance, MaintenancePolicy } from '@linode/api-v4';
+import type { AccountMaintenance } from '@linode/api-v4';
 
 // Freeze time to a stable reference so relative labels are deterministic
 const NOW_ISO = '2025-10-27T12:00:00.000Z';
 
 describe('Account Maintenance utilities', () => {
-  const policies: MaintenancePolicy[] = [
-    {
-      description: 'Migrate',
-      is_default: true,
-      label: 'Migrate',
-      notification_period_sec: 3 * 60 * 60, // 3 hours
-      slug: 'linode/migrate',
-      type: 'linode_migrate',
-    },
-    {
-      description: 'Power Off / On',
-      is_default: false,
-      label: 'Power Off / Power On',
-      notification_period_sec: 72 * 60 * 60, // 72 hours
-      slug: 'linode/power_off_on',
-      type: 'linode_power_off_on',
-    },
-  ];
 
   const baseMaintenance: Omit<AccountMaintenance, 'when'> & { when: string } = {
     complete_time: null,
@@ -60,33 +42,33 @@ describe('Account Maintenance utilities', () => {
         ...baseMaintenance,
         start_time: '2025-10-27T12:00:00.000Z',
       };
-      expect(deriveMaintenanceStartISO(m, policies)).toBe(
+      expect(deriveMaintenanceStartISO(m)).toBe(
         '2025-10-27T12:00:00.000Z'
       );
     });
 
-    it('derives start_time from when + policy seconds when missing', () => {
+    it('uses when directly as start time (when already accounts for notification period)', () => {
       const m: AccountMaintenance = {
         ...baseMaintenance,
         start_time: null,
-        when: '2025-10-27T09:00:00.000Z', // +3h -> 12:00Z
+        when: '2025-10-27T09:00:00.000Z',
       };
-      expect(deriveMaintenanceStartISO(m, policies)).toBe(
-        '2025-10-27T12:00:00.000Z'
+      // `when` already accounts for notification_period_sec, so it IS the start time
+      expect(deriveMaintenanceStartISO(m)).toBe(
+        '2025-10-27T09:00:00.000Z'
       );
     });
 
-    it('returns undefined when policy cannot be found', () => {
+    it('uses when directly for all statuses without needing policies', () => {
       const m: AccountMaintenance = {
         ...baseMaintenance,
         start_time: null,
-        // Use an intentionally unknown slug to exercise the no-policy fallback path.
-        // Even though the API default is typically 'linode/migrate', the client may
-        // not have policies loaded yet or could encounter a fetch error; this ensures
-        // we verify the graceful fallback behavior.
+        status: 'pending',
+        // Policies not needed - when IS the start time
         maintenance_policy_set: 'unknown/policy' as any,
+        when: '2025-10-27T09:00:00.000Z',
       };
-      expect(deriveMaintenanceStartISO(m, policies)).toBeUndefined();
+      expect(deriveMaintenanceStartISO(m)).toBe('2025-10-27T09:00:00.000Z');
     });
   });
 
@@ -100,7 +82,7 @@ describe('Account Maintenance utilities', () => {
         when: '2025-10-27T10:00:00.000Z',
       };
       // NOW=12:00Z, when=10:00Z => "2 hours ago"
-      expect(getUpcomingRelativeLabel(m, policies)).toContain('hour');
+      expect(getUpcomingRelativeLabel(m)).toContain('hour');
     });
 
     it('uses derived start to express time until maintenance (hours when <1 day)', () => {
@@ -110,16 +92,15 @@ describe('Account Maintenance utilities', () => {
         when: '2025-10-27T09:00:00.000Z',
       };
       // Allow any non-empty string; exact phrasing depends on Luxon locale
-      expect(getUpcomingRelativeLabel(m, policies)).toBeTypeOf('string');
+      expect(getUpcomingRelativeLabel(m)).toBeTypeOf('string');
     });
 
     it('shows days+hours when >= 1 day away (avoids day-only rounding)', () => {
       const m: AccountMaintenance = {
         ...baseMaintenance,
-        maintenance_policy_set: 'linode/power_off_on', // 72h
-        when: '2025-10-25T20:00:00.000Z', // +72h => 2025-10-28T20:00Z; from NOW (27 12:00Z) => 1 day 8 hours
+        when: '2025-10-28T20:00:00.000Z', // from NOW (27 12:00Z) => 1 day 8 hours
       };
-      const label = getUpcomingRelativeLabel(m, policies);
+      const label = getUpcomingRelativeLabel(m);
       expect(label).toBe('in 1 day 8 hours');
     });
 
@@ -129,7 +110,7 @@ describe('Account Maintenance utilities', () => {
         ...baseMaintenance,
         start_time: '2025-10-30T04:00:00.000Z',
       };
-      const label = getUpcomingRelativeLabel(m, policies);
+      const label = getUpcomingRelativeLabel(m);
       expect(label).toBe('in 2 days 16 hours');
     });
 
@@ -139,7 +120,7 @@ describe('Account Maintenance utilities', () => {
         // NOW is 12:00Z; start in 37 minutes
         start_time: '2025-10-27T12:37:00.000Z',
       };
-      const label = getUpcomingRelativeLabel(m, policies);
+      const label = getUpcomingRelativeLabel(m);
       expect(label).toBe('in 37 minutes');
     });
 
@@ -149,8 +130,59 @@ describe('Account Maintenance utilities', () => {
         // NOW is 12:00Z; start in 30 seconds
         start_time: '2025-10-27T12:00:30.000Z',
       };
-      const label = getUpcomingRelativeLabel(m, policies);
+      const label = getUpcomingRelativeLabel(m);
       expect(label).toBe('in 30 seconds');
     });
+
+    it('uses when directly as start time (when already accounts for notification period)', () => {
+      // Real-world scenario: API returns when=2025-11-06T16:12:41
+      // `when` already accounts for notification_period_sec, so it IS the start time
+      const m: AccountMaintenance = {
+        ...baseMaintenance,
+        start_time: null,
+        when: '2025-11-06T16:12:41', // No timezone indicator, should be parsed as UTC
+      };
+
+      const derivedStart = deriveMaintenanceStartISO(m);
+      // `when` equals start time (no addition needed)
+      expect(derivedStart).toBe('2025-11-06T16:12:41.000Z');
+    });
+
+    it('shows correct relative time (when equals start)', () => {
+      // Scenario: when=2025-11-06T16:12:41 (when IS the start time)
+      // If now is 2025-11-06T16:14:41 (2 minutes after when), should show "2 minutes ago"
+      // Save original Date.now
+      const originalDateNow = Date.now;
+
+      // Mock "now" to be 2 minutes after when (which is the start time)
+      const mockNow = '2025-11-06T16:14:41.000Z';
+      Date.now = vi.fn(() => new Date(mockNow).getTime());
+
+      const m: AccountMaintenance = {
+        ...baseMaintenance,
+        start_time: null,
+        when: '2025-11-06T16:12:41',
+      };
+
+      const label = getUpcomingRelativeLabel(m);
+      // when=start=16:12:41, now=16:14:41, difference is 2 minutes in the past
+      expect(label).toContain('minute'); // Should show "2 minutes ago" or similar
+
+      // Restore original Date.now
+      Date.now = originalDateNow;
+    });
+
+    it('handles date without timezone indicator correctly (parsed as UTC)', () => {
+      // Verify that dates without timezone are parsed as UTC
+      const m: AccountMaintenance = {
+        ...baseMaintenance,
+        start_time: null,
+        when: '2025-11-06T16:12:41', // No Z suffix or timezone
+      };
+
+      const derivedStart = deriveMaintenanceStartISO(m);
+      // `when` equals start time (no addition needed)
+      expect(derivedStart).toBe('2025-11-06T16:12:41.000Z');
+    });
   });
 });
diff --git a/packages/manager/src/features/Account/Maintenance/utilities.ts b/packages/manager/src/features/Account/Maintenance/utilities.ts
index 9d751506a38..bb1c7cbe883 100644
--- a/packages/manager/src/features/Account/Maintenance/utilities.ts
+++ b/packages/manager/src/features/Account/Maintenance/utilities.ts
@@ -4,7 +4,7 @@ import { DateTime } from 'luxon';
 import { parseAPIDate } from 'src/utilities/date';
 
 import type { MaintenanceTableType } from './MaintenanceTable';
-import type { AccountMaintenance, MaintenancePolicy } from '@linode/api-v4';
+import type { AccountMaintenance } from '@linode/api-v4';
 
 export const COMPLETED_MAINTENANCE_FILTER = Object.freeze({
   status: { '+or': ['completed', 'canceled'] },
@@ -56,37 +56,36 @@ export const getMaintenanceDateLabel = (type: MaintenanceTableType): string => {
 };
 
 /**
- * Derive the maintenance start when API `start_time` is absent by adding the
- * policy notification window to the `when` (notice publish time).
+ * Derive the maintenance start timestamp.
+ *
+ * The `when` and `start_time` fields are equivalent timestamps representing
+ * when the maintenance will happen (or has happened). Prefer `start_time` if
+ * available, otherwise use `when`.
  */
 export const deriveMaintenanceStartISO = (
-  maintenance: AccountMaintenance,
-  policies?: MaintenancePolicy[]
+  maintenance: AccountMaintenance
 ): string | undefined => {
   if (maintenance.start_time) {
     return maintenance.start_time;
   }
-  const notificationSecs = policies?.find(
-    (p) => p.slug === maintenance.maintenance_policy_set
-  )?.notification_period_sec;
-  if (maintenance.when && notificationSecs) {
-    try {
-      return parseAPIDate(maintenance.when)
-        .plus({ seconds: notificationSecs })
-        .toISO();
-    } catch {
-      return undefined;
-    }
+
+  if (!maintenance.when) {
+    return undefined;
+  }
+
+  // `when` is a timestamp equivalent to `start_time`
+  try {
+    return parseAPIDate(maintenance.when).toISO();
+  } catch {
+    return undefined;
   }
-  return undefined;
 };
 
 /**
  * Build a user-friendly relative label for the Upcoming table.
  *
  * Behavior:
- * - Prefers the actual or policy-derived start time to express time until maintenance
- * - Falls back to the notice relative time when the start cannot be determined
+ * - Uses `start_time` if available, otherwise uses `when` (both are equivalent timestamps)
  * - Avoids day-only rounding by showing days + hours when >= 1 day
  *
  * Formatting rules:
@@ -96,28 +95,29 @@ export const deriveMaintenanceStartISO = (
  * - "in N seconds" when < 1 minute
  */
 export const getUpcomingRelativeLabel = (
-  maintenance: AccountMaintenance,
-  policies?: MaintenancePolicy[]
+  maintenance: AccountMaintenance
 ): string => {
-  const startISO = deriveMaintenanceStartISO(maintenance, policies);
+  const startISO = deriveMaintenanceStartISO(maintenance);
+
+  // Use the derived start timestamp (from start_time or when)
+  const targetDT = startISO
+    ? parseAPIDate(startISO)
+    : maintenance.when
+      ? parseAPIDate(maintenance.when)
+      : null;
 
-  // Fallback: when start cannot be determined, show the notice time relative to now
-  if (!startISO) {
-    return maintenance.when
-      ? (parseAPIDate(maintenance.when).toRelative() ?? '—')
-      : '—';
+  if (!targetDT) {
+    return '—';
   }
 
-  // Prefer the actual or policy-derived start time to express "time until maintenance"
-  const startDT = parseAPIDate(startISO);
-  const now = DateTime.local();
-  if (startDT <= now) {
-    return startDT.toRelative() ?? '—';
+  const now = DateTime.utc();
+  if (targetDT <= now) {
+    return targetDT.toRelative() ?? '—';
   }
 
   // Avoid day-only rounding near boundaries by including hours alongside days.
   // For times under an hour, show exact minutes remaining; under a minute, show seconds.
-  const diff = startDT
+  const diff = targetDT
     .diff(now, ['days', 'hours', 'minutes', 'seconds'])
     .toObject();
   let days = Math.floor(diff.days ?? 0);
@@ -135,6 +135,17 @@ export const getUpcomingRelativeLabel = (
     hours = 0;
   }
 
+  // Round up hours when we have significant minutes (>= 30) for better accuracy
+  if (days >= 1 && minutes >= 30) {
+    hours += 1;
+    minutes = 0;
+    // Check if rounding caused hours to overflow
+    if (hours === 24) {
+      days += 1;
+      hours = 0;
+    }
+  }
+
   if (days >= 1) {
     const dayPart = pluralize('day', 'days', days);
     const hourPart = hours ? ` ${pluralize('hour', 'hours', hours)}` : '';

From 3c9e18f178234ec281a7ee7af6d3f46a85d906b8 Mon Sep 17 00:00:00 2001
From: Ankita <ankitaan@akamai.com>
Date: Mon, 24 Nov 2025 10:05:45 +0530
Subject: [PATCH 29/91] upcoming: [DI-28270] - Remove firewall filtering and
 region filter dependency (#13111)

* upcoming: [DI-28270] - Remove firewall filtering and region filter depdency

* upcoming: [DI-28270] - Remove typo

* upcoming: [DI-28270] - Add condition in error text

* upcoming: [DI-28270] - Add changeset
---
 ...r-13111-upcoming-features-1763615562636.md |  5 ++
 .../CloudPulse/Utils/FilterBuilder.test.ts    | 24 ++----
 .../CloudPulse/Utils/FilterBuilder.ts         |  1 -
 .../features/CloudPulse/Utils/FilterConfig.ts | 13 +--
 .../features/CloudPulse/Utils/utils.test.ts   |  2 -
 .../shared/CloudPulseRegionSelect.test.tsx    | 84 ++++---------------
 .../shared/CloudPulseRegionSelect.tsx         | 60 ++++---------
 7 files changed, 48 insertions(+), 141 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13111-upcoming-features-1763615562636.md

diff --git a/packages/manager/.changeset/pr-13111-upcoming-features-1763615562636.md b/packages/manager/.changeset/pr-13111-upcoming-features-1763615562636.md
new file mode 100644
index 00000000000..7fc2ab5ef65
--- /dev/null
+++ b/packages/manager/.changeset/pr-13111-upcoming-features-1763615562636.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+CloudPulse-Metrics: Remove filtering of firewalls and region filter dependency on firewall-select in Firewalls ([#13111](https://github.com/linode/manager/pull/13111))
diff --git a/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.test.ts b/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.test.ts
index 798a0e85fec..dab4641047f 100644
--- a/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.test.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.test.ts
@@ -147,26 +147,20 @@ it('test getResourceSelectionProperties method for linode-firewall', () => {
   expect(resourceSelectionConfig).toBeDefined();
 
   if (resourceSelectionConfig) {
-    const {
-      disabled,
-      handleResourcesSelection,
-      label,
-      savePreferences,
-      filterFn,
-    } = getResourcesProperties(
-      {
-        config: resourceSelectionConfig,
-        dashboard: { ...mockDashboard, id: 4 },
-        isServiceAnalyticsIntegration: true,
-      },
-      vi.fn()
-    );
+    const { disabled, handleResourcesSelection, label, savePreferences } =
+      getResourcesProperties(
+        {
+          config: resourceSelectionConfig,
+          dashboard: { ...mockDashboard, id: 4 },
+          isServiceAnalyticsIntegration: true,
+        },
+        vi.fn()
+      );
     const { name } = resourceSelectionConfig.configuration;
     expect(handleResourcesSelection).toBeDefined();
     expect(savePreferences).toEqual(false);
     expect(disabled).toEqual(false);
     expect(label).toEqual(name);
-    expect(filterFn).toBeDefined();
   }
 });
 
diff --git a/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.ts b/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.ts
index e692d4bb05d..b63fdd76ca7 100644
--- a/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.ts
@@ -143,7 +143,6 @@ export const getRegionProperties = (
         dashboard
       ),
     xFilter: filterBasedOnConfig(config, dependentFilters ?? {}),
-    selectedEntities: (dependentFilters?.[RESOURCE_ID] ?? []) as string[],
   };
 };
 
diff --git a/packages/manager/src/features/CloudPulse/Utils/FilterConfig.ts b/packages/manager/src/features/CloudPulse/Utils/FilterConfig.ts
index bb52b6bdb2a..30f8922d5c2 100644
--- a/packages/manager/src/features/CloudPulse/Utils/FilterConfig.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/FilterConfig.ts
@@ -11,10 +11,10 @@ import {
   RESOURCE_ID,
 } from './constants';
 import { CloudPulseAvailableViews, CloudPulseSelectTypes } from './models';
-import { filterFirewallResources, filterKubernetesClusters } from './utils';
+import { filterKubernetesClusters } from './utils';
 
 import type { CloudPulseServiceTypeFilterMap } from './models';
-import type { Firewall, KubernetesCluster } from '@linode/api-v4';
+import type { KubernetesCluster } from '@linode/api-v4';
 
 const TIME_DURATION = 'Time Range';
 
@@ -234,7 +234,6 @@ export const FIREWALL_CONFIG: Readonly<CloudPulseServiceTypeFilterMap> = {
     {
       configuration: {
         filterKey: 'resource_id',
-        children: [PARENT_ENTITY_REGION],
         filterType: 'string',
         isFilterable: true,
         isMetricsFilter: true,
@@ -244,14 +243,11 @@ export const FIREWALL_CONFIG: Readonly<CloudPulseServiceTypeFilterMap> = {
         placeholder: 'Select Firewalls',
         priority: 1,
         associatedEntityType: 'linode',
-        filterFn: (resources: Firewall[]) =>
-          filterFirewallResources(resources, 'linode'),
       },
       name: 'Firewalls',
     },
     {
       configuration: {
-        dependency: ['resource_id'],
         filterKey: PARENT_ENTITY_REGION,
         filterType: 'string',
         isFilterable: true,
@@ -339,7 +335,7 @@ export const FIREWALL_NODEBALANCER_CONFIG: Readonly<CloudPulseServiceTypeFilterM
       {
         configuration: {
           filterKey: RESOURCE_ID,
-          children: [PARENT_ENTITY_REGION, NODEBALANCER_ID],
+          children: [NODEBALANCER_ID],
           filterType: 'string',
           isFilterable: true,
           isMetricsFilter: true,
@@ -349,14 +345,11 @@ export const FIREWALL_NODEBALANCER_CONFIG: Readonly<CloudPulseServiceTypeFilterM
           placeholder: 'Select a Firewall',
           priority: 1,
           apiV4QueryKey: queryFactory.resources('firewall'),
-          filterFn: (resources: Firewall[]) =>
-            filterFirewallResources(resources, 'nodebalancer'),
         },
         name: 'Firewall',
       },
       {
         configuration: {
-          dependency: [RESOURCE_ID],
           children: [NODEBALANCER_ID],
           filterKey: PARENT_ENTITY_REGION,
           filterType: 'string',
diff --git a/packages/manager/src/features/CloudPulse/Utils/utils.test.ts b/packages/manager/src/features/CloudPulse/Utils/utils.test.ts
index 3c6d3be0e5f..e2258ec14bd 100644
--- a/packages/manager/src/features/CloudPulse/Utils/utils.test.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/utils.test.ts
@@ -361,14 +361,12 @@ describe('getEnabledServiceTypes', () => {
       const resourcesFilterConfig = getResourcesFilterConfig(4);
       expect(resourcesFilterConfig).toBeDefined();
       expect(resourcesFilterConfig?.associatedEntityType).toBe('linode');
-      expect(resourcesFilterConfig?.filterFn).toBeDefined();
     });
 
     it('should return the resources filter configuration for the nodebalancer-firewall dashboard', () => {
       const resourcesFilterConfig = getResourcesFilterConfig(8);
       expect(resourcesFilterConfig).toBeDefined();
       expect(resourcesFilterConfig?.associatedEntityType).toBe('nodebalancer');
-      expect(resourcesFilterConfig?.filterFn).toBeDefined();
     });
   });
 
diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseRegionSelect.test.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseRegionSelect.test.tsx
index 14d53e1a7e8..1b2d232e68d 100644
--- a/packages/manager/src/features/CloudPulse/shared/CloudPulseRegionSelect.test.tsx
+++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseRegionSelect.test.tsx
@@ -8,11 +8,7 @@ import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import * as React from 'react';
 
-import {
-  dashboardFactory,
-  databaseInstanceFactory,
-  firewallFactory,
-} from 'src/factories';
+import { dashboardFactory, databaseInstanceFactory } from 'src/factories';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { NO_REGION_MESSAGE } from '../Utils/constants';
@@ -24,7 +20,6 @@ import type { useRegionsQuery } from '@linode/queries';
 
 const props: CloudPulseRegionSelectProps = {
   filterKey: 'region',
-  selectedEntities: [],
   handleRegionChange: vi.fn(),
   label: 'Region',
   selectedDashboard: undefined,
@@ -327,26 +322,10 @@ describe('CloudPulseRegionSelect', () => {
           id: 'ap-west',
           label: 'IN, Mumbai',
           capabilities: [capabilityServiceTypeMapping['firewall']],
-        }),
-      ],
-      isError: false,
-      isLoading: false,
-    });
-    queryMocks.useResourcesQuery.mockReturnValue({
-      data: [
-        firewallFactory.build({
-          id: 1,
-          entities: [{ id: 1, type: 'linode' }],
-        }),
-      ],
-      isError: false,
-      isLoading: false,
-    });
-    queryMocks.useAllLinodesQuery.mockReturnValue({
-      data: [
-        linodeFactory.build({
-          id: 1,
-          region: 'ap-west',
+          monitors: {
+            metrics: [capabilityServiceTypeMapping['firewall']],
+            alerts: [],
+          },
         }),
       ],
       isError: false,
@@ -362,7 +341,6 @@ describe('CloudPulseRegionSelect', () => {
           service_type: 'firewall',
           id: 4,
         })}
-        selectedEntities={['1']}
       />
     );
     await user.click(screen.getByRole('button', { name: 'Open' }));
@@ -378,31 +356,16 @@ describe('CloudPulseRegionSelect', () => {
           id: 'ap-west',
           label: 'IN, Mumbai',
           capabilities: [capabilityServiceTypeMapping['firewall']],
+          monitors: {
+            metrics: [capabilityServiceTypeMapping['firewall']],
+            alerts: [],
+          },
         }),
       ],
       isError: false,
       isLoading: false,
     });
-    queryMocks.useResourcesQuery.mockReturnValue({
-      data: [
-        firewallFactory.build({
-          id: 1,
-          entities: [{ id: 1, type: 'linode' }],
-        }),
-      ],
-      isError: false,
-      isLoading: false,
-    });
-    queryMocks.useAllLinodesQuery.mockReturnValue({
-      data: [
-        linodeFactory.build({
-          id: 1,
-          region: 'ap-west',
-        }),
-      ],
-      isError: false,
-      isLoading: false,
-    });
+
     renderWithTheme(
       <CloudPulseRegionSelect
         {...props}
@@ -412,7 +375,6 @@ describe('CloudPulseRegionSelect', () => {
           service_type: 'firewall',
           id: 4,
         })}
-        selectedEntities={['1']}
       />
     );
     expect(screen.getByDisplayValue('IN, Mumbai (ap-west)')).toBeVisible();
@@ -424,31 +386,16 @@ describe('CloudPulseRegionSelect', () => {
           id: 'ap-west',
           label: 'IN, Mumbai',
           capabilities: [capabilityServiceTypeMapping['firewall']],
+          monitors: {
+            metrics: [capabilityServiceTypeMapping['firewall']],
+            alerts: [],
+          },
         }),
       ],
       isError: false,
       isLoading: false,
     });
-    queryMocks.useResourcesQuery.mockReturnValue({
-      data: [
-        firewallFactory.build({
-          id: 1,
-          entities: [{ id: 1, type: 'nodebalancer' }],
-        }),
-      ],
-      isError: false,
-      isLoading: false,
-    });
-    queryMocks.useAllNodeBalancersQuery.mockReturnValue({
-      data: [
-        nodeBalancerFactory.build({
-          id: 1,
-          region: 'ap-west',
-        }),
-      ],
-      isError: false,
-      isLoading: false,
-    });
+
     renderWithTheme(
       <CloudPulseRegionSelect
         {...props}
@@ -458,7 +405,6 @@ describe('CloudPulseRegionSelect', () => {
           service_type: 'firewall',
           id: 8,
         })}
-        selectedEntities={['1']}
       />
     );
     expect(screen.getByDisplayValue('IN, Mumbai (ap-west)')).toBeVisible();
diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseRegionSelect.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseRegionSelect.tsx
index c49ad4c0fd7..5b385bd2c2f 100644
--- a/packages/manager/src/features/CloudPulse/shared/CloudPulseRegionSelect.tsx
+++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseRegionSelect.tsx
@@ -6,7 +6,6 @@ import { RegionSelect } from 'src/components/RegionSelect/RegionSelect';
 import { useFlags } from 'src/hooks/useFlags';
 import { useResourcesQuery } from 'src/queries/cloudpulse/resources';
 
-import { useFirewallFetchOptions } from '../Alerts/CreateAlert/Criteria/DimensionFilterValue/useFirewallFetchOptions';
 import { filterRegionByServiceType } from '../Alerts/Utils/utils';
 import {
   NO_REGION_MESSAGE,
@@ -15,13 +14,9 @@ import {
 } from '../Utils/constants';
 import { deepEqual, filterUsingDependentFilters } from '../Utils/FilterBuilder';
 import { FILTER_CONFIG } from '../Utils/FilterConfig';
-import {
-  getAssociatedEntityType,
-  getResourcesFilterConfig,
-} from '../Utils/utils';
+import { getResourcesFilterConfig } from '../Utils/utils';
 import { CLOUD_PULSE_TEXT_FIELD_PROPS } from './styles';
 
-import type { Item } from '../Alerts/constants';
 import type { CloudPulseMetricsFilter } from '../Dashboard/CloudPulseDashboardLanding';
 import type { Dashboard, FilterValue, Region } from '@linode/api-v4';
 
@@ -39,7 +34,6 @@ export interface CloudPulseRegionSelectProps {
   placeholder?: string;
   savePreferences?: boolean;
   selectedDashboard: Dashboard | undefined;
-  selectedEntities: string[];
   xFilter?: CloudPulseMetricsFilter;
 }
 
@@ -53,7 +47,6 @@ export const CloudPulseRegionSelect = React.memo(
       placeholder,
       savePreferences,
       selectedDashboard,
-      selectedEntities,
       disabled = false,
       xFilter,
     } = props;
@@ -69,7 +62,10 @@ export const CloudPulseRegionSelect = React.memo(
       isError: isResourcesError,
       isLoading: isResourcesLoading,
     } = useResourcesQuery(
-      !disabled && selectedDashboard !== undefined && Boolean(regions?.length),
+      filterKey !== PARENT_ENTITY_REGION &&
+        !disabled &&
+        selectedDashboard !== undefined &&
+        Boolean(regions?.length),
       selectedDashboard?.service_type,
       {},
       {
@@ -93,50 +89,20 @@ export const CloudPulseRegionSelect = React.memo(
 
     const [selectedRegion, setSelectedRegion] = React.useState<string>();
 
-    // Get the associated entity type for the dashboard
-    const associatedEntityType = getAssociatedEntityType(dashboardId);
-    const {
-      values: linodeRegions,
-      isLoading: isLinodeRegionIdLoading,
-      isError: isLinodeRegionIdError,
-    } = useFirewallFetchOptions({
-      dimensionLabel: filterKey,
-      entities: selectedEntities,
-      regions,
-      serviceType,
-      associatedEntityType,
-      type: 'metrics',
-    });
-    const linodeRegionIds = linodeRegions.map(
-      (option: Item<string, string>) => option.value
-    );
-
-    const supportedLinodeRegions = React.useMemo(() => {
-      return (
-        regions?.filter((region) => linodeRegionIds?.includes(region.id)) ?? []
-      );
-    }, [regions, linodeRegionIds]);
-
     const supportedRegions = React.useMemo<Region[]>(() => {
       return filterRegionByServiceType('metrics', regions, serviceType);
     }, [regions, serviceType]);
 
     const supportedRegionsFromResources = React.useMemo(() => {
       if (filterKey === PARENT_ENTITY_REGION) {
-        return supportedLinodeRegions;
+        return supportedRegions;
       }
       return supportedRegions.filter(({ id }) =>
         filterUsingDependentFilters(resources, xFilter)?.some(
           ({ region }) => region === id
         )
       );
-    }, [
-      filterKey,
-      supportedLinodeRegions,
-      supportedRegions,
-      resources,
-      xFilter,
-    ]);
+    }, [supportedRegions, resources, xFilter, filterKey]);
 
     const dependencyKey = supportedRegionsFromResources
       .map((region) => region.id)
@@ -192,9 +158,14 @@ export const CloudPulseRegionSelect = React.memo(
         currentCapability={capability}
         data-testid="region-select"
         disableClearable={false}
-        disabled={!selectedDashboard || !regions || disabled || !resources}
+        disabled={
+          !selectedDashboard ||
+          !regions ||
+          disabled ||
+          (!resources && filterKey !== PARENT_ENTITY_REGION)
+        }
         errorText={
-          isError || isResourcesError || isLinodeRegionIdError
+          isError || (isResourcesError && filterKey !== PARENT_ENTITY_REGION)
             ? `Failed to fetch ${label || 'Regions'}.`
             : ''
         }
@@ -203,7 +174,8 @@ export const CloudPulseRegionSelect = React.memo(
         label={label || 'Region'}
         loading={
           !disabled &&
-          (isLoading || isResourcesLoading || isLinodeRegionIdLoading)
+          (isLoading ||
+            (isResourcesLoading && filterKey !== PARENT_ENTITY_REGION))
         }
         noMarginTop
         noOptionsText={

From 765a0ba90f08d5d8d39d3d6076cf0bef495d8b60 Mon Sep 17 00:00:00 2001
From: grevanak-akamai <145482092+grevanak-akamai@users.noreply.github.com>
Date: Mon, 24 Nov 2025 11:21:37 +0530
Subject: [PATCH 30/91] Upcoming: [UIE-9540] - Implement filter for GPU plans
 in plans panel (#13115)

* Upcoming: [UIE-9540] - Implement filter for GPU plans in plans panel

* Added changeset: Implement filter for GPU plans in plans panel
---
 ...r-13115-upcoming-features-1763630712827.md |   5 +
 .../KubernetesPlanContainer.tsx               |  69 +-------
 .../KubernetesPlansPanel.tsx                  |  16 +-
 .../PlansPanel/DedicatedPlanFilters.tsx       |  39 ++---
 .../components/PlansPanel/GpuFilters.tsx      | 162 ++++++++++++++++++
 .../components/PlansPanel/PlanContainer.tsx   |  81 ++-------
 .../components/PlansPanel/PlansPanel.tsx      |  16 +-
 .../components/PlansPanel/constants.ts        |   7 +-
 .../PlansPanel/types/planFilters.ts           |   9 +
 .../PlansPanel/utils/planFilters.test.ts      |  58 +++++--
 .../PlansPanel/utils/planFilters.ts           |  53 ++++--
 11 files changed, 335 insertions(+), 180 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13115-upcoming-features-1763630712827.md
 create mode 100644 packages/manager/src/features/components/PlansPanel/GpuFilters.tsx

diff --git a/packages/manager/.changeset/pr-13115-upcoming-features-1763630712827.md b/packages/manager/.changeset/pr-13115-upcoming-features-1763630712827.md
new file mode 100644
index 00000000000..881f5d29a08
--- /dev/null
+++ b/packages/manager/.changeset/pr-13115-upcoming-features-1763630712827.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Implement filter for GPU plans in plans panel ([#13115](https://github.com/linode/manager/pull/13115))
diff --git a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanContainer.tsx b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanContainer.tsx
index e17b3c48702..9a798ea38ec 100644
--- a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanContainer.tsx
+++ b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanContainer.tsx
@@ -348,26 +348,6 @@ export const KubernetesPlanContainer = (
 
         const shouldDisplayPagination = !shouldDisplayNoRegionSelectedMessage;
 
-        const dividerTables = planSelectionDividers
-          .map((divider) => ({
-            planType: divider.planType,
-            tables: divider.tables
-              .map((table) => ({
-                filterOptions: table,
-                plans: table.planFilter
-                  ? paginatedPlans.filter(table.planFilter)
-                  : paginatedPlans,
-              }))
-              .filter((table) => table.plans.length > 0),
-          }))
-          .filter((divider) => divider.tables.length > 0);
-
-        const activeDivider = dividerTables.find(
-          (divider) => divider.planType === planType
-        );
-
-        const hasActiveGpuDivider = planType === 'gpu' && activeDivider;
-
         return (
           <>
             <Grid container spacing={2}>
@@ -399,21 +379,6 @@ export const KubernetesPlanContainer = (
                     text={tableEmptyState.message}
                     variant="info"
                   />
-                ) : hasActiveGpuDivider ? (
-                  activeDivider.tables.map(({ filterOptions, plans }, idx) => (
-                    <React.Fragment
-                      key={`k8-mobile-${filterOptions.header ?? idx}`}
-                    >
-                      {filterOptions.header ? (
-                        <Grid size={12}>
-                          <Typography variant="h3">
-                            {filterOptions.header}
-                          </Typography>
-                        </Grid>
-                      ) : null}
-                      {renderPlanSelection(plans)}
-                    </React.Fragment>
-                  ))
                 ) : (
                   renderPlanSelection(paginatedPlans)
                 )}
@@ -425,31 +390,15 @@ export const KubernetesPlanContainer = (
                     xs: 12,
                   }}
                 >
-                  {hasActiveGpuDivider ? (
-                    activeDivider.tables.map(
-                      ({ filterOptions, plans }, idx) => (
-                        <KubernetesPlanSelectionTable
-                          filterOptions={filterOptions}
-                          key={`k8-plan-filter-${idx}`}
-                          plans={plans}
-                          renderPlanSelection={renderPlanSelection}
-                          shouldDisplayNoRegionSelectedMessage={
-                            shouldDisplayNoRegionSelectedMessage
-                          }
-                        />
-                      )
-                    )
-                  ) : (
-                    <KubernetesPlanSelectionTable
-                      filterEmptyStateMessage={tableEmptyState?.message}
-                      key={planType ?? 'all'}
-                      plans={paginatedPlans}
-                      renderPlanSelection={renderPlanSelection}
-                      shouldDisplayNoRegionSelectedMessage={
-                        shouldDisplayNoRegionSelectedMessage
-                      }
-                    />
-                  )}
+                  <KubernetesPlanSelectionTable
+                    filterEmptyStateMessage={tableEmptyState?.message}
+                    key={planType ?? 'all'}
+                    plans={paginatedPlans}
+                    renderPlanSelection={renderPlanSelection}
+                    shouldDisplayNoRegionSelectedMessage={
+                      shouldDisplayNoRegionSelectedMessage
+                    }
+                  />
                 </Grid>
               </Hidden>
             </Grid>
diff --git a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx
index 35fdc3e77f8..74afbe23aac 100644
--- a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx
+++ b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx
@@ -4,6 +4,7 @@ import type { JSX } from 'react';
 
 import { TabbedPanel } from 'src/components/TabbedPanel/TabbedPanel';
 import { createDedicatedPlanFiltersRenderProp } from 'src/features/components/PlansPanel/DedicatedPlanFilters';
+import { createGPUPlanFilterRenderProp } from 'src/features/components/PlansPanel/GpuFilters';
 import { PlanInformation } from 'src/features/components/PlansPanel/PlanInformation';
 import {
   determineInitialPlanCategoryTab,
@@ -153,11 +154,16 @@ export const KubernetesPlansPanel = (props: Props) => {
                 hasMajorityOfPlansDisabled={hasMajorityOfPlansDisabled}
                 onAdd={onAdd}
                 onSelect={onSelect}
-                planFilters={
-                  plan === 'dedicated'
-                    ? createDedicatedPlanFiltersRenderProp()
-                    : undefined
-                }
+                planFilters={(() => {
+                  switch (plan) {
+                    case 'dedicated':
+                      return createDedicatedPlanFiltersRenderProp();
+                    case 'gpu':
+                      return createGPUPlanFilterRenderProp();
+                    default:
+                      return undefined;
+                  }
+                })()}
                 plans={plansForThisLinodeTypeClass}
                 planType={plan}
                 selectedId={selectedId}
diff --git a/packages/manager/src/features/components/PlansPanel/DedicatedPlanFilters.tsx b/packages/manager/src/features/components/PlansPanel/DedicatedPlanFilters.tsx
index a7bc0818739..6a6eb401d97 100644
--- a/packages/manager/src/features/components/PlansPanel/DedicatedPlanFilters.tsx
+++ b/packages/manager/src/features/components/PlansPanel/DedicatedPlanFilters.tsx
@@ -12,15 +12,17 @@ import { Select } from '@linode/ui';
 import * as React from 'react';
 
 import {
-  PLAN_FILTER_GENERATION_ALL,
+  PLAN_FILTER_ALL,
   PLAN_FILTER_GENERATION_G6,
   PLAN_FILTER_GENERATION_G7,
   PLAN_FILTER_GENERATION_G8,
-  PLAN_FILTER_TYPE_ALL,
   PLAN_FILTER_TYPE_COMPUTE_OPTIMIZED,
   PLAN_FILTER_TYPE_GENERAL_PURPOSE,
 } from './constants';
-import { applyPlanFilters, supportsTypeFiltering } from './utils/planFilters';
+import {
+  applyDedicatedPlanFilters,
+  supportsTypeFiltering,
+} from './utils/planFilters';
 
 import type {
   PlanFilterRenderArgs,
@@ -31,20 +33,20 @@ import type { PlanFilterGeneration, PlanFilterType } from './types/planFilters';
 import type { SelectOption } from '@linode/ui';
 
 const GENERATION_OPTIONS: SelectOption<PlanFilterGeneration>[] = [
-  { label: 'All', value: PLAN_FILTER_GENERATION_ALL },
+  { label: 'All', value: PLAN_FILTER_ALL },
   { label: 'G8 Dedicated', value: PLAN_FILTER_GENERATION_G8 },
   { label: 'G7 Dedicated', value: PLAN_FILTER_GENERATION_G7 },
   { label: 'G6 Dedicated', value: PLAN_FILTER_GENERATION_G6 },
 ];
 
 const TYPE_OPTIONS_WITH_SUBTYPES: SelectOption<PlanFilterType>[] = [
-  { label: 'All', value: PLAN_FILTER_TYPE_ALL },
+  { label: 'All', value: PLAN_FILTER_ALL },
   { label: 'Compute Optimized', value: PLAN_FILTER_TYPE_COMPUTE_OPTIMIZED },
   { label: 'General Purpose', value: PLAN_FILTER_TYPE_GENERAL_PURPOSE },
 ];
 
 const TYPE_OPTIONS_ALL_ONLY: SelectOption<PlanFilterType>[] = [
-  { label: 'All', value: PLAN_FILTER_TYPE_ALL },
+  { label: 'All', value: PLAN_FILTER_ALL },
 ];
 
 interface DedicatedPlanFiltersComponentProps {
@@ -59,12 +61,10 @@ const DedicatedPlanFiltersComponent = React.memo(
     const { disabled = false, onResult, plans, resetPagination } = props;
 
     // Local state - persists automatically because component stays mounted
-    const [generation, setGeneration] = React.useState<PlanFilterGeneration>(
-      PLAN_FILTER_GENERATION_ALL
-    );
+    const [generation, setGeneration] =
+      React.useState<PlanFilterGeneration>(PLAN_FILTER_ALL);
 
-    const [type, setType] =
-      React.useState<PlanFilterType>(PLAN_FILTER_TYPE_ALL);
+    const [type, setType] = React.useState<PlanFilterType>(PLAN_FILTER_ALL);
 
     const typeFilteringSupported = supportsTypeFiltering(generation);
 
@@ -109,11 +109,11 @@ const DedicatedPlanFiltersComponent = React.memo(
         // When clearing, default to "All" instead of undefined
         const newGeneration =
           (option?.value as PlanFilterGeneration | undefined) ??
-          PLAN_FILTER_GENERATION_ALL;
+          PLAN_FILTER_ALL;
         setGeneration(newGeneration);
 
         // Reset type filter when generation changes
-        setType(PLAN_FILTER_TYPE_ALL);
+        setType(PLAN_FILTER_ALL);
       },
       []
     );
@@ -124,17 +124,15 @@ const DedicatedPlanFiltersComponent = React.memo(
         option: null | SelectOption<number | string>
       ) => {
         setType(
-          (option?.value as PlanFilterType | undefined) ?? PLAN_FILTER_TYPE_ALL
+          (option?.value as PlanFilterType | undefined) ?? PLAN_FILTER_ALL
         );
       },
       []
     );
 
     const filteredPlans = React.useMemo(() => {
-      const normalizedType = typeFilteringSupported
-        ? type
-        : PLAN_FILTER_TYPE_ALL;
-      return applyPlanFilters(plans, generation, normalizedType);
+      const normalizedType = typeFilteringSupported ? type : PLAN_FILTER_ALL;
+      return applyDedicatedPlanFilters(plans, generation, normalizedType);
     }, [generation, plans, type, typeFilteringSupported]);
 
     const selectedGenerationOption = React.useMemo(() => {
@@ -142,7 +140,7 @@ const DedicatedPlanFiltersComponent = React.memo(
     }, [generation]);
 
     const selectedTypeOption = React.useMemo(() => {
-      const displayType = typeFilteringSupported ? type : PLAN_FILTER_TYPE_ALL;
+      const displayType = typeFilteringSupported ? type : PLAN_FILTER_ALL;
       return typeOptions.find((opt) => opt.value === displayType) ?? null;
     }, [type, typeFilteringSupported, typeOptions]);
 
@@ -155,6 +153,7 @@ const DedicatedPlanFiltersComponent = React.memo(
             flexWrap: 'wrap',
             gap: '19px',
             marginBottom: 16,
+            marginTop: -16,
           }}
         >
           <Select
@@ -189,7 +188,7 @@ const DedicatedPlanFiltersComponent = React.memo(
       return {
         filteredPlans,
         filterUI,
-        hasActiveFilters: generation !== PLAN_FILTER_GENERATION_ALL,
+        hasActiveFilters: generation !== PLAN_FILTER_ALL,
       };
     }, [
       disabled,
diff --git a/packages/manager/src/features/components/PlansPanel/GpuFilters.tsx b/packages/manager/src/features/components/PlansPanel/GpuFilters.tsx
new file mode 100644
index 00000000000..0fcaabe5c46
--- /dev/null
+++ b/packages/manager/src/features/components/PlansPanel/GpuFilters.tsx
@@ -0,0 +1,162 @@
+/**
+ * GPUPlanFilter Component
+ *
+ * Filter component for GPU plans. Composes Select dropdown and
+ * uses local React state to manage filter selections.
+ */
+
+import { Select } from '@linode/ui';
+import * as React from 'react';
+
+import {
+  PLAN_FILTER_ALL,
+  PLAN_FILTER_GPU_RTX_4000_ADA,
+  PLAN_FILTER_GPU_RTX_6000,
+  PLAN_FILTER_GPU_RTX_PRO_6000,
+} from './constants';
+import { filterPlansByGpuType } from './utils/planFilters';
+
+import type {
+  PlanFilterRenderArgs,
+  PlanFilterRenderResult,
+} from './PlanContainer';
+import type { PlanWithAvailability } from './types';
+import type { PlanFilterGPU } from './types/planFilters';
+import type { SelectOption } from '@linode/ui';
+
+const ALL_GPU_OPTIONS: SelectOption<PlanFilterGPU>[] = [
+  { label: 'All', value: PLAN_FILTER_ALL },
+  { label: 'RTX PRO 6000 Blackwell', value: PLAN_FILTER_GPU_RTX_PRO_6000 },
+  { label: 'RTX 4000 Ada', value: PLAN_FILTER_GPU_RTX_4000_ADA },
+  { label: 'Quadro RTX 6000', value: PLAN_FILTER_GPU_RTX_6000 },
+];
+
+interface GPUPlanFilterComponentProps {
+  onResult: (result: PlanFilterRenderResult) => void;
+  plans: PlanWithAvailability[];
+  resetPagination: () => void;
+}
+
+const GPUPlanFilterComponent = React.memo(
+  (props: GPUPlanFilterComponentProps) => {
+    const { onResult, plans, resetPagination } = props;
+
+    // Local state - persists automatically because component stays mounted
+    const [gpuType, setGpuType] =
+      React.useState<PlanFilterGPU>(PLAN_FILTER_ALL);
+
+    const previousFilters = React.useRef<{
+      gpuType?: PlanFilterGPU;
+    }>(null);
+
+    // Compute available GPU options based on plans
+    const GPU_OPTIONS_BASED_ON_AVAILABLE_PLANS = React.useMemo(() => {
+      return ALL_GPU_OPTIONS.filter((option) => {
+        if (option.value === 'all') {
+          return true;
+        }
+        const filteredPlans = filterPlansByGpuType(plans, option.value);
+        return filteredPlans.length > 0;
+      });
+    }, [plans]);
+
+    // Reset pagination when filters change (but not on initial mount)
+    React.useEffect(() => {
+      // Skip pagination reset on initial mount
+      if (previousFilters.current === null) {
+        previousFilters.current = { gpuType };
+        return;
+      }
+
+      const { gpuType: prevGpuType } = previousFilters.current;
+
+      if (prevGpuType !== gpuType) {
+        resetPagination();
+      }
+
+      previousFilters.current = { gpuType };
+    }, [gpuType, resetPagination]);
+
+    const handleGpuTypeChange = React.useCallback(
+      (
+        _event: React.SyntheticEvent,
+        option: null | SelectOption<number | string>
+      ) => {
+        const newGpuType =
+          (option?.value as PlanFilterGPU | undefined) ?? PLAN_FILTER_ALL;
+        setGpuType(newGpuType);
+      },
+      []
+    );
+
+    const filteredPlans = React.useMemo(() => {
+      return filterPlansByGpuType(plans, gpuType);
+    }, [gpuType, plans]);
+
+    const selectedGpuType = React.useMemo(() => {
+      return (
+        GPU_OPTIONS_BASED_ON_AVAILABLE_PLANS.find(
+          (opt) => opt.value === gpuType
+        ) ?? null
+      );
+    }, [gpuType, GPU_OPTIONS_BASED_ON_AVAILABLE_PLANS]);
+
+    const result = React.useMemo<PlanFilterRenderResult>(() => {
+      const filterUI = (
+        <div
+          style={{
+            marginBottom: 16,
+            marginTop: -16,
+          }}
+        >
+          <Select
+            aria-labelledby="plan-filter-gpu-label"
+            data-testid="plan-filter-gpu"
+            id="plan-filter-gpu"
+            label="GPU Plans"
+            onChange={handleGpuTypeChange}
+            options={GPU_OPTIONS_BASED_ON_AVAILABLE_PLANS}
+            placeholder="Select a plan"
+            value={selectedGpuType}
+          />
+        </div>
+      );
+
+      return {
+        filteredPlans,
+        filterUI,
+        hasActiveFilters: gpuType !== PLAN_FILTER_ALL,
+      };
+    }, [
+      GPU_OPTIONS_BASED_ON_AVAILABLE_PLANS,
+      filteredPlans,
+      gpuType,
+      handleGpuTypeChange,
+      selectedGpuType,
+    ]);
+
+    // Notify parent component whenever filter result changes
+    // onResult is stable (created with useCallback in parent), so this is safe
+    React.useEffect(() => {
+      onResult(result);
+    }, [onResult, result]);
+
+    return null;
+  }
+);
+
+GPUPlanFilterComponent.displayName = 'GPUPlanFilterComponent';
+
+export const createGPUPlanFilterRenderProp = () => {
+  return ({
+    onResult,
+    plans,
+    resetPagination,
+  }: PlanFilterRenderArgs): React.ReactNode => (
+    <GPUPlanFilterComponent
+      onResult={onResult}
+      plans={plans}
+      resetPagination={resetPagination}
+    />
+  );
+};
diff --git a/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx b/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx
index fe283fcf920..e14ab6d10e9 100644
--- a/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx
+++ b/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx
@@ -443,75 +443,26 @@ export const PlanContainer = (props: PlanContainerProps) => {
                     variant="info"
                   />
                 ) : (
-                  planSelectionDividers.map((planSelectionDivider) =>
-                    planType === planSelectionDivider.planType
-                      ? planSelectionDivider.tables.map((table) => {
-                          const filteredPlans = table.planFilter
-                            ? paginatedPlans.filter(table.planFilter)
-                            : paginatedPlans;
-                          const tableRows = renderPlanSelection(filteredPlans);
-
-                          return [
-                            filteredPlans.length > 0 && (
-                              <Grid key={table.header} size={12}>
-                                <Typography variant="h3">
-                                  {table.header}
-                                </Typography>
-                              </Grid>
-                            ),
-                            tableRows,
-                          ];
-                        })
-                      : renderPlanSelection(paginatedPlans)
-                  )
+                  renderPlanSelection(paginatedPlans)
                 )}
               </Hidden>
               <Hidden lgDown={isCreate} mdDown={!isCreate}>
                 <Grid size={12}>
-                  {planSelectionDividers.map((planSelectionDivider) =>
-                    planType === planSelectionDivider.planType ? (
-                      planSelectionDivider.tables.map((table, idx) => {
-                        const filteredPlans = table.planFilter
-                          ? paginatedPlans.filter(table.planFilter)
-                          : paginatedPlans;
-                        if (filteredPlans.length === 0) {
-                          return null;
-                        }
-
-                        return (
-                          <PlanSelectionTable
-                            filterOptions={{
-                              header: table.header,
-                            }}
-                            key={`plan-filter-${idx}`}
-                            plans={filteredPlans}
-                            renderPlanSelection={renderPlanSelection}
-                            shouldDisplayNoRegionSelectedMessage={
-                              shouldDisplayNoRegionSelectedMessage
-                            }
-                            showNetwork={showNetwork}
-                            showTransfer={showTransfer}
-                          />
-                        );
-                      })
-                    ) : (
-                      <PlanSelectionTable
-                        filterEmptyStateMessage={tableEmptyState?.message}
-                        key={planType}
-                        plans={paginatedPlans}
-                        planType={planType}
-                        renderPlanSelection={renderPlanSelection}
-                        shouldDisplayNoRegionSelectedMessage={
-                          shouldDisplayNoRegionSelectedMessage
-                        }
-                        showNetwork={showNetwork}
-                        showTransfer={showTransfer}
-                        showUsableStorage={
-                          isDatabaseCreateFlow || isDatabaseResizeFlow
-                        }
-                      />
-                    )
-                  )}
+                  <PlanSelectionTable
+                    filterEmptyStateMessage={tableEmptyState?.message}
+                    key={planType}
+                    plans={paginatedPlans}
+                    planType={planType}
+                    renderPlanSelection={renderPlanSelection}
+                    shouldDisplayNoRegionSelectedMessage={
+                      shouldDisplayNoRegionSelectedMessage
+                    }
+                    showNetwork={showNetwork}
+                    showTransfer={showTransfer}
+                    showUsableStorage={
+                      isDatabaseCreateFlow || isDatabaseResizeFlow
+                    }
+                  />
                 </Grid>
               </Hidden>
             </Grid>
diff --git a/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx b/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx
index fdce685c336..5a24b9c9b5a 100644
--- a/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx
+++ b/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx
@@ -17,6 +17,7 @@ import { useFlags } from 'src/hooks/useFlags';
 
 import { createDedicatedPlanFiltersRenderProp } from './DedicatedPlanFilters';
 import { DistributedRegionPlanTable } from './DistributedRegionPlanTable';
+import { createGPUPlanFilterRenderProp } from './GpuFilters';
 import { PlanContainer } from './PlanContainer';
 import { PlanInformation } from './PlanInformation';
 import {
@@ -224,11 +225,16 @@ export const PlansPanel = (props: PlansPanelProps) => {
                 isCreate={isCreate}
                 linodeID={linodeID}
                 onSelect={onSelect}
-                planFilters={
-                  plan === 'dedicated'
-                    ? createDedicatedPlanFiltersRenderProp()
-                    : undefined
-                }
+                planFilters={(() => {
+                  switch (plan) {
+                    case 'dedicated':
+                      return createDedicatedPlanFiltersRenderProp();
+                    case 'gpu':
+                      return createGPUPlanFilterRenderProp();
+                    default:
+                      return undefined;
+                  }
+                })()}
                 plans={plansForThisLinodeTypeClass}
                 planType={plan}
                 selectedId={selectedId}
diff --git a/packages/manager/src/features/components/PlansPanel/constants.ts b/packages/manager/src/features/components/PlansPanel/constants.ts
index f2eb165b686..b43ae5a3719 100644
--- a/packages/manager/src/features/components/PlansPanel/constants.ts
+++ b/packages/manager/src/features/components/PlansPanel/constants.ts
@@ -78,16 +78,19 @@ export const G8_DEDICATED_ALL_SLUGS = [
   ...G8_DEDICATED_GENERAL_PURPOSE_SLUGS,
 ] as const;
 
+export const PLAN_FILTER_ALL = 'all';
 // Filter option values
-export const PLAN_FILTER_GENERATION_ALL = 'all';
 export const PLAN_FILTER_GENERATION_G8 = 'g8';
 export const PLAN_FILTER_GENERATION_G7 = 'g7';
 export const PLAN_FILTER_GENERATION_G6 = 'g6';
 
-export const PLAN_FILTER_TYPE_ALL = 'all';
 export const PLAN_FILTER_TYPE_COMPUTE_OPTIMIZED = 'compute-optimized';
 export const PLAN_FILTER_TYPE_GENERAL_PURPOSE = 'general-purpose';
 
+export const PLAN_FILTER_GPU_RTX_PRO_6000 = 'gpu-rtxpro6000';
+export const PLAN_FILTER_GPU_RTX_6000 = 'gpu-rtx6000';
+export const PLAN_FILTER_GPU_RTX_4000_ADA = 'gpu-rtx4000';
+
 export const DEDICATED_512_GB_PLAN: ExtendedType = {
   accelerated_devices: 0,
   addons: {
diff --git a/packages/manager/src/features/components/PlansPanel/types/planFilters.ts b/packages/manager/src/features/components/PlansPanel/types/planFilters.ts
index 06de06e9855..8e3f37b9eba 100644
--- a/packages/manager/src/features/components/PlansPanel/types/planFilters.ts
+++ b/packages/manager/src/features/components/PlansPanel/types/planFilters.ts
@@ -21,6 +21,15 @@ export type PlanFilterGeneration = 'all' | 'g6' | 'g7' | 'g8';
  */
 export type PlanFilterType = 'all' | 'compute-optimized' | 'general-purpose';
 
+/**
+ * Available plans for GPU
+ */
+export type PlanFilterGPU =
+  | 'all'
+  | 'gpu-rtx4000'
+  | 'gpu-rtx6000'
+  | 'gpu-rtxpro6000';
+
 // ============================================================================
 // Filter State
 // ============================================================================
diff --git a/packages/manager/src/features/components/PlansPanel/utils/planFilters.test.ts b/packages/manager/src/features/components/PlansPanel/utils/planFilters.test.ts
index c6672f0fd64..1c4e99cf5c5 100644
--- a/packages/manager/src/features/components/PlansPanel/utils/planFilters.test.ts
+++ b/packages/manager/src/features/components/PlansPanel/utils/planFilters.test.ts
@@ -1,13 +1,14 @@
 import { planSelectionTypeFactory } from 'src/factories/types';
 
 import {
-  PLAN_FILTER_TYPE_ALL,
+  PLAN_FILTER_ALL,
   PLAN_FILTER_TYPE_COMPUTE_OPTIMIZED,
   PLAN_FILTER_TYPE_GENERAL_PURPOSE,
 } from '../constants';
 import {
-  applyPlanFilters,
+  applyDedicatedPlanFilters,
   filterPlansByGeneration,
+  filterPlansByGpuType,
   filterPlansByType,
   getAvailableTypes,
   supportsTypeFiltering,
@@ -48,6 +49,23 @@ describe('planFilters utilities', () => {
     label: 'Unlisted G8 Plan',
   });
 
+  const rtx4000Plan = createPlan({
+    id: 'g2-gpu-rtx4000a1-s',
+    label: 'RTX4000 Ada x1 Small',
+  });
+
+  const rtx6000Plan = createPlan({
+    id: 'g8-gpu-rtx6000-1',
+    label: 'Dedicated 32GB + RTX6000 GPU x1',
+  });
+
+  const rtxPro6000Plan = createPlan({
+    id: 'g3-gpu-rtxpro6000-blackwell-1',
+    label: 'RTX PRO 6000 Blackwell x1',
+  });
+
+  const gpuPlans = [rtx4000Plan, rtx6000Plan, rtxPro6000Plan];
+
   describe('filterPlansByGeneration', () => {
     it('returns only G8 plans that exist in the allow-list', () => {
       const result = filterPlansByGeneration(
@@ -97,7 +115,7 @@ describe('planFilters utilities', () => {
       const result = filterPlansByType(
         [g8ComputePlan, g8GeneralPlan],
         'g8',
-        PLAN_FILTER_TYPE_ALL
+        PLAN_FILTER_ALL
       );
 
       expect(result).toEqual([g8ComputePlan, g8GeneralPlan]);
@@ -146,19 +164,19 @@ describe('planFilters utilities', () => {
     });
   });
 
-  describe('applyPlanFilters', () => {
+  describe('applyDedicatedPlanFilters', () => {
     it('returns an empty array when no generation is selected', () => {
-      const result = applyPlanFilters(
+      const result = applyDedicatedPlanFilters(
         [g8ComputePlan, g8GeneralPlan],
         undefined,
-        PLAN_FILTER_TYPE_ALL
+        PLAN_FILTER_ALL
       );
 
       expect(result).toEqual([]);
     });
 
     it('applies both generation and type filters', () => {
-      const result = applyPlanFilters(
+      const result = applyDedicatedPlanFilters(
         [g8ComputePlan, g8GeneralPlan, g7DedicatedPlan, g7PremiumPlan, g6Plan],
         'g8',
         PLAN_FILTER_TYPE_GENERAL_PURPOSE
@@ -168,10 +186,10 @@ describe('planFilters utilities', () => {
     });
 
     it('returns all dedicated plans when generation is "all"', () => {
-      const result = applyPlanFilters(
+      const result = applyDedicatedPlanFilters(
         [g8ComputePlan, g8GeneralPlan, g7DedicatedPlan, g7PremiumPlan, g6Plan],
         'all',
-        PLAN_FILTER_TYPE_ALL
+        PLAN_FILTER_ALL
       );
 
       expect(result).toEqual([
@@ -196,16 +214,30 @@ describe('planFilters utilities', () => {
   describe('getAvailableTypes', () => {
     it('returns all type options for G8', () => {
       expect(getAvailableTypes('g8')).toEqual([
-        PLAN_FILTER_TYPE_ALL,
+        PLAN_FILTER_ALL,
         PLAN_FILTER_TYPE_COMPUTE_OPTIMIZED,
         PLAN_FILTER_TYPE_GENERAL_PURPOSE,
       ]);
     });
 
     it('returns only the "all" option for G7, G6, and "all" generation', () => {
-      expect(getAvailableTypes('g7')).toEqual([PLAN_FILTER_TYPE_ALL]);
-      expect(getAvailableTypes('g6')).toEqual([PLAN_FILTER_TYPE_ALL]);
-      expect(getAvailableTypes('all')).toEqual([PLAN_FILTER_TYPE_ALL]);
+      expect(getAvailableTypes('g7')).toEqual([PLAN_FILTER_ALL]);
+      expect(getAvailableTypes('g6')).toEqual([PLAN_FILTER_ALL]);
+      expect(getAvailableTypes('all')).toEqual([PLAN_FILTER_ALL]);
+    });
+  });
+
+  describe('filterPlansByGpuType', () => {
+    it('returns only RTX4000 plans that exist in the allow-list', () => {
+      const result = filterPlansByGpuType(gpuPlans, 'gpu-rtx4000');
+
+      expect(result).toEqual([rtx4000Plan]);
+    });
+
+    it('returns all GPU plans when type is "all"', () => {
+      const result = filterPlansByGpuType(gpuPlans, 'all');
+
+      expect(result).toEqual(gpuPlans);
     });
   });
 });
diff --git a/packages/manager/src/features/components/PlansPanel/utils/planFilters.ts b/packages/manager/src/features/components/PlansPanel/utils/planFilters.ts
index c62bcf6c7fb..9dd66d55a8d 100644
--- a/packages/manager/src/features/components/PlansPanel/utils/planFilters.ts
+++ b/packages/manager/src/features/components/PlansPanel/utils/planFilters.ts
@@ -9,7 +9,7 @@ import {
   G8_DEDICATED_ALL_SLUGS,
   G8_DEDICATED_COMPUTE_OPTIMIZED_SLUGS,
   G8_DEDICATED_GENERAL_PURPOSE_SLUGS,
-  PLAN_FILTER_TYPE_ALL,
+  PLAN_FILTER_ALL,
   PLAN_FILTER_TYPE_COMPUTE_OPTIMIZED,
   PLAN_FILTER_TYPE_GENERAL_PURPOSE,
 } from '../constants';
@@ -19,6 +19,7 @@ import type {
   PlanFilterType,
   PlanWithAvailability,
 } from '../types';
+import type { PlanFilterGPU } from '../types/planFilters';
 
 // ============================================================================
 // Generation Filtering
@@ -88,7 +89,7 @@ export const filterPlansByType = (
   type: PlanFilterType
 ): PlanWithAvailability[] => {
   // "All" returns all plans unchanged
-  if (type === PLAN_FILTER_TYPE_ALL) {
+  if (type === PLAN_FILTER_ALL) {
     return plans;
   }
 
@@ -133,22 +134,22 @@ export const filterPlansByType = (
  * @example
  * ```ts
  * // Get G8 Compute Optimized plans
- * const filtered = applyPlanFilters(allPlans, 'g8', 'compute-optimized');
+ * const filtered = applyDedicatedPlanFilters(allPlans, 'g8', 'compute-optimized');
  *
  * // Get all G7 plans
- * const g7All = applyPlanFilters(allPlans, 'g7', 'all');
+ * const g7All = applyDedicatedPlanFilters(allPlans, 'g7', 'all');
  *
  * // Get all dedicated plans (G6, G7, G8)
- * const allDedicated = applyPlanFilters(allPlans, 'all', 'all');
+ * const allDedicated = applyDedicatedPlanFilters(allPlans, 'all', 'all');
  *
  * // No filters - return empty array
- * const none = applyPlanFilters(allPlans);
+ * const none = applyDedicatedPlanFilters(allPlans);
  * ```
  */
-export const applyPlanFilters = (
+export const applyDedicatedPlanFilters = (
   plans: PlanWithAvailability[],
   generation?: PlanFilterGeneration,
-  type: PlanFilterType = PLAN_FILTER_TYPE_ALL
+  type: PlanFilterType = PLAN_FILTER_ALL
 ): PlanWithAvailability[] => {
   // No filters - return empty array
   if (!generation) {
@@ -162,6 +163,38 @@ export const applyPlanFilters = (
   return filterPlansByType(generationFiltered, generation, type);
 };
 
+// ============================================================================
+// GPU Filtering
+// ============================================================================
+
+/**
+ * Filter plans by gpu type
+ *
+ * @param plans - Array of all plans (mostly pre-filtered by plan type/class)
+ * @param gpuType - The GPU type to filter by
+ * @returns Filtered array of plans matching the generation
+ *
+ * @example
+ * ```ts
+ * const rtx4000Plans = filterPlansByGpuType(allPlans, 'gpu-rtx4000');
+ * // Returns all plans with GPU type 'gpu-rtx4000'
+ *
+ * const allDedicatedPlans = filterPlansByGpuType(allPlans, 'all');
+ * // Returns all plans as-is (already filtered by plan type in parent)
+ * ```
+ */
+export const filterPlansByGpuType = (
+  plans: PlanWithAvailability[],
+  gpuType?: PlanFilterGPU
+): PlanWithAvailability[] => {
+  // For "All", return all plans as-is
+  // The plans array is already filtered to only GPU plans by the parent component
+  if (!gpuType || gpuType === PLAN_FILTER_ALL) {
+    return plans;
+  }
+  return plans.filter((plan) => plan.id.includes(gpuType));
+};
+
 // ============================================================================
 // Helper Functions
 // ============================================================================
@@ -196,12 +229,12 @@ export const getAvailableTypes = (
 ): PlanFilterType[] => {
   if (generation === 'g8') {
     return [
-      PLAN_FILTER_TYPE_ALL,
+      PLAN_FILTER_ALL,
       PLAN_FILTER_TYPE_COMPUTE_OPTIMIZED,
       PLAN_FILTER_TYPE_GENERAL_PURPOSE,
     ];
   }
 
   // G7, G6, and "All" only have "All" type option
-  return [PLAN_FILTER_TYPE_ALL];
+  return [PLAN_FILTER_ALL];
 };

From eaff2e060c94a0c0a65c979d7dd0fb7eb3a4ca2f Mon Sep 17 00:00:00 2001
From: tvijay-akamai <51293194+tvijay-akamai@users.noreply.github.com>
Date: Mon, 24 Nov 2025 16:21:34 +0530
Subject: [PATCH 31/91] Fixed Pagination issue in kubernetes plans table
 (#13126)

* fixed: [UIE-9656] fixed pagination issue in kubernetes
---
 .../src/features/Account/Maintenance/utilities.test.ts   | 9 ++-------
 .../KubernetesPlansPanel/KubernetesPlanContainer.tsx     | 1 +
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/manager/src/features/Account/Maintenance/utilities.test.ts b/packages/manager/src/features/Account/Maintenance/utilities.test.ts
index a79abd20356..c6629ae3205 100644
--- a/packages/manager/src/features/Account/Maintenance/utilities.test.ts
+++ b/packages/manager/src/features/Account/Maintenance/utilities.test.ts
@@ -11,7 +11,6 @@ import type { AccountMaintenance } from '@linode/api-v4';
 const NOW_ISO = '2025-10-27T12:00:00.000Z';
 
 describe('Account Maintenance utilities', () => {
-
   const baseMaintenance: Omit<AccountMaintenance, 'when'> & { when: string } = {
     complete_time: null,
     description: 'scheduled',
@@ -42,9 +41,7 @@ describe('Account Maintenance utilities', () => {
         ...baseMaintenance,
         start_time: '2025-10-27T12:00:00.000Z',
       };
-      expect(deriveMaintenanceStartISO(m)).toBe(
-        '2025-10-27T12:00:00.000Z'
-      );
+      expect(deriveMaintenanceStartISO(m)).toBe('2025-10-27T12:00:00.000Z');
     });
 
     it('uses when directly as start time (when already accounts for notification period)', () => {
@@ -54,9 +51,7 @@ describe('Account Maintenance utilities', () => {
         when: '2025-10-27T09:00:00.000Z',
       };
       // `when` already accounts for notification_period_sec, so it IS the start time
-      expect(deriveMaintenanceStartISO(m)).toBe(
-        '2025-10-27T09:00:00.000Z'
-      );
+      expect(deriveMaintenanceStartISO(m)).toBe('2025-10-27T09:00:00.000Z');
     });
 
     it('uses when directly for all statuses without needing policies', () => {
diff --git a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanContainer.tsx b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanContainer.tsx
index 9a798ea38ec..dd627103896 100644
--- a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanContainer.tsx
+++ b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanContainer.tsx
@@ -408,6 +408,7 @@ export const KubernetesPlanContainer = (
                 customOptions={PLAN_PANEL_PAGE_SIZE_OPTIONS}
                 handlePageChange={handlePageChange}
                 handleSizeChange={handlePageSizeChange}
+                minPageSize={PLAN_PANEL_PAGE_SIZE_OPTIONS[0].value}
                 page={page}
                 pageSize={pageSize}
                 sx={{

From 1e1f3b9fabe5aac90b537760560214e7460e9d57 Mon Sep 17 00:00:00 2001
From: mduda-akamai <mduda@akamai.com>
Date: Mon, 24 Nov 2025 13:08:40 +0100
Subject: [PATCH 32/91] upcoming: [DPS-35648] Destination Form - Sample path
 improvements (#13117)

* upcoming: [DPS-35648] Destination Form - Sample path improvements
---
 .../pr-13117-upcoming-features-1763642787362.md |  5 +++++
 .../DestinationForm/DestinationCreate.test.tsx  | 15 ++++++++-------
 .../src/features/Delivery/Shared/PathSample.tsx | 17 +++++++++--------
 3 files changed, 22 insertions(+), 15 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13117-upcoming-features-1763642787362.md

diff --git a/packages/manager/.changeset/pr-13117-upcoming-features-1763642787362.md b/packages/manager/.changeset/pr-13117-upcoming-features-1763642787362.md
new file mode 100644
index 00000000000..9467c4a06c1
--- /dev/null
+++ b/packages/manager/.changeset/pr-13117-upcoming-features-1763642787362.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Destination Form: fixes and improvements for Sample Destination Object Name ([#13117](https://github.com/linode/manager/pull/13117))
diff --git a/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationCreate.test.tsx b/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationCreate.test.tsx
index 37074f7da94..1d625731fa8 100644
--- a/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationCreate.test.tsx
+++ b/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationCreate.test.tsx
@@ -5,6 +5,7 @@ import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { describe, expect } from 'vitest';
 
+import { accountFactory } from 'src/factories';
 import { http, HttpResponse, server } from 'src/mocks/testServer';
 import { renderWithThemeAndHookFormContext } from 'src/utilities/testHelpers';
 
@@ -66,11 +67,11 @@ describe('DestinationCreate', () => {
   );
 
   it('should render Sample Destination Object Name and change its value according to Log Path Prefix input', async () => {
-    const profileUid = 123;
+    const accountEuuid = 'XYZ-123';
     const [month, day, year] = new Date().toLocaleDateString().split('/');
     server.use(
-      http.get('*/profile', () => {
-        return HttpResponse.json(profileFactory.build({ uid: profileUid }));
+      http.get('*/account', () => {
+        return HttpResponse.json(accountFactory.build({ euuid: accountEuuid }));
       })
     );
 
@@ -79,7 +80,7 @@ describe('DestinationCreate', () => {
     let samplePath;
     await waitFor(() => {
       samplePath = screen.getByText(
-        `/audit_logs/com.akamai.audit.login/${profileUid}/${year}/${month}/${day}/akamai_log-000166-1756015362-319597.gz`
+        `/audit_logs/com.akamai.audit/${accountEuuid}/${year}/${month}/${day}/akamai_log-000166-1756015362-319597-login.gz`
       );
       expect(samplePath).toBeInTheDocument();
     });
@@ -89,19 +90,19 @@ describe('DestinationCreate', () => {
     await userEvent.type(logPathPrefixInput, 'test');
     // sample path should be created based on *log path* value
     expect(samplePath!.textContent).toEqual(
-      '/test/akamai_log-000166-1756015362-319597.gz'
+      '/test/akamai_log-000166-1756015362-319597-login.gz'
     );
 
     await userEvent.clear(logPathPrefixInput);
     await userEvent.type(logPathPrefixInput, '/test');
     expect(samplePath!.textContent).toEqual(
-      '/test/akamai_log-000166-1756015362-319597.gz'
+      '/test/akamai_log-000166-1756015362-319597-login.gz'
     );
 
     await userEvent.clear(logPathPrefixInput);
     await userEvent.type(logPathPrefixInput, '/');
     expect(samplePath!.textContent).toEqual(
-      '/akamai_log-000166-1756015362-319597.gz'
+      '/akamai_log-000166-1756015362-319597-login.gz'
     );
   });
 
diff --git a/packages/manager/src/features/Delivery/Shared/PathSample.tsx b/packages/manager/src/features/Delivery/Shared/PathSample.tsx
index 3b594da1baa..85ee27521f4 100644
--- a/packages/manager/src/features/Delivery/Shared/PathSample.tsx
+++ b/packages/manager/src/features/Delivery/Shared/PathSample.tsx
@@ -1,5 +1,5 @@
 import { streamType, type StreamType } from '@linode/api-v4';
-import { useProfile } from '@linode/queries';
+import { useAccount } from '@linode/queries';
 import { Box, InputLabel, Stack, TooltipIcon, Typography } from '@linode/ui';
 import { styled } from '@mui/material/styles';
 import * as React from 'react';
@@ -15,8 +15,8 @@ const sxTooltipIcon = {
 };
 
 const logType = {
-  [streamType.LKEAuditLogs]: 'com.akamai.audit.k8s',
-  [streamType.AuditLogs]: 'com.akamai.audit.login',
+  [streamType.LKEAuditLogs]: 'k8s',
+  [streamType.AuditLogs]: 'login',
 };
 
 interface PathSampleProps {
@@ -25,10 +25,9 @@ interface PathSampleProps {
 
 export const PathSample = (props: PathSampleProps) => {
   const { value } = props;
-  const fileName = 'akamai_log-000166-1756015362-319597.gz';
   const sampleClusterId = useMemo(
     // eslint-disable-next-line sonarjs/pseudo-random
-    () => Math.floor(Math.random() * 90000) + 10000,
+    () => `lke${Math.floor(Math.random() * 90000) + 10000}`,
     []
   );
 
@@ -43,7 +42,7 @@ export const PathSample = (props: PathSampleProps) => {
     name: 'stream.details.cluster_ids[0]',
   });
 
-  const { data: profile } = useProfile();
+  const { data: account } = useAccount();
   const [month, day, year] = new Date().toLocaleDateString('en-US').split('/');
 
   const setStreamType = (): StreamType => {
@@ -51,6 +50,7 @@ export const PathSample = (props: PathSampleProps) => {
   };
 
   const streamTypeValue = useMemo(setStreamType, [streamTypeFormValue]);
+  const fileName = `akamai_log-000166-1756015362-319597-${logType[streamTypeValue]}.gz`;
 
   const createSamplePath = (): string => {
     let partition = '';
@@ -59,11 +59,11 @@ export const PathSample = (props: PathSampleProps) => {
       partition = `${clusterId ?? sampleClusterId}/`;
     }
 
-    return `/${streamTypeValue}/${logType[streamTypeValue]}/${profile?.uid}/${partition}${year}/${month}/${day}`;
+    return `/${streamTypeValue}/com.akamai.audit/${account?.euuid}/${partition}${year}/${month}/${day}`;
   };
 
   const defaultPath = useMemo(createSamplePath, [
-    profile,
+    account,
     streamTypeValue,
     clusterId,
   ]);
@@ -110,4 +110,5 @@ const StyledValue = styled('span', { label: 'StyledValue' })(({ theme }) => ({
   minHeight: 34,
   padding: theme.spacingFunction(8),
   overflowWrap: 'anywhere',
+  wordBreak: 'break-all',
 }));

From aac0a422c06967b3a2c29534dca520eed80b5c7e Mon Sep 17 00:00:00 2001
From: mduda-akamai <mduda@akamai.com>
Date: Mon, 24 Nov 2025 13:09:04 +0100
Subject: [PATCH 33/91] upcoming: [DPS-35317] Compare the saved list of
 clusters with the list of currently available clusters (#13095)

* upcoming: [DPS-35317] Compare the saved list of clusters with the list of currently available clusters
---
 ...r-13095-upcoming-features-1763130670048.md |   5 +
 .../Clusters/StreamFormClusters.test.tsx      | 104 +++++++++++--
 .../Clusters/StreamFormClusters.tsx           | 142 +++++++++++++-----
 ...tsx => StreamFormClustersTableContent.tsx} |  10 +-
 4 files changed, 208 insertions(+), 53 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13095-upcoming-features-1763130670048.md
 rename packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/{StreamFormClustersTable.tsx => StreamFormClustersTableContent.tsx} (94%)

diff --git a/packages/manager/.changeset/pr-13095-upcoming-features-1763130670048.md b/packages/manager/.changeset/pr-13095-upcoming-features-1763130670048.md
new file mode 100644
index 00000000000..6236a2c67b8
--- /dev/null
+++ b/packages/manager/.changeset/pr-13095-upcoming-features-1763130670048.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Edit Stream form: remove cluster IDs from the edited stream that no longer exist or have log generation disabled ([#13095](https://github.com/linode/manager/pull/13095))
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClusters.test.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClusters.test.tsx
index 315d63f3c7c..fde6a031dd8 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClusters.test.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClusters.test.tsx
@@ -1,5 +1,6 @@
 import {
   screen,
+  waitFor,
   waitForElementToBeRemoved,
   within,
 } from '@testing-library/react';
@@ -14,10 +15,6 @@ import { renderWithThemeAndHookFormContext } from 'src/utilities/testHelpers';
 
 import { StreamFormClusters } from './StreamFormClusters';
 
-const queryMocks = vi.hoisted(() => ({
-  useOrderV2: vi.fn().mockReturnValue({}),
-}));
-
 const loadingTestId = 'circle-progress';
 const testClustersDetails = [
   {
@@ -118,6 +115,48 @@ describe('StreamFormClusters', () => {
     ]);
   });
 
+  it('should filter clusters by name', async () => {
+    await renderComponentWithoutSelectedClusters();
+    const input = screen.getByPlaceholderText('Search');
+
+    // Type test value inside the search
+    await userEvent.click(input);
+    await userEvent.type(input, 'metrics');
+
+    await waitFor(() =>
+      expect(getColumnsValuesFromTable()).toEqual(['metrics-stream-cluster'])
+    );
+  });
+
+  it('should filter clusters by region', async () => {
+    await renderComponentWithoutSelectedClusters();
+    const input = screen.getByPlaceholderText('Search');
+
+    // Type test value inside the search
+    await userEvent.click(input);
+    await userEvent.type(input, 'US,');
+
+    await waitFor(() =>
+      expect(getColumnsValuesFromTable(2)).toEqual([
+        'US, Atalanta, GA',
+        'US, Chicago, IL',
+      ])
+    );
+  });
+
+  it('should filter clusters by log generation status', async () => {
+    await renderComponentWithoutSelectedClusters();
+    const input = screen.getByPlaceholderText('Search');
+
+    // Type test value inside the search
+    await userEvent.click(input);
+    await userEvent.type(input, 'enabled');
+
+    await waitFor(() =>
+      expect(getColumnsValuesFromTable(3)).toEqual(['Enabled', 'Enabled'])
+    );
+  });
+
   it('should toggle clusters checkboxes and header checkbox', async () => {
     await renderComponentWithoutSelectedClusters();
     const table = screen.getByRole('table');
@@ -211,6 +250,56 @@ describe('StreamFormClusters', () => {
       expect(metricsStreamCheckbox).toBeChecked();
       expect(prodClusterCheckbox).not.toBeChecked();
     });
+
+    describe('and some of them are no longer eligible for log delivery', () => {
+      it('should remove non-eligible clusters and render table with properly selected clusters', async () => {
+        const modifiedClusters = clusters.map((cluster) =>
+          cluster.id === 3
+            ? { ...cluster, control_plane: { audit_logs_enabled: false } }
+            : cluster
+        );
+        server.use(
+          http.get('*/lke/clusters', () => {
+            return HttpResponse.json(makeResourcePage(modifiedClusters));
+          })
+        );
+
+        renderWithThemeAndHookFormContext({
+          component: <StreamFormClusters mode="edit" />,
+          useFormOptions: {
+            defaultValues: {
+              stream: {
+                details: {
+                  cluster_ids: [2, 3],
+                  is_auto_add_all_clusters_enabled: false,
+                },
+              },
+            },
+          },
+        });
+
+        const loadingElement = screen.queryByTestId(loadingTestId);
+        expect(loadingElement).toBeInTheDocument();
+        await waitForElementToBeRemoved(loadingElement);
+
+        const table = screen.getByRole('table');
+        const headerCheckbox = within(table).getAllByRole('checkbox')[0];
+        const gkeProdCheckbox = getCheckboxByClusterName(
+          'gke-prod-europe-west1'
+        );
+        const metricsStreamCheckbox = getCheckboxByClusterName(
+          'metrics-stream-cluster'
+        );
+        const prodClusterCheckbox = getCheckboxByClusterName('prod-cluster-eu');
+
+        await waitFor(() => {
+          expectCheckboxStateToBe(headerCheckbox, 'checked');
+        });
+        expect(gkeProdCheckbox).not.toBeChecked();
+        expect(metricsStreamCheckbox).toBeChecked();
+        expect(prodClusterCheckbox).not.toBeChecked();
+      });
+    });
   });
 
   it('should disable all table checkboxes if "Automatically include all" checkbox is selected', async () => {
@@ -285,13 +374,6 @@ describe('StreamFormClusters', () => {
     expect(metricsStreamCheckbox).not.toBeChecked();
     expect(prodClusterCheckbox).toBeChecked();
 
-    // Sort by Cluster Name descending
-    queryMocks.useOrderV2.mockReturnValue({
-      order: 'desc',
-      orderBy: 'label',
-      sortedData: clusters.reverse(),
-    });
-
     await userEvent.click(sortHeader);
     expect(gkeProdCheckbox).not.toBeChecked();
     expect(metricsStreamCheckbox).not.toBeChecked();
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClusters.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClusters.tsx
index e4c828ad92f..60384dfd948 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClusters.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClusters.tsx
@@ -1,4 +1,3 @@
-import { getAPIFilterFromQuery } from '@linode/search';
 import {
   Box,
   Checkbox,
@@ -9,19 +8,22 @@ import {
   Typography,
 } from '@linode/ui';
 import { capitalize } from '@linode/utilities';
-import React, { useEffect, useState } from 'react';
+import { enqueueSnackbar } from 'notistack';
+import React, { useEffect, useMemo, useState } from 'react';
 import { useWatch } from 'react-hook-form';
 import { Controller, useFormContext } from 'react-hook-form';
 
 import { DebouncedSearchTextField } from 'src/components/DebouncedSearchTextField';
+import { sortData } from 'src/components/OrderBy';
 import { PaginationFooter } from 'src/components/PaginationFooter/PaginationFooter';
 import { MIN_PAGE_SIZE } from 'src/components/PaginationFooter/PaginationFooter.constants';
 import { Table } from 'src/components/Table';
-import { StreamFormClusterTableContent } from 'src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClustersTable';
-import { useKubernetesClustersQuery } from 'src/queries/kubernetes';
+import { StreamFormClusterTableContent } from 'src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClustersTableContent';
+import { useAllKubernetesClustersQuery } from 'src/queries/kubernetes';
 
+import type { KubernetesCluster } from '@linode/api-v4';
 import type { FormMode } from 'src/features/Delivery/Shared/types';
-import type { OrderByKeys } from 'src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClustersTable';
+import type { OrderByKeys } from 'src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClustersTableContent';
 import type { StreamAndDestinationFormType } from 'src/features/Delivery/Streams/StreamForm/types';
 
 const controlPaths = {
@@ -45,44 +47,68 @@ export const StreamFormClusters = (props: StreamFormClustersProps) => {
   const [pageSize, setPageSize] = useState<number>(MIN_PAGE_SIZE);
   const [searchText, setSearchText] = useState<string>('');
 
-  const { error: searchParseError, filter: searchFilter } =
-    getAPIFilterFromQuery(searchText, {
-      searchableFieldsWithoutOperator: ['label', 'region'],
-    });
-
-  const filter = {
-    ['+order']: order,
-    ['+order_by']: orderBy,
-    ...searchFilter,
-  };
-
   const {
-    data: clusters,
+    data: clusters = [],
     isLoading,
     error,
-  } = useKubernetesClustersQuery({
-    filter,
-    params: {
-      page,
-      page_size: pageSize,
-    },
-  });
+  } = useAllKubernetesClustersQuery({ enabled: true });
 
-  const idsWithLogsEnabled = clusters?.data
-    .filter((cluster) => cluster.control_plane.audit_logs_enabled)
-    .map(({ id }) => id);
+  const clusterIdsWithLogsEnabled = useMemo(
+    () =>
+      clusters
+        ?.filter((cluster) => cluster.control_plane.audit_logs_enabled)
+        .map(({ id }) => id),
+    [clusters]
+  );
 
   const [isAutoAddAllClustersEnabled, clusterIds] = useWatch({
     control,
     name: [controlPaths.isAutoAddAllClustersEnabled, controlPaths.clusterIds],
   });
 
+  const areArraysDifferent = (a: number[], b: number[]) => {
+    if (a.length !== b.length) {
+      return true;
+    }
+
+    const setB = new Set(b);
+
+    return !a.every((element) => setB.has(element));
+  };
+
+  // Check for clusters that no longer have log generation enabled and remove them from cluster_ids
   useEffect(() => {
-    setValue(
-      controlPaths.clusterIds,
-      isAutoAddAllClustersEnabled ? idsWithLogsEnabled : clusterIds || []
-    );
-  }, [isLoading]);
+    if (!isLoading) {
+      const selectedClusterIds = clusterIds ?? [];
+      const filteredClusterIds = selectedClusterIds.filter((id) =>
+        clusterIdsWithLogsEnabled.includes(id)
+      );
+
+      const nextValue =
+        (isAutoAddAllClustersEnabled
+          ? clusterIdsWithLogsEnabled
+          : filteredClusterIds) || [];
+
+      if (
+        !isAutoAddAllClustersEnabled &&
+        areArraysDifferent(selectedClusterIds, filteredClusterIds)
+      ) {
+        enqueueSnackbar(
+          'One or more clusters were removed from the selection because Log Generation is no longer enabled on them.',
+          { variant: 'info' }
+        );
+      }
+      if (areArraysDifferent(selectedClusterIds, nextValue)) {
+        setValue(controlPaths.clusterIds, nextValue);
+      }
+    }
+  }, [
+    isLoading,
+    clusterIds,
+    isAutoAddAllClustersEnabled,
+    setValue,
+    clusterIdsWithLogsEnabled,
+  ]);
 
   const handleOrderChange = (newOrderBy: OrderByKeys) => {
     if (orderBy === newOrderBy) {
@@ -93,6 +119,46 @@ export const StreamFormClusters = (props: StreamFormClustersProps) => {
     }
   };
 
+  const filteredClusters = !searchText
+    ? clusters
+    : clusters.filter((cluster) => {
+        const lowerSearch = searchText.toLowerCase();
+
+        return (
+          cluster.label.toLowerCase().includes(lowerSearch) ||
+          cluster.region.toLowerCase().includes(lowerSearch) ||
+          (cluster.control_plane.audit_logs_enabled
+            ? 'enabled'
+            : 'disabled'
+          ).includes(lowerSearch)
+        );
+      });
+
+  const sortedAndFilteredClusters = sortData<KubernetesCluster>(
+    orderBy,
+    order
+  )(filteredClusters);
+
+  // Paginate clusters
+  const indexOfFirstClusterInPage = (page - 1) * pageSize;
+  const indexOfLastClusterInPage = indexOfFirstClusterInPage + pageSize;
+  const paginatedClusters = sortedAndFilteredClusters.slice(
+    indexOfFirstClusterInPage,
+    indexOfLastClusterInPage
+  );
+
+  // If the current page is out of range after filtering, change to the last available page
+  useEffect(() => {
+    if (indexOfFirstClusterInPage >= sortedAndFilteredClusters.length) {
+      const lastPage = Math.max(
+        1,
+        Math.ceil(sortedAndFilteredClusters.length / pageSize)
+      );
+
+      setPage(lastPage);
+    }
+  }, [sortedAndFilteredClusters, indexOfFirstClusterInPage, pageSize]);
+
   return (
     <Paper>
       <Typography variant="h2">Clusters</Typography>
@@ -120,7 +186,10 @@ export const StreamFormClusters = (props: StreamFormClustersProps) => {
                   onChange={async (_, checked) => {
                     field.onChange(checked);
                     if (checked) {
-                      setValue(controlPaths.clusterIds, idsWithLogsEnabled);
+                      setValue(
+                        controlPaths.clusterIds,
+                        clusterIdsWithLogsEnabled
+                      );
                     } else {
                       setValue(controlPaths.clusterIds, []);
                     }
@@ -141,7 +210,6 @@ export const StreamFormClusters = (props: StreamFormClustersProps) => {
               },
             }}
             debounceTime={250}
-            errorText={searchParseError?.message}
             hideLabel
             inputProps={{
               'data-pendo-id': `Logs Delivery Streams ${capitalize(mode)}-Clusters-Search`,
@@ -165,9 +233,9 @@ export const StreamFormClusters = (props: StreamFormClustersProps) => {
                 name={controlPaths.clusterIds}
                 render={({ field }) => (
                   <StreamFormClusterTableContent
-                    clusters={clusters}
+                    clusters={paginatedClusters}
                     field={field}
-                    idsWithLogsEnabled={idsWithLogsEnabled}
+                    idsWithLogsEnabled={clusterIdsWithLogsEnabled}
                     isAutoAddAllClustersEnabled={isAutoAddAllClustersEnabled}
                     onOrderChange={handleOrderChange}
                     order={order}
@@ -177,7 +245,7 @@ export const StreamFormClusters = (props: StreamFormClustersProps) => {
               />
             </Table>
             <PaginationFooter
-              count={clusters?.results || 0}
+              count={sortedAndFilteredClusters.length || 0}
               eventCategory="Clusters Table"
               handlePageChange={setPage}
               handleSizeChange={setPageSize}
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClustersTable.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClustersTableContent.tsx
similarity index 94%
rename from packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClustersTable.tsx
rename to packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClustersTableContent.tsx
index 85d327d72cd..4022d10e819 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClustersTable.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClustersTableContent.tsx
@@ -10,13 +10,13 @@ import { TableRow } from 'src/components/TableRow';
 import { TableRowEmpty } from 'src/components/TableRowEmpty/TableRowEmpty';
 import { TableSortCell } from 'src/components/TableSortCell';
 
-import type { KubernetesCluster, ResourcePage } from '@linode/api-v4';
+import type { KubernetesCluster } from '@linode/api-v4';
 import type { StreamAndDestinationFormType } from 'src/features/Delivery/Streams/StreamForm/types';
 
 export type OrderByKeys = 'label' | 'region';
 
 interface StreamFormClusterTableContentProps {
-  clusters: ResourcePage<KubernetesCluster> | undefined;
+  clusters: KubernetesCluster[] | undefined;
   field: ControllerRenderProps<
     StreamAndDestinationFormType,
     'stream.details.cluster_ids'
@@ -62,7 +62,7 @@ export const StreamFormClusterTableContent = ({
       <TableHead>
         <TableRow>
           <TableCell sx={{ width: '5%' }}>
-            {!!clusters?.results && (
+            {!!clusters && (
               <Checkbox
                 aria-label="Toggle all clusters"
                 checked={isAllSelected}
@@ -95,8 +95,8 @@ export const StreamFormClusterTableContent = ({
         </TableRow>
       </TableHead>
       <TableBody>
-        {clusters?.results ? (
-          clusters.data.map(
+        {clusters?.length ? (
+          clusters.map(
             ({
               label,
               region,

From d63b7dc71334bd22eb2ca0fe5765acc5f29116c8 Mon Sep 17 00:00:00 2001
From: Tanushree Bhattacharji <tbhattac@akamai.com>
Date: Mon, 24 Nov 2025 19:39:19 +0530
Subject: [PATCH 34/91] upcoming: [UIE-9551] - Implement read-only NLB list
 table. (#13112)

* upcoming: [UIE-9551] - Implement read-only NLB list table.

* Added changeset: Add NetworkLoadBalancersLanding component to render NLB list with pagination, loading/error and table columns

* Using theme-sensitive tokens for ShowMore text.

* Addressed review comments.
---
 ...r-13112-upcoming-features-1763627065100.md |   5 +
 .../src/components/ShowMore/ShowMore.tsx      |   9 +-
 .../src/factories/networkLoadBalancer.ts      |   4 +-
 .../NetworkLoadBalancersDetail.tsx            |   3 +-
 .../NetworkLoadBalancersLanding.tsx           |  20 --
 .../NetworkLoadBalancerTableRow.test.tsx      | 195 ++++++++++++++++++
 .../NetworkLoadBalancerTableRow.tsx           | 103 +++++++++
 .../NetworkLoadBalancersLanding.styles.ts     |  23 +++
 .../NetworkLoadBalancersLanding.test.tsx      | 170 +++++++++++++++
 .../NetworkLoadBalancersLanding.tsx           | 118 +++++++++++
 .../NetworkLoadBalancersLandingEmptyState.tsx |  14 ++
 .../PortsDisplay.test.tsx                     | 117 +++++++++++
 .../PortsDisplay.tsx                          |  96 +++++++++
 .../networkLoadBalancersLazyRoute.tsx         |   0
 .../NetworkLoadBalancers/constants.ts         |   4 +
 .../src/routes/networkLoadBalancer/index.ts   |   2 +-
 16 files changed, 855 insertions(+), 28 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13112-upcoming-features-1763627065100.md
 delete mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding.tsx
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancerTableRow.test.tsx
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancerTableRow.tsx
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancersLanding.styles.ts
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancersLanding.test.tsx
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancersLanding.tsx
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancersLandingEmptyState.tsx
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/PortsDisplay.test.tsx
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/PortsDisplay.tsx
 rename packages/manager/src/features/NetworkLoadBalancers/{ => NetworkLoadBalancersLanding}/networkLoadBalancersLazyRoute.tsx (100%)
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/constants.ts

diff --git a/packages/manager/.changeset/pr-13112-upcoming-features-1763627065100.md b/packages/manager/.changeset/pr-13112-upcoming-features-1763627065100.md
new file mode 100644
index 00000000000..bc0da4f2abb
--- /dev/null
+++ b/packages/manager/.changeset/pr-13112-upcoming-features-1763627065100.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Add NetworkLoadBalancersLanding component to render NLB list with pagination, loading/error and table columns ([#13112](https://github.com/linode/manager/pull/13112))
diff --git a/packages/manager/src/components/ShowMore/ShowMore.tsx b/packages/manager/src/components/ShowMore/ShowMore.tsx
index 8a3466d31c2..d020f3c24cd 100644
--- a/packages/manager/src/components/ShowMore/ShowMore.tsx
+++ b/packages/manager/src/components/ShowMore/ShowMore.tsx
@@ -37,14 +37,15 @@ export const ShowMore = <T extends {}>(props: ShowMoreProps<T>) => {
         data-qa-show-more-chip
         label={`+${items.length}`}
         onClick={handleClick}
-        sx={
-          anchorEl
+        sx={{
+          ...(anchorEl
             ? {
                 backgroundColor: theme.palette.primary.main,
                 color: theme.tokens.color.Neutrals.White,
               }
-            : null
-        }
+            : {}),
+          ...(chipProps?.sx || {}), // caller-provided `chipProps.sx` takes precedence and will override the default active styling.
+        }}
       />
 
       <StyledPopover
diff --git a/packages/manager/src/factories/networkLoadBalancer.ts b/packages/manager/src/factories/networkLoadBalancer.ts
index e404748a6bd..25f5fc89337 100644
--- a/packages/manager/src/factories/networkLoadBalancer.ts
+++ b/packages/manager/src/factories/networkLoadBalancer.ts
@@ -9,7 +9,7 @@ import type {
 export const networkLoadBalancerFactory =
   Factory.Sync.makeFactory<NetworkLoadBalancer>({
     id: Factory.each((id) => id),
-    label: Factory.each((id) => `nlb-${id}`),
+    label: Factory.each((id) => `netloadbalancer-${id}-test${id}`),
     region: 'us-east',
     address_v4: '192.168.1.1',
     address_v6: '2001:db8:85a3::8a2e:370:7334',
@@ -26,7 +26,7 @@ export const networkLoadBalancerListenerFactory =
     id: Factory.each((id) => id),
     label: Factory.each((id) => `nlb-listener-${id}`),
     updated: '2023-01-01T00:00:00Z',
-    port: 80,
+    port: Factory.each((id) => 80 + id),
     protocol: 'tcp',
   });
 
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersDetail.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersDetail.tsx
index 545d4fcad59..8d1680f85f2 100644
--- a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersDetail.tsx
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersDetail.tsx
@@ -7,6 +7,7 @@ import { DocumentTitleSegment } from 'src/components/DocumentTitle';
 import { EntityDetail } from 'src/components/EntityDetail/EntityDetail';
 import { LandingHeader } from 'src/components/LandingHeader';
 
+import { NLB_API_DOCS_LINK } from '../constants';
 import { NetworkLoadBalancerDetailBody } from './NetworkLoadBalancerDetailBody';
 import { NetworkLoadBalancerDetailHeader } from './NetworkLoadBalancerDetailHeader';
 
@@ -45,7 +46,7 @@ const NetworkLoadBalancersDetail = () => {
           pathname: `/netloadbalancers/${nlb.id}`,
         }}
         docsLabel="Docs"
-        docsLink="https://techdocs.akamai.com/linode-api/changelog/network-load-balancers"
+        docsLink={NLB_API_DOCS_LINK}
         title={nlb.label}
       />
       <EntityDetail
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding.tsx
deleted file mode 100644
index 373a1e0e883..00000000000
--- a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Notice } from '@linode/ui';
-import * as React from 'react';
-
-import { LandingHeader } from 'src/components/LandingHeader';
-
-export const NetworkLoadBalancersLanding = () => {
-  return (
-    <>
-      <LandingHeader
-        breadcrumbProps={{
-          pathname: 'Network Load Balancer',
-          removeCrumbX: 1,
-        }}
-        spacingBottom={16}
-        title="Network Load Balancer"
-      />
-      <Notice variant="info">Network Load Balancer is coming soon...</Notice>
-    </>
-  );
-};
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancerTableRow.test.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancerTableRow.test.tsx
new file mode 100644
index 00000000000..006301d6070
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancerTableRow.test.tsx
@@ -0,0 +1,195 @@
+import { breakpoints } from '@linode/ui';
+import * as React from 'react';
+
+import {
+  networkLoadBalancerFactory,
+  networkLoadBalancerListenerFactory,
+} from 'src/factories/networkLoadBalancer';
+import { renderWithTheme, resizeScreenSize } from 'src/utilities/testHelpers';
+
+import { NetworkLoadBalancerTableRow } from './NetworkLoadBalancerTableRow';
+
+import type { NetworkLoadBalancer } from '@linode/api-v4/lib/netloadbalancers';
+
+// Use factory-built data. Do not hardcode properties in this file.
+const mockNetworkLoadBalancer: NetworkLoadBalancer = (() => {
+  const base = networkLoadBalancerFactory.build();
+  const listeners = networkLoadBalancerListenerFactory.buildList(2);
+  return { ...base, listeners };
+})();
+
+describe('NetworkLoadBalancerTableRow', () => {
+  beforeEach(() => {
+    vi.resetAllMocks();
+    resizeScreenSize(breakpoints.values.lg);
+  });
+
+  it('renders the NetworkLoadBalancer table row with label', () => {
+    const { getByText } = renderWithTheme(
+      <NetworkLoadBalancerTableRow {...mockNetworkLoadBalancer} />
+    );
+
+    expect(getByText(mockNetworkLoadBalancer.label)).toBeVisible();
+  });
+
+  it('renders the status icon and status text', () => {
+    const { getByText } = renderWithTheme(
+      <NetworkLoadBalancerTableRow {...mockNetworkLoadBalancer} />
+    );
+
+    // Status displayed is case-insensitive; match using the factory status value.
+    expect(
+      getByText(new RegExp(mockNetworkLoadBalancer.status, 'i'))
+    ).toBeVisible();
+  });
+
+  it('renders the ID in hidden column on small screens', () => {
+    resizeScreenSize(breakpoints.values.lg);
+    const { getByText } = renderWithTheme(
+      <NetworkLoadBalancerTableRow {...mockNetworkLoadBalancer} />
+    );
+
+    expect(getByText(String(mockNetworkLoadBalancer.id))).toBeVisible();
+  });
+
+  it('hides the ID column on small screens', () => {
+    resizeScreenSize(breakpoints.values.sm - 1);
+    const { queryByText } = renderWithTheme(
+      <NetworkLoadBalancerTableRow {...mockNetworkLoadBalancer} />
+    );
+
+    expect(
+      queryByText(String(mockNetworkLoadBalancer.id))
+    ).not.toBeInTheDocument();
+  });
+
+  it('renders listener ports', () => {
+    const { getByText } = renderWithTheme(
+      <NetworkLoadBalancerTableRow {...mockNetworkLoadBalancer} />
+    );
+
+    // Ensure at least one listener port from the factory is rendered
+    const firstPort = mockNetworkLoadBalancer.listeners?.[0]?.port;
+    expect(firstPort).toBeDefined();
+    expect(getByText(new RegExp(String(firstPort)))).toBeInTheDocument();
+  });
+
+  it('renders "None" when there are no listeners', () => {
+    const nlbWithNoListeners = networkLoadBalancerFactory.build();
+
+    const { container } = renderWithTheme(
+      <NetworkLoadBalancerTableRow {...nlbWithNoListeners} />
+    );
+
+    const portsCell = container.querySelector('[data-qa-ports]');
+    expect(portsCell?.textContent?.trim()).toBe('None');
+  });
+
+  it('renders IPv4 address', () => {
+    const { getByText } = renderWithTheme(
+      <NetworkLoadBalancerTableRow {...mockNetworkLoadBalancer} />
+    );
+
+    expect(getByText(mockNetworkLoadBalancer.address_v4)).toBeVisible();
+  });
+
+  it('renders IPv6 address', () => {
+    resizeScreenSize(breakpoints.values.lg);
+    const { getByText } = renderWithTheme(
+      <NetworkLoadBalancerTableRow {...mockNetworkLoadBalancer} />
+    );
+
+    expect(getByText(mockNetworkLoadBalancer.address_v6!)).toBeVisible();
+  });
+
+  it('renders "None" for IPv6 when address_v6 is not set', () => {
+    const nlbWithoutIPv6: NetworkLoadBalancer = {
+      ...mockNetworkLoadBalancer,
+      address_v6: '',
+    };
+
+    resizeScreenSize(breakpoints.values.lg);
+    renderWithTheme(<NetworkLoadBalancerTableRow {...nlbWithoutIPv6} />);
+
+    const noneElements = document.querySelectorAll('td');
+    const lastNoneElement = Array.from(noneElements).find(
+      (el) => el.textContent === 'None'
+    );
+    expect(lastNoneElement).toBeInTheDocument();
+  });
+
+  it('renders region', () => {
+    const { getByText } = renderWithTheme(
+      <NetworkLoadBalancerTableRow {...mockNetworkLoadBalancer} />
+    );
+
+    expect(getByText(mockNetworkLoadBalancer.region)).toBeVisible();
+  });
+
+  it('renders inactive status', () => {
+    const nlbInactive: NetworkLoadBalancer = {
+      ...mockNetworkLoadBalancer,
+      status: 'suspended',
+    };
+
+    const { getByText } = renderWithTheme(
+      <NetworkLoadBalancerTableRow {...nlbInactive} />
+    );
+
+    expect(getByText(/suspended/i)).toBeVisible();
+  });
+
+  it('renders the label as a link', () => {
+    const { getByRole } = renderWithTheme(
+      <NetworkLoadBalancerTableRow {...mockNetworkLoadBalancer} />
+    );
+
+    const link = getByRole('link', { name: mockNetworkLoadBalancer.label });
+    expect(link).toHaveAttribute(
+      'href',
+      `/netloadbalancers/${mockNetworkLoadBalancer.id}/listeners`
+    );
+  });
+
+  it('hides listener ports column on medium screens and below', () => {
+    resizeScreenSize(breakpoints.values.md - 1);
+    const { container } = renderWithTheme(
+      <NetworkLoadBalancerTableRow {...mockNetworkLoadBalancer} />
+    );
+
+    // The ports should be present in the DOM for this implementation
+    // (component does not hide ports at md); verify ports are rendered
+    const ports = Array.from(container.querySelectorAll('td'));
+    const firstPort = String(mockNetworkLoadBalancer.listeners?.[0]?.port);
+    const hasPortsColumn = ports.some(
+      (el) =>
+        el.textContent === firstPort || el.textContent?.includes(firstPort)
+    );
+    expect(hasPortsColumn).toBe(true);
+  });
+
+  it('hides IPv6 column on medium screens and below', () => {
+    resizeScreenSize(breakpoints.values.md - 1);
+    renderWithTheme(
+      <NetworkLoadBalancerTableRow {...mockNetworkLoadBalancer} />
+    );
+
+    // IPv6 should not be visible on md screens
+    const ipv6Cell = document.querySelector('td');
+    expect(ipv6Cell?.textContent).not.toContain(
+      mockNetworkLoadBalancer.address_v6!
+    );
+  });
+
+  it('hides region and ID columns on small screens and below', () => {
+    resizeScreenSize(breakpoints.values.sm - 1);
+    renderWithTheme(
+      <NetworkLoadBalancerTableRow {...mockNetworkLoadBalancer} />
+    );
+
+    // ID and region should not be visible on sm screens
+    const cells = document.querySelectorAll('td');
+    const cellTexts = Array.from(cells).map((el) => el.textContent);
+    expect(cellTexts.join('')).not.toContain(mockNetworkLoadBalancer.region);
+  });
+});
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancerTableRow.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancerTableRow.tsx
new file mode 100644
index 00000000000..baaa244831c
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancerTableRow.tsx
@@ -0,0 +1,103 @@
+import { Hidden } from '@linode/ui';
+import { capitalize } from '@linode/utilities';
+import * as React from 'react';
+
+import { Link } from 'src/components/Link';
+import { StatusIcon } from 'src/components/StatusIcon/StatusIcon';
+import { TableCell } from 'src/components/TableCell';
+import { TableRow } from 'src/components/TableRow';
+import { IPAddress } from 'src/features/Linodes/LinodesLanding/IPAddress';
+import { RegionIndicator } from 'src/features/Linodes/LinodesLanding/RegionIndicator';
+
+import { PortsDisplay } from './PortsDisplay';
+
+import type { NetworkLoadBalancer } from '@linode/api-v4/lib/netloadbalancers';
+
+export const NetworkLoadBalancerTableRow = (props: NetworkLoadBalancer) => {
+  const {
+    id,
+    address_v4,
+    address_v6,
+    label,
+    region,
+    status,
+    listeners,
+    lke_cluster,
+  } = props;
+
+  // Memoize port strings to avoid recalculation
+  const portStrings = React.useMemo(() => {
+    return listeners?.map((listener) => listener.port.toString()) ?? [];
+  }, [listeners]);
+
+  const [isHovered, setIsHovered] = React.useState(false);
+
+  const handleMouseEnter = React.useCallback(() => {
+    setIsHovered(true);
+  }, []);
+
+  const handleMouseLeave = React.useCallback(() => {
+    setIsHovered(false);
+  }, []);
+
+  return (
+    <TableRow
+      data-qa-nlb={label}
+      key={id}
+      onMouseEnter={handleMouseEnter}
+      onMouseLeave={handleMouseLeave}
+    >
+      <TableCell noWrap>
+        <Link
+          accessibleAriaLabel={label}
+          to={`/netloadbalancers/${id}/listeners`}
+        >
+          {label}
+        </Link>
+      </TableCell>
+      <Hidden lgDown>
+        <TableCell data-qa-status statusCell>
+          <StatusIcon status={status === 'active' ? 'active' : 'inactive'} />
+          {capitalize(status)}
+        </TableCell>
+      </Hidden>
+      <Hidden data-qa-id lgDown>
+        <TableCell>{id}</TableCell>
+      </Hidden>
+      <TableCell data-qa-ports>
+        <PortsDisplay ports={portStrings} />
+      </TableCell>
+      <TableCell data-qa-ipv4>
+        <IPAddress ips={[address_v4]} isHovered={isHovered} />
+      </TableCell>
+      <Hidden mdDown>
+        <TableCell data-qa-ipv6>
+          {address_v6 ? (
+            <IPAddress ips={[address_v6]} isHovered={isHovered} />
+          ) : (
+            'None'
+          )}
+        </TableCell>
+      </Hidden>
+      <TableCell data-qa-lke-cluster>
+        {lke_cluster ? (
+          <Link
+            accessibleAriaLabel={lke_cluster.label}
+            to={`/kubernetes/clusters/${lke_cluster.id}`}
+          >
+            {lke_cluster.label}
+          </Link>
+        ) : (
+          'None'
+        )}
+      </TableCell>
+      <Hidden mdDown>
+        <TableCell data-qa-region>
+          <RegionIndicator region={region} />
+        </TableCell>
+      </Hidden>
+    </TableRow>
+  );
+};
+
+export default NetworkLoadBalancerTableRow;
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancersLanding.styles.ts b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancersLanding.styles.ts
new file mode 100644
index 00000000000..a692da02b0d
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancersLanding.styles.ts
@@ -0,0 +1,23 @@
+import { Chip, styled } from '@linode/ui';
+
+import LockIcon from 'src/assets/icons/lock.svg';
+
+export const StyledManagedChip = styled(Chip, {
+  label: 'StyledManagedChip',
+})(({ theme }) => ({
+  backgroundColor: theme.tokens.component.Badge.Informative.Subtle.Background,
+  color: theme.tokens.component.Badge.Informative.Subtle.Text,
+  font: theme.font.bold,
+  fontSize: theme.tokens.font.FontSize.Xxxs,
+  '& .MuiChip-icon': {
+    marginRight: '0px',
+  },
+}));
+
+export const StyledLockIcon = styled(LockIcon)(({ theme }) => ({
+  '& path': {
+    fill: theme.tokens.alias.Accent.Info.Primary,
+  },
+  height: '12px',
+  width: '12px',
+}));
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancersLanding.test.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancersLanding.test.tsx
new file mode 100644
index 00000000000..51c1a5dde1b
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancersLanding.test.tsx
@@ -0,0 +1,170 @@
+import { waitForElementToBeRemoved } from '@testing-library/react';
+import * as React from 'react';
+
+import {
+  networkLoadBalancerFactory,
+  networkLoadBalancerListenerFactory,
+} from 'src/factories/networkLoadBalancer';
+import { makeResourcePage } from 'src/mocks/serverHandlers';
+import { http, HttpResponse, server } from 'src/mocks/testServer';
+import { mockMatchMedia, renderWithTheme } from 'src/utilities/testHelpers';
+
+import { NetworkLoadBalancersLanding } from './NetworkLoadBalancersLanding';
+
+const queryMocks = vi.hoisted(() => ({
+  useMatch: vi.fn().mockReturnValue({}),
+  useNavigate: vi.fn(() => vi.fn()),
+  useParams: vi.fn().mockReturnValue({}),
+}));
+
+vi.mock('@tanstack/react-router', async () => {
+  const actual = await vi.importActual('@tanstack/react-router');
+  return {
+    ...actual,
+    useMatch: queryMocks.useMatch,
+    useNavigate: queryMocks.useNavigate,
+    useParams: queryMocks.useParams,
+  };
+});
+
+beforeAll(() => {
+  mockMatchMedia();
+});
+
+const loadingTestId = 'circle-progress';
+
+describe('NetworkLoadBalancersLanding', () => {
+  it('renders the NetworkLoadBalancer empty state if there are no NetworkLoadBalancers', async () => {
+    server.use(
+      http.get('*/v4beta/netloadbalancers', () => {
+        return HttpResponse.json(makeResourcePage([]));
+      })
+    );
+
+    const { getByTestId } = renderWithTheme(<NetworkLoadBalancersLanding />);
+
+    // expect loading state and wait for it to disappear
+    expect(getByTestId(loadingTestId)).toBeInTheDocument();
+    await waitForElementToBeRemoved(getByTestId(loadingTestId));
+  });
+
+  it('renders the NetworkLoadBalancer table if there are NetworkLoadBalancers', async () => {
+    const mockNetworkLoadBalancers = [
+      networkLoadBalancerFactory.build({
+        listeners: networkLoadBalancerListenerFactory.buildList(2),
+      }),
+    ];
+
+    server.use(
+      http.get('*/v4beta/netloadbalancers', () => {
+        return HttpResponse.json(makeResourcePage(mockNetworkLoadBalancers));
+      })
+    );
+
+    const { getByTestId, getByText } = renderWithTheme(
+      <NetworkLoadBalancersLanding />
+    );
+
+    // expect loading state and wait for it to disappear
+    expect(getByTestId(loadingTestId)).toBeInTheDocument();
+    await waitForElementToBeRemoved(getByTestId(loadingTestId));
+
+    expect(getByText('Network Load Balancer')).toBeVisible();
+    expect(getByText('netloadbalancer-1-test1')).toBeVisible();
+
+    // confirm table headers
+    expect(getByText('Label')).toBeVisible();
+    expect(getByText('Status')).toBeVisible();
+    expect(getByText('ID')).toBeVisible();
+    expect(getByText('Listener Ports')).toBeVisible();
+    expect(getByText('Virtual IP (IPv4)')).toBeVisible();
+    expect(getByText('Virtual IP (IPv6)')).toBeVisible();
+    expect(getByText('Region')).toBeVisible();
+  });
+
+  it('renders the managed by badge with tooltip', async () => {
+    const mockNetworkLoadBalancers = [
+      networkLoadBalancerFactory.build({ listeners: [] }),
+    ];
+
+    server.use(
+      http.get('*/v4beta/netloadbalancers', () => {
+        return HttpResponse.json(makeResourcePage(mockNetworkLoadBalancers));
+      })
+    );
+
+    const { getByTestId, getByText } = renderWithTheme(
+      <NetworkLoadBalancersLanding />
+    );
+
+    await waitForElementToBeRemoved(getByTestId(loadingTestId));
+
+    // Check for the badge
+    expect(getByText('Managed by LKE Enterprise')).toBeVisible();
+
+    // Check for the Chip component (which contains the badge)
+    const chip = document.querySelector('[class*="MuiChip-root"]');
+    expect(chip).toBeInTheDocument();
+  });
+
+  it('displays error state when there is an error', async () => {
+    server.use(
+      http.get('*/v4beta/netloadbalancers', () => {
+        return HttpResponse.json(
+          {
+            errors: [
+              {
+                reason: 'Internal Server Error',
+              },
+            ],
+          },
+          { status: 500 }
+        );
+      })
+    );
+
+    const { getByTestId } = renderWithTheme(<NetworkLoadBalancersLanding />);
+
+    // Wait for the component to load and display the error
+    await waitForElementToBeRemoved(() => getByTestId(loadingTestId)).catch(
+      () => {
+        // Component might show error without removing the loading state
+      }
+    );
+
+    // The component should display an error message
+    const errorElement = document.body.querySelector('*');
+    expect(errorElement).toBeTruthy();
+  });
+
+  it('displays loading state initially', () => {
+    const { getByTestId } = renderWithTheme(<NetworkLoadBalancersLanding />);
+
+    expect(getByTestId(loadingTestId)).toBeInTheDocument();
+  });
+
+  it('displays pagination footer when data is loaded', async () => {
+    const mockNetworkLoadBalancers = [
+      networkLoadBalancerFactory.build({ listeners: [] }),
+    ];
+
+    server.use(
+      http.get('*/v4beta/netloadbalancers', () => {
+        return HttpResponse.json(makeResourcePage(mockNetworkLoadBalancers));
+      })
+    );
+
+    const { getByTestId, container } = renderWithTheme(
+      <NetworkLoadBalancersLanding />
+    );
+
+    await waitForElementToBeRemoved(getByTestId(loadingTestId));
+
+    // Check for pagination elements by finding the PaginationFooter component
+    // PaginationFooter is typically rendered with pagination controls
+    const paginationFooter = container.querySelector(
+      '[class*="PaginationFooter"]'
+    );
+    expect(paginationFooter || container.innerHTML).toBeTruthy();
+  });
+});
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancersLanding.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancersLanding.tsx
new file mode 100644
index 00000000000..97eed4c8244
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancersLanding.tsx
@@ -0,0 +1,118 @@
+import { useNetworkLoadBalancersQuery } from '@linode/queries';
+import { CircleProgress, ErrorState, Hidden } from '@linode/ui';
+import * as React from 'react';
+
+import { DocumentTitleSegment } from 'src/components/DocumentTitle';
+import { LandingHeader } from 'src/components/LandingHeader';
+import { PaginationFooter } from 'src/components/PaginationFooter/PaginationFooter';
+import { Table } from 'src/components/Table';
+import { TableBody } from 'src/components/TableBody';
+import { TableCell } from 'src/components/TableCell';
+import { TableHead } from 'src/components/TableHead';
+import { TableRow } from 'src/components/TableRow';
+import { usePaginationV2 } from 'src/hooks/usePaginationV2';
+
+import { NLB_API_DOCS_LINK } from '../constants';
+import {
+  StyledLockIcon,
+  StyledManagedChip,
+} from './NetworkLoadBalancersLanding.styles';
+import { NetworkLoadBalancersLandingEmptyState } from './NetworkLoadBalancersLandingEmptyState';
+import { NetworkLoadBalancerTableRow } from './NetworkLoadBalancerTableRow';
+
+const preferenceKey = 'netloadbalancers';
+
+export const NetworkLoadBalancersLanding = () => {
+  const pagination = usePaginationV2({
+    currentRoute: '/netloadbalancers',
+    initialPage: 1,
+    preferenceKey,
+  });
+
+  const { data, error, isLoading } = useNetworkLoadBalancersQuery(
+    {
+      page: pagination.page,
+      page_size: pagination.pageSize,
+    },
+    {}
+  );
+
+  if (error) {
+    return (
+      <ErrorState
+        errorText={
+          error?.[0]?.reason ?? 'Unable to load your Network Load Balancers.'
+        }
+      />
+    );
+  }
+
+  if (isLoading) {
+    return <CircleProgress />;
+  }
+
+  if (data?.results === 0) {
+    return <NetworkLoadBalancersLandingEmptyState />;
+  }
+
+  return (
+    <>
+      <DocumentTitleSegment segment="Network Load Balancer" />
+      <LandingHeader
+        breadcrumbProps={{
+          pathname: '/netloadbalancers',
+        }}
+        docsLink={NLB_API_DOCS_LINK}
+        entity="Network Load Balancer"
+        extraActions={
+          <StyledManagedChip
+            icon={<StyledLockIcon />}
+            label="Managed by LKE Enterprise"
+            size="small"
+          />
+        }
+        title="Network Load Balancer"
+      />
+      <Table>
+        <TableHead>
+          <TableRow>
+            <TableCell>Label</TableCell>
+            <Hidden lgDown>
+              <TableCell>Status</TableCell>
+            </Hidden>
+            <Hidden lgDown>
+              <TableCell>ID</TableCell>
+            </Hidden>
+            <TableCell>Listener Ports</TableCell>
+            <TableCell>Virtual IP (IPv4)</TableCell>
+            <Hidden mdDown>
+              <TableCell>Virtual IP (IPv6)</TableCell>
+            </Hidden>
+            <TableCell>LKE-E Cluster</TableCell>
+            <Hidden mdDown>
+              <TableCell>Region</TableCell>
+            </Hidden>
+          </TableRow>
+        </TableHead>
+        <TableBody>
+          {data?.data.map((networkLoadBalancer) => (
+            <NetworkLoadBalancerTableRow
+              key={networkLoadBalancer.id}
+              {...networkLoadBalancer}
+            />
+          ))}
+        </TableBody>
+      </Table>
+      <PaginationFooter
+        count={data?.results ?? 0}
+        eventCategory="Network Load Balancer Table"
+        handlePageChange={pagination.handlePageChange}
+        handleSizeChange={pagination.handlePageSizeChange}
+        page={pagination.page}
+        pageSize={pagination.pageSize}
+      />
+    </>
+  );
+};
+
+export default NetworkLoadBalancersLanding;
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancersLandingEmptyState.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancersLandingEmptyState.tsx
new file mode 100644
index 00000000000..8238a8c8282
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancersLandingEmptyState.tsx
@@ -0,0 +1,14 @@
+import * as React from 'react';
+
+import { DocumentTitleSegment } from 'src/components/DocumentTitle';
+import { Placeholder } from 'src/components/Placeholder/Placeholder';
+
+// This will be implemented as part of a different story.
+export const NetworkLoadBalancersLandingEmptyState = () => {
+  return (
+    <React.Fragment>
+      <DocumentTitleSegment segment="Network Load Balancer" />
+      <Placeholder isEntity title="Network Load Balancer"></Placeholder>
+    </React.Fragment>
+  );
+};
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/PortsDisplay.test.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/PortsDisplay.test.tsx
new file mode 100644
index 00000000000..d2c79711060
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/PortsDisplay.test.tsx
@@ -0,0 +1,117 @@
+import { fireEvent } from '@testing-library/react';
+import * as React from 'react';
+
+import { networkLoadBalancerListenerFactory } from 'src/factories/networkLoadBalancer';
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import { PortsDisplay } from './PortsDisplay';
+
+describe('PortsDisplay', () => {
+  it('renders None when there are no ports', () => {
+    const { getByText } = renderWithTheme(<PortsDisplay ports={[]} />);
+
+    expect(getByText('None')).toBeInTheDocument();
+  });
+
+  it('renders all ports when within the display limit', () => {
+    const listeners = [
+      networkLoadBalancerListenerFactory.build({ port: 80 }),
+      networkLoadBalancerListenerFactory.build({ port: 443 }),
+    ];
+
+    const ports = listeners.map((l) => String(l.port));
+
+    const { getByText, container } = renderWithTheme(
+      <PortsDisplay ports={ports} />
+    );
+
+    // Both ports should be visible; match specifically a span to avoid duplicate matches
+    expect(
+      getByText((_, node) => {
+        if (!node) return false;
+        return (
+          node.nodeName === 'SPAN' &&
+          !!node.textContent &&
+          node.textContent.includes(String(ports[0]))
+        );
+      })
+    ).toBeInTheDocument();
+    expect(
+      getByText((_, node) => {
+        if (!node) return false;
+        return (
+          node.nodeName === 'SPAN' &&
+          !!node.textContent &&
+          node.textContent.includes(String(ports[1]))
+        );
+      })
+    ).toBeInTheDocument();
+
+    // There should be no overflow badge like +N
+    expect(container.textContent).not.toMatch(/\+\d+/);
+  });
+
+  it('truncates ports and shows overflow badge when exceeding limit', async () => {
+    const listeners = [
+      networkLoadBalancerListenerFactory.build({ port: 80 }),
+      networkLoadBalancerListenerFactory.build({ port: 443 }),
+      networkLoadBalancerListenerFactory.build({ port: 8080 }),
+      networkLoadBalancerListenerFactory.build({ port: 53 }),
+    ];
+
+    const ports = listeners.map((l) => String(l.port));
+
+    const { getByText, getByRole, container } = renderWithTheme(
+      <PortsDisplay ports={ports} />
+    );
+
+    // First ports should be visible (match spans)
+    expect(
+      getByText((_, node) => {
+        if (!node) return false;
+        return (
+          node.nodeName === 'SPAN' &&
+          !!node.textContent &&
+          node.textContent.includes(String(ports[0]))
+        );
+      })
+    ).toBeInTheDocument();
+    expect(
+      getByText((_, node) => {
+        if (!node) return false;
+        return (
+          node.nodeName === 'SPAN' &&
+          !!node.textContent &&
+          node.textContent.includes(String(ports[1]))
+        );
+      })
+    ).toBeInTheDocument();
+
+    // Overflow badge should be present (e.g. +2)
+    const match = container.textContent?.match(/\+(\d+)/);
+    expect(match).toBeTruthy();
+    const hiddenCount = Number(match?.[1]);
+    expect(hiddenCount).toBeGreaterThan(0);
+
+    // Open the ShowMore popover by clicking the chip button using its aria-label
+    const badgeText = `+${hiddenCount}`;
+    const badgeButton = getByRole('button', { name: `${badgeText} ports` });
+
+    fireEvent.click(badgeButton);
+
+    // Hidden ports should now be visible in the popover; match spans
+    const hiddenPorts = ports.slice(2);
+    hiddenPorts.forEach((p) => {
+      expect(
+        getByText((_, node) => {
+          if (!node) return false;
+          return (
+            node.nodeName === 'SPAN' &&
+            !!node.textContent &&
+            node.textContent.includes(p)
+          );
+        })
+      ).toBeInTheDocument();
+    });
+  });
+});
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/PortsDisplay.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/PortsDisplay.tsx
new file mode 100644
index 00000000000..ec88333856d
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/PortsDisplay.tsx
@@ -0,0 +1,96 @@
+import { Stack } from '@linode/ui';
+import { useTheme } from '@mui/material/styles';
+import * as React from 'react';
+
+import { ShowMore } from 'src/components/ShowMore/ShowMore';
+
+import { MAX_PORT_DISPLAY_CHARS } from '../constants';
+
+interface PortsDisplayProps {
+  ports: string[];
+}
+
+interface PortsPartition {
+  displayText: string;
+  hiddenPorts: string[];
+}
+
+/**
+ * Calculates how many ports can be displayed within the character limit.
+ * @param ports - Array of port strings to partition
+ * @returns Object containing displayText and hiddenPorts
+ */
+const partitionPorts = (ports: string[]): PortsPartition => {
+  if (ports.length === 0) {
+    return { displayText: 'None', hiddenPorts: [] };
+  }
+
+  let accumulatedLength = 0;
+  let visibleCount = 0;
+
+  for (let i = 0; i < ports.length; i++) {
+    const portLength = ports[i].length;
+    const separatorLength = i < ports.length - 1 ? 2 : 0; // ', ' = 2 chars
+    const totalLength = accumulatedLength + portLength + separatorLength;
+
+    if (totalLength > MAX_PORT_DISPLAY_CHARS && accumulatedLength > 0) {
+      break;
+    }
+
+    accumulatedLength = totalLength;
+    visibleCount = i + 1;
+  }
+
+  const visiblePorts = ports.slice(0, visibleCount);
+  const hiddenPorts = ports.slice(visibleCount);
+
+  return {
+    displayText: visiblePorts.join(', '),
+    hiddenPorts,
+  };
+};
+
+/**
+ * Formats and displays ports with truncation when exceeding character limit.
+ * React.memo ensures the component only re-renders when `ports` changes.
+ * Hidden ports are accessible via ShowMore popover.
+ */
+export const PortsDisplay = React.memo(({ ports }: PortsDisplayProps) => {
+  const theme = useTheme();
+  const { displayText, hiddenPorts } = partitionPorts(ports);
+
+  if (displayText === 'None') {
+    return <span>None</span>;
+  }
+
+  return (
+    <Stack alignItems="center" direction="row" spacing={1}>
+      <span>{displayText}</span>
+      {hiddenPorts.length > 0 && (
+        <ShowMore
+          ariaItemType="ports"
+          chipProps={{
+            sx: {
+              backgroundColor: theme.tokens.alias.Background.Neutralsubtle,
+              color: theme.tokens.alias.Content.Text.Primary.Default,
+              '&:hover, &:focus': {
+                backgroundColor: theme.tokens.alias.Background.Neutralsubtle,
+                color: theme.tokens.alias.Content.Text.Primary.Default,
+              },
+            },
+          }}
+          items={hiddenPorts}
+          render={(hiddenPortsList) => (
+            <Stack>
+              {hiddenPortsList.map((port) => (
+                <span key={port}>{port}</span>
+              ))}
+            </Stack>
+          )}
+        />
+      )}
+    </Stack>
+  );
+});
+
+PortsDisplay.displayName = 'PortsDisplay';
diff --git a/packages/manager/src/features/NetworkLoadBalancers/networkLoadBalancersLazyRoute.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/networkLoadBalancersLazyRoute.tsx
similarity index 100%
rename from packages/manager/src/features/NetworkLoadBalancers/networkLoadBalancersLazyRoute.tsx
rename to packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/networkLoadBalancersLazyRoute.tsx
diff --git a/packages/manager/src/features/NetworkLoadBalancers/constants.ts b/packages/manager/src/features/NetworkLoadBalancers/constants.ts
new file mode 100644
index 00000000000..9b28fd7ac29
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/constants.ts
@@ -0,0 +1,4 @@
+export const MAX_PORT_DISPLAY_CHARS = 12;
+
+export const NLB_API_DOCS_LINK =
+  'https://techdocs.akamai.com/linode-api/changelog/network-load-balancers';
diff --git a/packages/manager/src/routes/networkLoadBalancer/index.ts b/packages/manager/src/routes/networkLoadBalancer/index.ts
index fb2421fef67..d98ed4848eb 100644
--- a/packages/manager/src/routes/networkLoadBalancer/index.ts
+++ b/packages/manager/src/routes/networkLoadBalancer/index.ts
@@ -14,7 +14,7 @@ const networkLoadBalancersIndexRoute = createRoute({
   path: '/',
 }).lazy(() =>
   import(
-    'src/features/NetworkLoadBalancers/networkLoadBalancersLazyRoute'
+    'src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/networkLoadBalancersLazyRoute'
   ).then((m) => m.networkLoadBalancersLazyRoute)
 );
 

From a966e10528c5f5434f5c7295899dc940ecfb08e9 Mon Sep 17 00:00:00 2001
From: smans-akamai <smans@akamai.com>
Date: Mon, 24 Nov 2025 13:56:28 -0500
Subject: [PATCH 35/91] fix: [UIE-9643] - DBaaS - Manage Networking VPC fields
 not handling error response (#13121)

* fix: [UIE-9643] - DBaaS - Manage Networking VPC fields not handling error response

* adding changeset
---
 .../pr-13121-fixed-1763734247008.md           |  5 +++++
 .../DatabaseManageNetworkingDrawer.tsx        | 19 ++++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13121-fixed-1763734247008.md

diff --git a/packages/manager/.changeset/pr-13121-fixed-1763734247008.md b/packages/manager/.changeset/pr-13121-fixed-1763734247008.md
new file mode 100644
index 00000000000..30842b6ced6
--- /dev/null
+++ b/packages/manager/.changeset/pr-13121-fixed-1763734247008.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+DBaaS - Manage Networking VPC fields not handling error response ([#13121](https://github.com/linode/manager/pull/13121))
diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseManageNetworkingDrawer.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseManageNetworkingDrawer.tsx
index c3d9bca2806..c35d5bdf251 100644
--- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseManageNetworkingDrawer.tsx
+++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseManageNetworkingDrawer.tsx
@@ -46,14 +46,16 @@ const DatabaseManageNetworkingDrawer = (props: Props) => {
   });
 
   const {
-    formState: { isDirty, isValid },
+    formState: { isDirty, isValid, errors },
     handleSubmit,
     reset,
+    setError,
     watch,
   } = form;
 
-  const onSubmit = (values: ManageNetworkingFormValues) => {
-    updateDatabase(values).then(() => {
+  const onSubmit = async (values: ManageNetworkingFormValues) => {
+    try {
+      await updateDatabase(values);
       enqueueSnackbar('Changes are being applied.', {
         variant: 'info',
       });
@@ -65,7 +67,11 @@ const DatabaseManageNetworkingDrawer = (props: Props) => {
           databaseId: database.id,
         },
       });
-    });
+    } catch (errors) {
+      for (const error of errors) {
+        setError(error?.field ?? 'root', { message: error.reason });
+      }
+    }
   };
 
   const [publicAccess, subnetId, vpcId] = watch([
@@ -84,7 +90,6 @@ const DatabaseManageNetworkingDrawer = (props: Props) => {
   const isSaveDisabled = !isDirty || !isValid || !hasValidSelection;
 
   const {
-    error: manageNetworkingError,
     isPending: submitInProgress,
     mutateAsync: updateDatabase,
     reset: resetMutation,
@@ -105,8 +110,8 @@ const DatabaseManageNetworkingDrawer = (props: Props) => {
 
   return (
     <Drawer onClose={handleOnClose} open={open} title="Manage Networking">
-      {manageNetworkingError && (
-        <Notice text={manageNetworkingError[0].reason} variant="error" />
+      {errors.root?.message && (
+        <Notice text={errors.root.message} variant="error" />
       )}
       <FormProvider {...form}>
         <form onSubmit={handleSubmit(onSubmit)}>

From d699296a19f08555dfd557ba458b5a3cf8a4ba01 Mon Sep 17 00:00:00 2001
From: Banks Nussman <115251059+bnussman-akamai@users.noreply.github.com>
Date: Mon, 24 Nov 2025 14:03:49 -0500
Subject: [PATCH 36/91] chore: [M3-10715] - Bump Vite from `7.1.x` to `7.2.x`
 and update Vitest from `v3` to `v4` (#13119)

* chore: update vite to latest and vitest to v4

* fix search tests and sdk build

* addess unhanded promises in `TriggerConditions.test.tsx`

* fix some circular imports in CloudPulse to try to fix unit test stability

* lint

* clean up

* clean up

* fix lockfile

* fix unawaited fetches by mocking flags differently to hopefully fix test flake

* fix unawaited fetches by mocking flags differently to hopefully fix test flake

* mock flags with our built-in helper

* revert some possibly unnessesary changes

* lint

* add some changesets

Co-authored-by: Banks Nussman <banks@nussman.us>
---
 package.json                                  |   4 +-
 .../pr-13119-tech-stories-1764007445902.md    |   5 +
 packages/api-v4/package.json                  |   3 +-
 .../pr-13119-tech-stories-1764007553451.md    |   5 +
 .../pr-13119-tech-stories-1764007583363.md    |   5 +
 .../pr-13119-tech-stories-1764007617066.md    |   5 +
 packages/manager/package.json                 |   2 +-
 .../CloudPulse/Alerts/AlertsDetail/utils.ts   |   2 +-
 .../AlertInformationActionTable.tsx           |   3 +-
 .../CreateAlertDefinition.test.tsx            |   4 +-
 .../DimensionFilterValue/utils.test.ts        |   2 +-
 .../Criteria/DimensionFilterValue/utils.ts    |  24 +-
 .../Criteria/TriggerConditions.test.tsx       |  16 +-
 .../EditAlert/EditAlertDefinition.test.tsx    | 113 +--
 .../CloudPulse/Alerts/Utils/utils.test.ts     |  27 +-
 .../features/CloudPulse/Alerts/Utils/utils.ts |  44 -
 .../Dashboard/CloudPulseDashboard.tsx         |   4 +-
 .../src/features/CloudPulse/GroupBy/utils.ts  |   2 +-
 .../CloudPulse/Utils/FilterBuilder.test.ts    |   2 +-
 .../CloudPulse/Utils/FilterBuilder.ts         |  69 +-
 .../CloudPulse/Utils/FilterConfig.test.ts     |  36 +
 .../features/CloudPulse/Utils/FilterConfig.ts |  32 +
 .../features/CloudPulse/Utils/utils.test.ts   |  59 +-
 .../src/features/CloudPulse/Utils/utils.ts    | 120 ++-
 .../shared/CloudPulseEndpointsSelect.tsx      |   3 +-
 .../CloudPulseFirewallNodebalancersSelect.tsx |   5 +-
 .../shared/CloudPulseRegionSelect.tsx         |   6 +-
 .../shared/CloudPulseResourcesSelect.tsx      |   3 +-
 .../src/features/Kubernetes/kubeUtils.test.ts | 140 +--
 .../features/PlacementGroups/utils.test.ts    |  18 +-
 .../src/features/PlacementGroups/utils.ts     |   9 +-
 .../APITokens/CreateAPITokenDrawer.test.tsx   |   4 +-
 .../VPCs/VPCDetail/VPCSubnetsTable.test.tsx   |   4 +-
 .../components/PlansPanel/utils.test.ts       | 104 +-
 .../src/utilities/analytics/utils.test.ts     |   4 +-
 packages/manager/vite.config.ts               |   2 +-
 packages/search/vitest.config.ts              |   3 +
 .../pr-13119-tech-stories-1764007518381.md    |   5 +
 .../helpers/scrollErrorIntoViewV2.test.tsx    |  35 +-
 pnpm-lock.yaml                                | 932 +++++++++---------
 vitest.config.ts                              |  14 +
 vitest.workspace.ts                           |   8 -
 42 files changed, 929 insertions(+), 958 deletions(-)
 create mode 100644 packages/api-v4/.changeset/pr-13119-tech-stories-1764007445902.md
 create mode 100644 packages/manager/.changeset/pr-13119-tech-stories-1764007553451.md
 create mode 100644 packages/manager/.changeset/pr-13119-tech-stories-1764007583363.md
 create mode 100644 packages/manager/.changeset/pr-13119-tech-stories-1764007617066.md
 create mode 100644 packages/manager/src/features/CloudPulse/Utils/FilterConfig.test.ts
 create mode 100644 packages/search/vitest.config.ts
 create mode 100644 packages/utilities/.changeset/pr-13119-tech-stories-1764007518381.md
 create mode 100644 vitest.config.ts
 delete mode 100644 vitest.workspace.ts

diff --git a/package.json b/package.json
index 388b9dd7ee5..7ea7b9bd378 100644
--- a/package.json
+++ b/package.json
@@ -8,8 +8,8 @@
     "concurrently": "9.1.0",
     "husky": "^9.1.6",
     "typescript": "^5.7.3",
-    "vitest": "^3.2.4",
-    "@vitest/ui": "^3.2.4",
+    "vitest": "^4.0.10",
+    "@vitest/ui": "^4.0.10",
     "lint-staged": "^15.4.3",
     "eslint": "^9.24.0",
     "eslint-config-prettier": "^10.1.1",
diff --git a/packages/api-v4/.changeset/pr-13119-tech-stories-1764007445902.md b/packages/api-v4/.changeset/pr-13119-tech-stories-1764007445902.md
new file mode 100644
index 00000000000..db0f148184b
--- /dev/null
+++ b/packages/api-v4/.changeset/pr-13119-tech-stories-1764007445902.md
@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Tech Stories
+---
+
+Add `@types/node` as a devDependency ([#13119](https://github.com/linode/manager/pull/13119))
diff --git a/packages/api-v4/package.json b/packages/api-v4/package.json
index f19a56eeb28..033074da041 100644
--- a/packages/api-v4/package.json
+++ b/packages/api-v4/package.json
@@ -59,7 +59,8 @@
     "@linode/tsconfig": "workspace:*",
     "axios-mock-adapter": "^1.22.0",
     "concurrently": "^9.0.1",
-    "tsup": "^8.4.0"
+    "tsup": "^8.4.0",
+    "@types/node": "^22.13.14"
   },
   "lint-staged": {
     "*.{ts,tsx,js}": [
diff --git a/packages/manager/.changeset/pr-13119-tech-stories-1764007553451.md b/packages/manager/.changeset/pr-13119-tech-stories-1764007553451.md
new file mode 100644
index 00000000000..9141261a386
--- /dev/null
+++ b/packages/manager/.changeset/pr-13119-tech-stories-1764007553451.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Tech Stories
+---
+
+Update Vite from `7.1.11` to `7.2.2` ([#13119](https://github.com/linode/manager/pull/13119))
diff --git a/packages/manager/.changeset/pr-13119-tech-stories-1764007583363.md b/packages/manager/.changeset/pr-13119-tech-stories-1764007583363.md
new file mode 100644
index 00000000000..65133e69b95
--- /dev/null
+++ b/packages/manager/.changeset/pr-13119-tech-stories-1764007583363.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Tech Stories
+---
+
+Fix circular imports in CloudPulse ([#13119](https://github.com/linode/manager/pull/13119))
diff --git a/packages/manager/.changeset/pr-13119-tech-stories-1764007617066.md b/packages/manager/.changeset/pr-13119-tech-stories-1764007617066.md
new file mode 100644
index 00000000000..d79f961c70c
--- /dev/null
+++ b/packages/manager/.changeset/pr-13119-tech-stories-1764007617066.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Tech Stories
+---
+
+Update vitest from `v3` to `v4` ([#13119](https://github.com/linode/manager/pull/13119))
diff --git a/packages/manager/package.json b/packages/manager/package.json
index 11169d99914..e67df571e5f 100644
--- a/packages/manager/package.json
+++ b/packages/manager/package.json
@@ -180,7 +180,7 @@
     "pdfreader": "^3.0.7",
     "redux-mock-store": "^1.5.3",
     "storybook": "^9.0.12",
-    "vite": "^7.1.11",
+    "vite": "^7.2.2",
     "vite-plugin-svgr": "^4.5.0"
   },
   "browserslist": [
diff --git a/packages/manager/src/features/CloudPulse/Alerts/AlertsDetail/utils.ts b/packages/manager/src/features/CloudPulse/Alerts/AlertsDetail/utils.ts
index 12467410ed3..2a644a2e435 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/AlertsDetail/utils.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/AlertsDetail/utils.ts
@@ -1,4 +1,4 @@
-import { transformDimensionValue } from '../Utils/utils';
+import { transformDimensionValue } from '../CreateAlert/Criteria/DimensionFilterValue/utils';
 import {
   LINODE_DIMENSION_LABEL,
   NODEBALANCER_DIMENSION_LABEL,
diff --git a/packages/manager/src/features/CloudPulse/Alerts/ContextualView/AlertInformationActionTable.tsx b/packages/manager/src/features/CloudPulse/Alerts/ContextualView/AlertInformationActionTable.tsx
index a457d7d79ab..a8968c2b6f2 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/ContextualView/AlertInformationActionTable.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/ContextualView/AlertInformationActionTable.tsx
@@ -21,11 +21,10 @@ import {
 } from 'src/queries/cloudpulse/useAlertsMutation';
 import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
 
-import { useContextualAlertsState } from '../../Utils/utils';
+import { arraysEqual, useContextualAlertsState } from '../../Utils/utils';
 import { AlertConfirmationDialog } from '../AlertsLanding/AlertConfirmationDialog';
 import { ALERT_SCOPE_TOOLTIP_CONTEXTUAL } from '../constants';
 import { scrollToElement } from '../Utils/AlertResourceUtils';
-import { arraysEqual } from '../Utils/utils';
 import { AlertInformationActionRow } from './AlertInformationActionRow';
 
 import type {
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/CreateAlertDefinition.test.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/CreateAlertDefinition.test.tsx
index 71dc62de48f..d0db461a823 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/CreateAlertDefinition.test.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/CreateAlertDefinition.test.tsx
@@ -139,6 +139,7 @@ describe('AlertDefinition Create', () => {
 
   it(
     'should render client side validation errors for threshold and trigger occurences text field',
+    { timeout: 10000 },
     async () => {
       const user = userEvent.setup();
       const container = renderWithTheme(<CreateAlertDefinition />);
@@ -173,8 +174,7 @@ describe('AlertDefinition Create', () => {
       expect(
         container.getAllByText('The value should be a number.').length
       ).toBe(2);
-    },
-    { timeout: 10000 }
+    }
   );
 
   it('should render the client side validation error messages for the form', async () => {
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/utils.test.ts b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/utils.test.ts
index 80c6f9787a8..7162f14f7b1 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/utils.test.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/utils.test.ts
@@ -1,6 +1,5 @@
 import { linodeFactory, nodeBalancerFactory } from '@linode/utilities';
 
-import { transformDimensionValue } from '../../../Utils/utils';
 import {
   getFilteredFirewallParentEntities,
   getFirewallLinodes,
@@ -11,6 +10,7 @@ import {
   handleValueChange,
   resolveSelectedValues,
   scopeBasedFilteredResources,
+  transformDimensionValue,
 } from './utils';
 
 import type { Linode } from '@linode/api-v4';
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/utils.ts b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/utils.ts
index 11498b8db95..0fe8f769e91 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/utils.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/utils.ts
@@ -1,4 +1,7 @@
-import { transformDimensionValue } from '../../../Utils/utils';
+import {
+  DIMENSION_TRANSFORM_CONFIG,
+  TRANSFORMS,
+} from 'src/features/CloudPulse/shared/DimensionTransform';
 
 import type { Item } from '../../../constants';
 import type { OperatorGroup } from './constants';
@@ -13,6 +16,25 @@ import type {
 import type { CloudPulseResources } from 'src/features/CloudPulse/shared/CloudPulseResourcesSelect';
 import type { FirewallEntity } from 'src/features/CloudPulse/shared/types';
 
+/**
+ * Transform a dimension value using the appropriate transform function
+ * @param serviceType - The cloud pulse service type
+ * @param dimensionLabel - The dimension label
+ * @param value - The value to transform
+ * @returns Transformed value
+ */
+export const transformDimensionValue = (
+  serviceType: CloudPulseServiceType | null,
+  dimensionLabel: string,
+  value: string
+): string => {
+  return (
+    (
+      serviceType && DIMENSION_TRANSFORM_CONFIG[serviceType]?.[dimensionLabel]
+    )?.(value) ?? TRANSFORMS.capitalize(value)
+  );
+};
+
 /**
  * Resolves the selected value(s) for the Autocomplete component from raw string.
  * @param options - List of selectable options.
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/TriggerConditions.test.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/TriggerConditions.test.tsx
index 3b900aeb9eb..3eb0ee64bf8 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/TriggerConditions.test.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/TriggerConditions.test.tsx
@@ -35,8 +35,6 @@ const pollingIntervalOptions =
   }));
 
 describe('Trigger Conditions', () => {
-  const user = userEvent.setup();
-
   it('should render all the components and names', () => {
     renderWithThemeAndHookFormContext({
       component: (
@@ -120,7 +118,7 @@ describe('Trigger Conditions', () => {
       { name: 'Open' }
     );
 
-    user.click(evaluationPeriodInput);
+    await userEvent.click(evaluationPeriodInput);
 
     expect(
       await screen.findByRole('option', {
@@ -133,7 +131,7 @@ describe('Trigger Conditions', () => {
       })
     ).toBeVisible();
 
-    await user.click(
+    await userEvent.click(
       screen.getByRole('option', {
         name: evaluationPeriodOptions[0].label,
       })
@@ -167,7 +165,7 @@ describe('Trigger Conditions', () => {
       { name: 'Open' }
     );
 
-    user.click(pollingIntervalInput);
+    await userEvent.click(pollingIntervalInput);
 
     expect(
       await screen.findByRole('option', {
@@ -181,7 +179,7 @@ describe('Trigger Conditions', () => {
       })
     ).toBeVisible();
 
-    await user.click(
+    await userEvent.click(
       screen.getByRole('option', {
         name: pollingIntervalOptions[0].label,
       })
@@ -191,7 +189,7 @@ describe('Trigger Conditions', () => {
     ).toHaveAttribute('value', pollingIntervalOptions[0].label);
   });
 
-  it('should be able to show the options that are greater than or equal to max scraping Interval', () => {
+  it('should be able to show the options that are greater than or equal to max scraping Interval', async () => {
     renderWithThemeAndHookFormContext({
       component: (
         <TriggerConditions
@@ -216,7 +214,7 @@ describe('Trigger Conditions', () => {
       { name: 'Open' }
     );
 
-    user.click(evaluationPeriodInput);
+    await userEvent.click(evaluationPeriodInput);
 
     expect(
       screen.queryByText(evaluationPeriodOptions[0].label)
@@ -227,7 +225,7 @@ describe('Trigger Conditions', () => {
       'button',
       { name: 'Open' }
     );
-    user.click(pollingIntervalInput);
+    await userEvent.click(pollingIntervalInput);
     expect(
       screen.queryByText(pollingIntervalOptions[0].label)
     ).not.toBeInTheDocument();
diff --git a/packages/manager/src/features/CloudPulse/Alerts/EditAlert/EditAlertDefinition.test.tsx b/packages/manager/src/features/CloudPulse/Alerts/EditAlert/EditAlertDefinition.test.tsx
index 9c921f21bf2..05e19604265 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/EditAlert/EditAlertDefinition.test.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/EditAlert/EditAlertDefinition.test.tsx
@@ -48,72 +48,61 @@ const alertDetails = alertFactory.build({
   scope: 'entity',
 });
 describe('EditAlertDefinition component', () => {
-  it(
-    'renders the components of the form',
-    async () => {
-      const { findByPlaceholderText, getByLabelText, getByText } =
-        renderWithTheme(
-          <EditAlertDefinition
-            alertDetails={alertDetails}
-            serviceType="linode"
-          />
-        );
-      expect(getByText('1. General Information')).toBeVisible();
-      expect(getByLabelText('Name')).toBeVisible();
-      expect(getByLabelText('Description (optional)')).toBeVisible();
-      expect(getByLabelText('Severity')).toBeVisible();
-      expect(getByLabelText('Service')).toBeVisible();
-      expect(getByText('2. Entities')).toBeVisible();
-      expect(
-        await findByPlaceholderText('Search for a Region or Entity')
-      ).toBeInTheDocument();
-      expect(await findByPlaceholderText('Select Regions')).toBeInTheDocument();
-      expect(getByText('3. Criteria')).toBeVisible();
-      expect(getByText('Metric Threshold')).toBeVisible();
-      expect(getByLabelText('Data Field')).toBeVisible();
-      expect(getByLabelText('Aggregation Type')).toBeVisible();
-      expect(getByLabelText('Operator')).toBeVisible();
-      expect(getByLabelText('Threshold')).toBeVisible();
-      expect(getByLabelText('Evaluation Period')).toBeVisible();
-      expect(getByLabelText('Polling Interval')).toBeVisible();
-      expect(getByText('4. Notification Channels')).toBeVisible();
-    },
-    { timeout: 20000 }
-  );
-
-  it(
-    'should submit form data correctly',
-    async () => {
-      navigate({
-        to: '/alerts/definitions/edit/linode/1',
-      });
-      const mutateAsyncSpy = queryMocks.useEditAlertDefinition().mutateAsync;
-      const { getByPlaceholderText, getByText } = renderWithTheme(
+  it('renders the components of the form', { timeout: 20000 }, async () => {
+    const { findByPlaceholderText, getByLabelText, getByText } =
+      renderWithTheme(
         <EditAlertDefinition alertDetails={alertDetails} serviceType="linode" />
       );
-      const descriptionValue = 'Updated Description';
-      const nameValue = 'Updated Label';
-      const nameInput = getByPlaceholderText('Enter a Name');
-      const descriptionInput = getByPlaceholderText('Enter a Description');
-      await userEvent.clear(nameInput);
-      await userEvent.clear(descriptionInput);
-      await userEvent.type(nameInput, nameValue);
+    expect(getByText('1. General Information')).toBeVisible();
+    expect(getByLabelText('Name')).toBeVisible();
+    expect(getByLabelText('Description (optional)')).toBeVisible();
+    expect(getByLabelText('Severity')).toBeVisible();
+    expect(getByLabelText('Service')).toBeVisible();
+    expect(getByText('2. Entities')).toBeVisible();
+    expect(
+      await findByPlaceholderText('Search for a Region or Entity')
+    ).toBeInTheDocument();
+    expect(await findByPlaceholderText('Select Regions')).toBeInTheDocument();
+    expect(getByText('3. Criteria')).toBeVisible();
+    expect(getByText('Metric Threshold')).toBeVisible();
+    expect(getByLabelText('Data Field')).toBeVisible();
+    expect(getByLabelText('Aggregation Type')).toBeVisible();
+    expect(getByLabelText('Operator')).toBeVisible();
+    expect(getByLabelText('Threshold')).toBeVisible();
+    expect(getByLabelText('Evaluation Period')).toBeVisible();
+    expect(getByLabelText('Polling Interval')).toBeVisible();
+    expect(getByText('4. Notification Channels')).toBeVisible();
+  });
 
-      await userEvent.type(descriptionInput, descriptionValue);
+  it('should submit form data correctly', { timeout: 10000 }, async () => {
+    navigate({
+      to: '/alerts/definitions/edit/linode/1',
+    });
+    const mutateAsyncSpy = queryMocks.useEditAlertDefinition().mutateAsync;
+    const { getByPlaceholderText, getByText } = renderWithTheme(
+      <EditAlertDefinition alertDetails={alertDetails} serviceType="linode" />
+    );
+    const descriptionValue = 'Updated Description';
+    const nameValue = 'Updated Label';
+    const nameInput = getByPlaceholderText('Enter a Name');
+    const descriptionInput = getByPlaceholderText('Enter a Description');
+    await userEvent.clear(nameInput);
+    await userEvent.clear(descriptionInput);
+    await userEvent.type(nameInput, nameValue);
 
-      await userEvent.click(getByText('Submit'));
+    await userEvent.type(descriptionInput, descriptionValue);
 
-      await waitFor(() => expect(mutateAsyncSpy).toHaveBeenCalledTimes(1));
+    await userEvent.click(getByText('Submit'));
 
-      expect(navigate).toHaveBeenLastCalledWith({
-        to: '/alerts/definitions',
-      });
-      await waitFor(() => {
-        expect(
-          getByText(UPDATE_ALERT_SUCCESS_MESSAGE) // validate whether snackbar is displayed properly
-        ).toBeInTheDocument();
-      });
-    },
-    { timeout: 10000 }
-  );
+    await waitFor(() => expect(mutateAsyncSpy).toHaveBeenCalledTimes(1));
+
+    expect(navigate).toHaveBeenLastCalledWith({
+      to: '/alerts/definitions',
+    });
+    await waitFor(() => {
+      expect(
+        getByText(UPDATE_ALERT_SUCCESS_MESSAGE) // validate whether snackbar is displayed properly
+      ).toBeInTheDocument();
+    });
+  });
 });
diff --git a/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.test.ts b/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.test.ts
index 870ac5adbd4..4cb7b76999c 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.test.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.test.ts
@@ -4,10 +4,10 @@ import { act, renderHook } from '@testing-library/react';
 import { alertFactory, serviceTypesFactory } from 'src/factories';
 
 import { useContextualAlertsState } from '../../Utils/utils';
+import { transformDimensionValue } from '../CreateAlert/Criteria/DimensionFilterValue/utils';
 import { alertDefinitionFormSchema } from '../CreateAlert/schemas';
 import {
   alertsFromEnabledServices,
-  arraysEqual,
   convertAlertDefinitionValues,
   convertAlertsToTypeSet,
   convertSecondsToMinutes,
@@ -17,7 +17,6 @@ import {
   getSchemaWithEntityIdValidation,
   getServiceTypeLabel,
   handleMultipleError,
-  transformDimensionValue,
 } from './utils';
 
 import type { AlertValidationSchemaProps } from './utils';
@@ -498,27 +497,3 @@ describe('transformDimensionValue', () => {
     ).toBe('Test_value');
   });
 });
-
-describe('arraysEqual', () => {
-  it('should return true when both arrays are empty', () => {
-    expect(arraysEqual([], [])).toBe(true);
-  });
-  it('should return false when one array is empty and the other is not', () => {
-    expect(arraysEqual([], [1, 2, 3])).toBe(false);
-  });
-  it('should return true when arrays are undefined', () => {
-    expect(arraysEqual(undefined, undefined)).toBe(true);
-  });
-  it('should return false when one of the arrays is undefined', () => {
-    expect(arraysEqual(undefined, [1, 2, 3])).toBe(false);
-  });
-  it('should return true when arrays are equal', () => {
-    expect(arraysEqual([1, 2, 3], [1, 2, 3])).toBe(true);
-  });
-  it('should return false when arrays are not equal', () => {
-    expect(arraysEqual([1, 2, 3], [1, 2, 3, 4])).toBe(false);
-  });
-  it('should return true when arrays have same elements but in different order', () => {
-    expect(arraysEqual([1, 2, 3], [3, 2, 1])).toBe(true);
-  });
-});
diff --git a/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.ts b/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.ts
index e756d6831e5..167b7a684f8 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.ts
@@ -13,11 +13,6 @@ import {
 import type { FieldPath, FieldValues, UseFormSetError } from 'react-hook-form';
 import { array, object, string } from 'yup';
 
-import {
-  DIMENSION_TRANSFORM_CONFIG,
-  TRANSFORMS,
-} from '../../shared/DimensionTransform';
-import { compareArrays } from '../../Utils/FilterBuilder';
 import { aggregationTypeMap, metricOperatorTypeMap } from '../constants';
 
 import type { CloudPulseResources } from '../../shared/CloudPulseResourcesSelect';
@@ -600,42 +595,3 @@ export const alertsFromEnabledServices = (
     (alert) => aclpServices?.[alert.service_type]?.alerts?.enabled ?? false
   );
 };
-
-/**
- * Transform a dimension value using the appropriate transform function
- * @param serviceType - The cloud pulse service type
- * @param dimensionLabel - The dimension label
- * @param value - The value to transform
- * @returns Transformed value
- */
-export const transformDimensionValue = (
-  serviceType: CloudPulseServiceType | null,
-  dimensionLabel: string,
-  value: string
-): string => {
-  return (
-    (
-      serviceType && DIMENSION_TRANSFORM_CONFIG[serviceType]?.[dimensionLabel]
-    )?.(value) ?? TRANSFORMS.capitalize(value)
-  );
-};
-
-/**
- * Checks if two arrays are equal, ignores the order of the elements
- * @param a The first array
- * @param b The second array
- * @returns True if the arrays are equal, false otherwise
- */
-export const arraysEqual = (
-  a: number[] | undefined,
-  b: number[] | undefined
-) => {
-  if (a === undefined && b === undefined) return true;
-  if (a === undefined || b === undefined) return false;
-  if (a.length !== b.length) return false;
-
-  return compareArrays(
-    [...a].sort((x, y) => x - y),
-    [...b].sort((x, y) => x - y)
-  );
-};
diff --git a/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboard.tsx b/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboard.tsx
index e8148e9fcc6..876b4cc17db 100644
--- a/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboard.tsx
+++ b/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboard.tsx
@@ -10,11 +10,11 @@ import {
 } from 'src/queries/cloudpulse/services';
 
 import { RESOURCE_FILTER_MAP } from '../Utils/constants';
-import { useAclpPreference } from '../Utils/UserPreference';
 import {
   getAssociatedEntityType,
   getResourcesFilterConfig,
-} from '../Utils/utils';
+} from '../Utils/FilterConfig';
+import { useAclpPreference } from '../Utils/UserPreference';
 import {
   renderPlaceHolder,
   RenderWidgets,
diff --git a/packages/manager/src/features/CloudPulse/GroupBy/utils.ts b/packages/manager/src/features/CloudPulse/GroupBy/utils.ts
index 67706cdf8c1..7444f8bc916 100644
--- a/packages/manager/src/features/CloudPulse/GroupBy/utils.ts
+++ b/packages/manager/src/features/CloudPulse/GroupBy/utils.ts
@@ -2,7 +2,7 @@ import { useCloudPulseDashboardByIdQuery } from 'src/queries/cloudpulse/dashboar
 import { useGetCloudPulseMetricDefinitionsByServiceType } from 'src/queries/cloudpulse/services';
 
 import { ASSOCIATED_ENTITY_METRIC_MAP } from '../Utils/constants';
-import { getAssociatedEntityType } from '../Utils/utils';
+import { getAssociatedEntityType } from '../Utils/FilterConfig';
 
 import type { GroupByOption } from './CloudPulseGroupByDrawer';
 import type {
diff --git a/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.test.ts b/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.test.ts
index dab4641047f..5cc58111f72 100644
--- a/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.test.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.test.ts
@@ -10,7 +10,6 @@ import {
 
 import { RESOURCE_ID, RESOURCES } from './constants';
 import {
-  deepEqual,
   filterBasedOnConfig,
   filterEndpointsUsingRegion,
   filterFirewallNodebalancers,
@@ -33,6 +32,7 @@ import {
 } from './FilterBuilder';
 import { FILTER_CONFIG } from './FilterConfig';
 import { CloudPulseAvailableViews, CloudPulseSelectTypes } from './models';
+import { deepEqual } from './utils';
 
 import type { CloudPulseEndpoints } from '../shared/CloudPulseEndpointsSelect';
 import type { CloudPulseResources } from '../shared/CloudPulseResourcesSelect';
diff --git a/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.ts b/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.ts
index b63fdd76ca7..97fed2e4b40 100644
--- a/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.ts
@@ -6,9 +6,8 @@ import {
   RESOURCES,
   TAGS,
 } from './constants';
-import { FILTER_CONFIG } from './FilterConfig';
+import { FILTER_CONFIG, getAssociatedEntityType } from './FilterConfig';
 import { CloudPulseAvailableViews, CloudPulseSelectTypes } from './models';
-import { getAssociatedEntityType } from './utils';
 
 import type {
   CloudPulseMetricsFilter,
@@ -676,72 +675,6 @@ const getDependentFiltersByFilterKey = (
     );
 };
 
-/**
- * @param obj1 The first object to be compared
- * @param obj2 The second object to be compared
- * @returns True if, both are equal else false
- */
-export const deepEqual = <T>(obj1: T, obj2: T): boolean => {
-  if (obj1 === obj2) {
-    return true; // Identical references or values
-  }
-
-  // If either is null or undefined, or they are not of object type, return false
-  if (
-    obj1 === null ||
-    obj2 === null ||
-    typeof obj1 !== 'object' ||
-    typeof obj2 !== 'object'
-  ) {
-    return false;
-  }
-
-  // Handle array comparison separately
-  if (Array.isArray(obj1) && Array.isArray(obj2)) {
-    return compareArrays(obj1, obj2);
-  }
-
-  // Ensure both objects have the same number of keys
-  const keys1 = Object.keys(obj1);
-  const keys2 = Object.keys(obj2);
-
-  if (keys1.length !== keys2.length) {
-    return false;
-  }
-
-  // Recursively check each key
-  for (const key of keys1) {
-    if (!(key in obj2)) {
-      return false;
-    }
-    // Recursive deep equal check
-    if (!deepEqual((obj1 as any)[key], (obj2 as any)[key])) {
-      return false;
-    }
-  }
-
-  return true;
-};
-
-/**
- * @param arr1 Array for comparison
- * @param arr2 Array for comparison
- * @returns True if, both the arrays are equal, else false
- */
-export const compareArrays = <T>(arr1: T[], arr2: T[]): boolean => {
-  if (arr1.length !== arr2.length) {
-    return false;
-  }
-
-  for (let i = 0; i < arr1.length; i++) {
-    if (!deepEqual(arr1[i], arr2[i])) {
-      return false;
-    }
-  }
-
-  return true;
-};
-
 /**
  *
  * @param dashboard dashboard for which filters to render
diff --git a/packages/manager/src/features/CloudPulse/Utils/FilterConfig.test.ts b/packages/manager/src/features/CloudPulse/Utils/FilterConfig.test.ts
new file mode 100644
index 00000000000..1075a85fd5b
--- /dev/null
+++ b/packages/manager/src/features/CloudPulse/Utils/FilterConfig.test.ts
@@ -0,0 +1,36 @@
+import {
+  getAssociatedEntityType,
+  getResourcesFilterConfig,
+} from './FilterConfig';
+
+describe('getResourcesFilterConfig', () => {
+  it('should return undefined if the dashboard id is not provided', () => {
+    expect(getResourcesFilterConfig(undefined)).toBeUndefined();
+  });
+
+  it('should return the resources filter configuration for the linode-firewalldashboard', () => {
+    const resourcesFilterConfig = getResourcesFilterConfig(4);
+    expect(resourcesFilterConfig).toBeDefined();
+    expect(resourcesFilterConfig?.associatedEntityType).toBe('linode');
+  });
+
+  it('should return the resources filter configuration for the nodebalancer-firewall dashboard', () => {
+    const resourcesFilterConfig = getResourcesFilterConfig(8);
+    expect(resourcesFilterConfig).toBeDefined();
+    expect(resourcesFilterConfig?.associatedEntityType).toBe('nodebalancer');
+  });
+});
+
+describe('getAssociatedEntityType', () => {
+  it('should return undefined if the dashboard id is not provided', () => {
+    expect(getAssociatedEntityType(undefined)).toBeUndefined();
+  });
+
+  it('should return the associated entity type for the linode-firewall dashboard', () => {
+    expect(getAssociatedEntityType(4)).toBe('linode');
+  });
+
+  it('should return the associated entity type for the nodebalancer-firewall dashboard', () => {
+    expect(getAssociatedEntityType(8)).toBe('nodebalancer');
+  });
+});
diff --git a/packages/manager/src/features/CloudPulse/Utils/FilterConfig.ts b/packages/manager/src/features/CloudPulse/Utils/FilterConfig.ts
index 30f8922d5c2..1d4c19a56e0 100644
--- a/packages/manager/src/features/CloudPulse/Utils/FilterConfig.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/FilterConfig.ts
@@ -13,6 +13,8 @@ import {
 import { CloudPulseAvailableViews, CloudPulseSelectTypes } from './models';
 import { filterKubernetesClusters } from './utils';
 
+import type { AssociatedEntityType } from '../shared/types';
+import type { CloudPulseServiceTypeFiltersConfiguration } from './models';
 import type { CloudPulseServiceTypeFilterMap } from './models';
 import type { KubernetesCluster } from '@linode/api-v4';
 
@@ -521,3 +523,33 @@ export const FILTER_CONFIG: Readonly<
   [8, FIREWALL_NODEBALANCER_CONFIG],
   [9, LKE_CONFIG],
 ]);
+
+/**
+ * @param dashboardId The id of the dashboard
+ * @returns The resources filter configuration for the dashboard
+ */
+export const getResourcesFilterConfig = (
+  dashboardId: number | undefined
+): CloudPulseServiceTypeFiltersConfiguration | undefined => {
+  if (!dashboardId) {
+    return undefined;
+  }
+  // Get the associated entity type for the dashboard
+  const filterConfig = FILTER_CONFIG.get(dashboardId);
+  return filterConfig?.filters.find(
+    (filter) => filter.configuration.filterKey === RESOURCE_ID
+  )?.configuration;
+};
+
+/**
+ * @param dashboardId The id of the dashboard
+ * @returns The associated entity type for the dashboard
+ */
+export const getAssociatedEntityType = (
+  dashboardId: number | undefined
+): AssociatedEntityType | undefined => {
+  if (!dashboardId) {
+    return undefined;
+  }
+  return FILTER_CONFIG.get(dashboardId)?.associatedEntityType;
+};
diff --git a/packages/manager/src/features/CloudPulse/Utils/utils.test.ts b/packages/manager/src/features/CloudPulse/Utils/utils.test.ts
index e2258ec14bd..dab6f0bea3f 100644
--- a/packages/manager/src/features/CloudPulse/Utils/utils.test.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/utils.test.ts
@@ -24,12 +24,11 @@ import {
 import {
   arePortsValid,
   areValidInterfaceIds,
+  arraysEqual,
   filterFirewallResources,
   filterKubernetesClusters,
-  getAssociatedEntityType,
   getEnabledServiceTypes,
   getFilteredDimensions,
-  getResourcesFilterConfig,
   isValidFilter,
   isValidPort,
   useIsAclpSupportedRegion,
@@ -352,38 +351,6 @@ describe('getEnabledServiceTypes', () => {
     expect(result).not.toContain('linode');
   });
 
-  describe('getResourcesFilterConfig', () => {
-    it('should return undefined if the dashboard id is not provided', () => {
-      expect(getResourcesFilterConfig(undefined)).toBeUndefined();
-    });
-
-    it('should return the resources filter configuration for the linode-firewalldashboard', () => {
-      const resourcesFilterConfig = getResourcesFilterConfig(4);
-      expect(resourcesFilterConfig).toBeDefined();
-      expect(resourcesFilterConfig?.associatedEntityType).toBe('linode');
-    });
-
-    it('should return the resources filter configuration for the nodebalancer-firewall dashboard', () => {
-      const resourcesFilterConfig = getResourcesFilterConfig(8);
-      expect(resourcesFilterConfig).toBeDefined();
-      expect(resourcesFilterConfig?.associatedEntityType).toBe('nodebalancer');
-    });
-  });
-
-  describe('getAssociatedEntityType', () => {
-    it('should return undefined if the dashboard id is not provided', () => {
-      expect(getAssociatedEntityType(undefined)).toBeUndefined();
-    });
-
-    it('should return the associated entity type for the linode-firewall dashboard', () => {
-      expect(getAssociatedEntityType(4)).toBe('linode');
-    });
-
-    it('should return the associated entity type for the nodebalancer-firewall dashboard', () => {
-      expect(getAssociatedEntityType(8)).toBe('nodebalancer');
-    });
-  });
-
   describe('filterFirewallResources', () => {
     it('should return the filtered firewall resources for linode', () => {
       const resources = [
@@ -718,3 +685,27 @@ describe('getFilteredDimensions', () => {
     expect(result).toEqual([]);
   });
 });
+
+describe('arraysEqual', () => {
+  it('should return true when both arrays are empty', () => {
+    expect(arraysEqual([], [])).toBe(true);
+  });
+  it('should return false when one array is empty and the other is not', () => {
+    expect(arraysEqual([], [1, 2, 3])).toBe(false);
+  });
+  it('should return true when arrays are undefined', () => {
+    expect(arraysEqual(undefined, undefined)).toBe(true);
+  });
+  it('should return false when one of the arrays is undefined', () => {
+    expect(arraysEqual(undefined, [1, 2, 3])).toBe(false);
+  });
+  it('should return true when arrays are equal', () => {
+    expect(arraysEqual([1, 2, 3], [1, 2, 3])).toBe(true);
+  });
+  it('should return false when arrays are not equal', () => {
+    expect(arraysEqual([1, 2, 3], [1, 2, 3, 4])).toBe(false);
+  });
+  it('should return true when arrays have same elements but in different order', () => {
+    expect(arraysEqual([1, 2, 3], [3, 2, 1])).toBe(true);
+  });
+});
diff --git a/packages/manager/src/features/CloudPulse/Utils/utils.ts b/packages/manager/src/features/CloudPulse/Utils/utils.ts
index 2c2f6481d44..5978318658b 100644
--- a/packages/manager/src/features/CloudPulse/Utils/utils.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/utils.ts
@@ -7,7 +7,6 @@ import { useFlags } from 'src/hooks/useFlags';
 
 import { valueFieldConfig } from '../Alerts/CreateAlert/Criteria/DimensionFilterValue/constants';
 import { getOperatorGroup } from '../Alerts/CreateAlert/Criteria/DimensionFilterValue/utils';
-import { arraysEqual } from '../Alerts/Utils/utils';
 import {
   INTERFACE_ID,
   INTERFACE_IDS_CONSECUTIVE_COMMAS_ERROR_MESSAGE,
@@ -21,14 +20,11 @@ import {
   PORTS_LEADING_ZERO_ERROR_MESSAGE,
   PORTS_LIMIT_ERROR_MESSAGE,
   PORTS_RANGE_ERROR_MESSAGE,
-  RESOURCE_ID,
 } from './constants';
-import { FILTER_CONFIG } from './FilterConfig';
 
 import type { FetchOptions } from '../Alerts/CreateAlert/Criteria/DimensionFilterValue/constants';
 import type { AssociatedEntityType } from '../shared/types';
 import type { MetricsDimensionFilter } from '../Widget/components/DimensionFilters/types';
-import type { CloudPulseServiceTypeFiltersConfiguration } from './models';
 import type {
   Alert,
   APIError,
@@ -534,36 +530,6 @@ export const getFilteredDimensions = (
     : [];
 };
 
-/**
- * @param dashboardId The id of the dashboard
- * @returns The resources filter configuration for the dashboard
- */
-export const getResourcesFilterConfig = (
-  dashboardId: number | undefined
-): CloudPulseServiceTypeFiltersConfiguration | undefined => {
-  if (!dashboardId) {
-    return undefined;
-  }
-  // Get the associated entity type for the dashboard
-  const filterConfig = FILTER_CONFIG.get(dashboardId);
-  return filterConfig?.filters.find(
-    (filter) => filter.configuration.filterKey === RESOURCE_ID
-  )?.configuration;
-};
-
-/**
- * @param dashboardId The id of the dashboard
- * @returns The associated entity type for the dashboard
- */
-export const getAssociatedEntityType = (
-  dashboardId: number | undefined
-): AssociatedEntityType | undefined => {
-  if (!dashboardId) {
-    return undefined;
-  }
-  return FILTER_CONFIG.get(dashboardId)?.associatedEntityType;
-};
-
 /**
  *
  * @param resources Firewall resources
@@ -600,3 +566,89 @@ export const filterKubernetesClusters = (
     .filter(({ tier }) => tier === 'enterprise')
     .sort((a, b) => a.label.localeCompare(b.label));
 };
+
+/**
+ * @param obj1 The first object to be compared
+ * @param obj2 The second object to be compared
+ * @returns True if, both are equal else false
+ */
+export const deepEqual = <T>(obj1: T, obj2: T): boolean => {
+  if (obj1 === obj2) {
+    return true; // Identical references or values
+  }
+
+  // If either is null or undefined, or they are not of object type, return false
+  if (
+    obj1 === null ||
+    obj2 === null ||
+    typeof obj1 !== 'object' ||
+    typeof obj2 !== 'object'
+  ) {
+    return false;
+  }
+
+  // Handle array comparison separately
+  if (Array.isArray(obj1) && Array.isArray(obj2)) {
+    return compareArrays(obj1, obj2);
+  }
+
+  // Ensure both objects have the same number of keys
+  const keys1 = Object.keys(obj1);
+  const keys2 = Object.keys(obj2);
+
+  if (keys1.length !== keys2.length) {
+    return false;
+  }
+
+  // Recursively check each key
+  for (const key of keys1) {
+    if (!(key in obj2)) {
+      return false;
+    }
+    // Recursive deep equal check
+    if (!deepEqual((obj1 as any)[key], (obj2 as any)[key])) {
+      return false;
+    }
+  }
+
+  return true;
+};
+
+/**
+ * @param arr1 Array for comparison
+ * @param arr2 Array for comparison
+ * @returns True if, both the arrays are equal, else false
+ */
+export const compareArrays = <T>(arr1: T[], arr2: T[]): boolean => {
+  if (arr1.length !== arr2.length) {
+    return false;
+  }
+
+  for (let i = 0; i < arr1.length; i++) {
+    if (!deepEqual(arr1[i], arr2[i])) {
+      return false;
+    }
+  }
+
+  return true;
+};
+
+/**
+ * Checks if two arrays are equal, ignores the order of the elements
+ * @param a The first array
+ * @param b The second array
+ * @returns True if the arrays are equal, false otherwise
+ */
+export const arraysEqual = (
+  a: number[] | undefined,
+  b: number[] | undefined
+) => {
+  if (a === undefined && b === undefined) return true;
+  if (a === undefined || b === undefined) return false;
+  if (a.length !== b.length) return false;
+
+  return compareArrays(
+    [...a].sort((x, y) => x - y),
+    [...b].sort((x, y) => x - y)
+  );
+};
diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseEndpointsSelect.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseEndpointsSelect.tsx
index a0578ea08b3..382ed64eb92 100644
--- a/packages/manager/src/features/CloudPulse/shared/CloudPulseEndpointsSelect.tsx
+++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseEndpointsSelect.tsx
@@ -5,7 +5,8 @@ import React, { useMemo } from 'react';
 import { useResourcesQuery } from 'src/queries/cloudpulse/resources';
 
 import { RESOURCE_FILTER_MAP } from '../Utils/constants';
-import { deepEqual, filterEndpointsUsingRegion } from '../Utils/FilterBuilder';
+import { filterEndpointsUsingRegion } from '../Utils/FilterBuilder';
+import { deepEqual } from '../Utils/utils';
 import { CLOUD_PULSE_TEXT_FIELD_PROPS } from './styles';
 
 import type {
diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseFirewallNodebalancersSelect.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseFirewallNodebalancersSelect.tsx
index 0833c8d4d92..6c19faebee9 100644
--- a/packages/manager/src/features/CloudPulse/shared/CloudPulseFirewallNodebalancersSelect.tsx
+++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseFirewallNodebalancersSelect.tsx
@@ -6,8 +6,9 @@ import React from 'react';
 import { useResourcesQuery } from 'src/queries/cloudpulse/resources';
 
 import { PARENT_ENTITY_REGION, RESOURCE_FILTER_MAP } from '../Utils/constants';
-import { deepEqual, filterFirewallNodebalancers } from '../Utils/FilterBuilder';
-import { getAssociatedEntityType } from '../Utils/utils';
+import { filterFirewallNodebalancers } from '../Utils/FilterBuilder';
+import { getAssociatedEntityType } from '../Utils/FilterConfig';
+import { deepEqual } from '../Utils/utils';
 import { CLOUD_PULSE_TEXT_FIELD_PROPS } from './styles';
 
 import type { CloudPulseMetricsFilter } from '../Dashboard/CloudPulseDashboardLanding';
diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseRegionSelect.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseRegionSelect.tsx
index 5b385bd2c2f..6dd24061ec6 100644
--- a/packages/manager/src/features/CloudPulse/shared/CloudPulseRegionSelect.tsx
+++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseRegionSelect.tsx
@@ -12,9 +12,9 @@ import {
   PARENT_ENTITY_REGION,
   RESOURCE_FILTER_MAP,
 } from '../Utils/constants';
-import { deepEqual, filterUsingDependentFilters } from '../Utils/FilterBuilder';
-import { FILTER_CONFIG } from '../Utils/FilterConfig';
-import { getResourcesFilterConfig } from '../Utils/utils';
+import { filterUsingDependentFilters } from '../Utils/FilterBuilder';
+import { FILTER_CONFIG, getResourcesFilterConfig } from '../Utils/FilterConfig';
+import { deepEqual } from '../Utils/utils';
 import { CLOUD_PULSE_TEXT_FIELD_PROPS } from './styles';
 
 import type { CloudPulseMetricsFilter } from '../Dashboard/CloudPulseDashboardLanding';
diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx
index 13c07000735..c38398e5f3a 100644
--- a/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx
+++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx
@@ -6,7 +6,8 @@ import { useFlags } from 'src/hooks/useFlags';
 import { useResourcesQuery } from 'src/queries/cloudpulse/resources';
 
 import { RESOURCE_FILTER_MAP } from '../Utils/constants';
-import { deepEqual, filterUsingDependentFilters } from '../Utils/FilterBuilder';
+import { filterUsingDependentFilters } from '../Utils/FilterBuilder';
+import { deepEqual } from '../Utils/utils';
 import { CLOUD_PULSE_TEXT_FIELD_PROPS } from './styles';
 
 import type { CloudPulseMetricsFilter } from '../Dashboard/CloudPulseDashboardLanding';
diff --git a/packages/manager/src/features/Kubernetes/kubeUtils.test.ts b/packages/manager/src/features/Kubernetes/kubeUtils.test.ts
index ae1512add65..a3a7fcc59f2 100644
--- a/packages/manager/src/features/Kubernetes/kubeUtils.test.ts
+++ b/packages/manager/src/features/Kubernetes/kubeUtils.test.ts
@@ -3,6 +3,7 @@ import { renderHook } from '@testing-library/react';
 
 import { kubeLinodeFactory, nodePoolFactory } from 'src/factories';
 import { extendType } from 'src/utilities/extendType';
+import { wrapWithTheme } from 'src/utilities/testHelpers';
 
 import {
   compareByKubernetesVersion,
@@ -22,12 +23,11 @@ const queryMocks = vi.hoisted(() => ({
   useAccount: vi.fn().mockReturnValue({}),
   useGrants: vi.fn().mockReturnValue({}),
   useAccountBetaQuery: vi.fn().mockReturnValue({}),
-  useFlags: vi.fn().mockReturnValue({}),
   useKubernetesTieredVersionsQuery: vi.fn().mockReturnValue({}),
 }));
 
-vi.mock('@linode/queries', () => {
-  const actual = vi.importActual('@linode/queries');
+vi.mock('@linode/queries', async () => {
+  const actual = await vi.importActual('@linode/queries');
   return {
     ...actual,
     useAccount: queryMocks.useAccount,
@@ -36,14 +36,6 @@ vi.mock('@linode/queries', () => {
   };
 });
 
-vi.mock('src/hooks/useFlags', () => {
-  const actual = vi.importActual('src/hooks/useFlags');
-  return {
-    ...actual,
-    useFlags: queryMocks.useFlags,
-  };
-});
-
 vi.mock('src/queries/kubernetes', () => {
   const actual = vi.importActual('src/queries/kubernetes');
   return {
@@ -225,11 +217,10 @@ describe('helper functions', () => {
       queryMocks.useAccountBetaQuery.mockReturnValue({
         data: accountBeta,
       });
-      queryMocks.useFlags.mockReturnValue({
-        apl: true,
-      });
 
-      const { result } = renderHook(() => useAPLAvailability());
+      const { result } = renderHook(() => useAPLAvailability(), {
+        wrapper: (ui) => wrapWithTheme(ui, { flags: { apl: true } }),
+      });
       expect(result.current.showAPL).toBe(true);
     });
   });
@@ -352,17 +343,21 @@ describe('hooks', () => {
           capabilities: [],
         },
       });
-      queryMocks.useFlags.mockReturnValue({
-        lkeEnterprise2: {
-          enabled: true,
-          ga: true,
-          la: true,
-          phase2Mtc: { byoVPC: true, dualStack: true },
-          postLa: true,
-        },
-      });
 
-      const { result } = renderHook(() => useIsLkeEnterpriseEnabled());
+      const { result } = renderHook(() => useIsLkeEnterpriseEnabled(), {
+        wrapper: (ui) =>
+          wrapWithTheme(ui, {
+            flags: {
+              lkeEnterprise2: {
+                enabled: true,
+                ga: true,
+                la: true,
+                phase2Mtc: { byoVPC: true, dualStack: true },
+                postLa: true,
+              },
+            },
+          }),
+      });
       expect(result.current).toStrictEqual({
         isLkeEnterpriseGAFeatureEnabled: false,
         isLkeEnterpriseGAFlagEnabled: true,
@@ -380,17 +375,21 @@ describe('hooks', () => {
           capabilities: ['Kubernetes Enterprise'],
         },
       });
-      queryMocks.useFlags.mockReturnValue({
-        lkeEnterprise2: {
-          enabled: true,
-          ga: false,
-          la: true,
-          phase2Mtc: { byoVPC: false, dualStack: false },
-          postLa: false,
-        },
-      });
 
-      const { result } = renderHook(() => useIsLkeEnterpriseEnabled());
+      const { result } = renderHook(() => useIsLkeEnterpriseEnabled(), {
+        wrapper: (ui) =>
+          wrapWithTheme(ui, {
+            flags: {
+              lkeEnterprise2: {
+                enabled: true,
+                ga: false,
+                la: true,
+                phase2Mtc: { byoVPC: false, dualStack: false },
+                postLa: false,
+              },
+            },
+          }),
+      });
       expect(result.current).toStrictEqual({
         isLkeEnterpriseGAFeatureEnabled: false,
         isLkeEnterpriseGAFlagEnabled: false,
@@ -412,17 +411,21 @@ describe('hooks', () => {
           ],
         },
       });
-      queryMocks.useFlags.mockReturnValue({
-        lkeEnterprise2: {
-          enabled: true,
-          ga: false,
-          la: true,
-          phase2Mtc: { byoVPC: true, dualStack: true },
-          postLa: false,
-        },
-      });
 
-      const { result } = renderHook(() => useIsLkeEnterpriseEnabled());
+      const { result } = renderHook(() => useIsLkeEnterpriseEnabled(), {
+        wrapper: (ui) =>
+          wrapWithTheme(ui, {
+            flags: {
+              lkeEnterprise2: {
+                enabled: true,
+                ga: false,
+                la: true,
+                phase2Mtc: { byoVPC: true, dualStack: true },
+                postLa: false,
+              },
+            },
+          }),
+      });
       expect(result.current).toStrictEqual({
         isLkeEnterpriseGAFeatureEnabled: false,
         isLkeEnterpriseGAFlagEnabled: false,
@@ -440,17 +443,20 @@ describe('hooks', () => {
           capabilities: ['Kubernetes Enterprise'],
         },
       });
-      queryMocks.useFlags.mockReturnValue({
-        lkeEnterprise2: {
-          enabled: true,
-          ga: false,
-          la: true,
-          phase2Mtc: { byoVPC: true, dualStack: true },
-          postLa: false,
-        },
+      const { result } = renderHook(() => useIsLkeEnterpriseEnabled(), {
+        wrapper: (ui) =>
+          wrapWithTheme(ui, {
+            flags: {
+              lkeEnterprise2: {
+                enabled: true,
+                ga: false,
+                la: true,
+                phase2Mtc: { byoVPC: true, dualStack: true },
+                postLa: false,
+              },
+            },
+          }),
       });
-
-      const { result } = renderHook(() => useIsLkeEnterpriseEnabled());
       expect(result.current).toStrictEqual({
         isLkeEnterpriseGAFeatureEnabled: false,
         isLkeEnterpriseGAFlagEnabled: false,
@@ -472,17 +478,21 @@ describe('hooks', () => {
           ],
         },
       });
-      queryMocks.useFlags.mockReturnValue({
-        lkeEnterprise2: {
-          enabled: true,
-          ga: true,
-          la: true,
-          phase2Mtc: { byoVPC: true, dualStack: true },
-          postLa: true,
-        },
-      });
 
-      const { result } = renderHook(() => useIsLkeEnterpriseEnabled());
+      const { result } = renderHook(() => useIsLkeEnterpriseEnabled(), {
+        wrapper: (ui) =>
+          wrapWithTheme(ui, {
+            flags: {
+              lkeEnterprise2: {
+                enabled: true,
+                ga: true,
+                la: true,
+                phase2Mtc: { byoVPC: true, dualStack: true },
+                postLa: true,
+              },
+            },
+          }),
+      });
       expect(result.current).toStrictEqual({
         isLkeEnterpriseGAFeatureEnabled: true,
         isLkeEnterpriseGAFlagEnabled: true,
diff --git a/packages/manager/src/features/PlacementGroups/utils.test.ts b/packages/manager/src/features/PlacementGroups/utils.test.ts
index c83ba1a4698..d66d4ced090 100644
--- a/packages/manager/src/features/PlacementGroups/utils.test.ts
+++ b/packages/manager/src/features/PlacementGroups/utils.test.ts
@@ -15,25 +15,16 @@ import {
 
 const queryMocks = vi.hoisted(() => ({
   useAccount: vi.fn().mockReturnValue({}),
-  useFlags: vi.fn().mockReturnValue({}),
 }));
 
-vi.mock('@linode/queries', () => {
-  const actual = vi.importActual('@linode/queries');
+vi.mock('@linode/queries', async () => {
+  const actual = await vi.importActual('@linode/queries');
   return {
     ...actual,
     useAccount: queryMocks.useAccount,
   };
 });
 
-vi.mock('src/hooks/useFlags', () => {
-  const actual = vi.importActual('src/hooks/useFlags');
-  return {
-    ...actual,
-    useFlags: queryMocks.useFlags,
-  };
-});
-
 const initialLinodeData = [
   {
     is_compliant: true,
@@ -228,11 +219,6 @@ describe('useIsPlacementGroupsEnabled', () => {
   });
 
   it('returns false if the account does not have the Placement Group capability', () => {
-    queryMocks.useFlags.mockReturnValue({
-      placementGroups: {
-        enabled: true,
-      },
-    });
     queryMocks.useAccount.mockReturnValue({
       data: {
         capabilities: [],
diff --git a/packages/manager/src/features/PlacementGroups/utils.ts b/packages/manager/src/features/PlacementGroups/utils.ts
index 0f951a04cf1..4980ae8a967 100644
--- a/packages/manager/src/features/PlacementGroups/utils.ts
+++ b/packages/manager/src/features/PlacementGroups/utils.ts
@@ -1,8 +1,6 @@
 import { PLACEMENT_GROUP_TYPES } from '@linode/api-v4/lib/placement-groups';
 import { useAccount } from '@linode/queries';
 
-import { useFlags } from 'src/hooks/useFlags';
-
 import type {
   CreatePlacementGroupPayload,
   Linode,
@@ -125,12 +123,7 @@ export const getLinodesFromAllPlacementGroups = (
 export const useIsPlacementGroupsEnabled = (): {
   isPlacementGroupsEnabled: boolean;
 } => {
-  const { data: account, error } = useAccount();
-  const flags = useFlags();
-
-  if (error || !flags) {
-    return { isPlacementGroupsEnabled: false };
-  }
+  const { data: account } = useAccount();
 
   const isPlacementGroupsEnabled = Boolean(
     account?.capabilities?.includes('Placement Group')
diff --git a/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.test.tsx b/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.test.tsx
index c1a01cda5af..53e3f848a36 100644
--- a/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.test.tsx
+++ b/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.test.tsx
@@ -57,6 +57,7 @@ describe('Create API Token Drawer', () => {
 
   it(
     'Should see secret modal with secret when you type a label and submit the form successfully',
+    { timeout: 15000 },
     async () => {
       server.use(
         http.post('*/profile/tokens', () => {
@@ -85,8 +86,7 @@ describe('Create API Token Drawer', () => {
       await waitFor(() =>
         expect(props.showSecret).toBeCalledWith('secret-value')
       );
-    },
-    { timeout: 15000 }
+    }
   );
 
   it('Should default to no selection for all scopes', () => {
diff --git a/packages/manager/src/features/VPCs/VPCDetail/VPCSubnetsTable.test.tsx b/packages/manager/src/features/VPCs/VPCDetail/VPCSubnetsTable.test.tsx
index 27781782729..cb3cefbb795 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/VPCSubnetsTable.test.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/VPCSubnetsTable.test.tsx
@@ -269,6 +269,7 @@ describe('VPC Subnets table', () => {
 
   it(
     'should show Nodebalancer table head data when table is expanded',
+    { timeout: 15_000 },
     async () => {
       const subnet = subnetFactory.build();
 
@@ -293,8 +294,7 @@ describe('VPC Subnets table', () => {
       await findByText('NodeBalancer');
       await findByText('Backend Status');
       await findByText('VPC IPv4 Range');
-    },
-    { timeout: 15_000 }
+    }
   );
 
   it('should disable "Create Subnet" button when user does not have create_vpc_subnet permission', async () => {
diff --git a/packages/manager/src/features/components/PlansPanel/utils.test.ts b/packages/manager/src/features/components/PlansPanel/utils.test.ts
index 13f7e2fdb8b..cbbd57b504e 100644
--- a/packages/manager/src/features/components/PlansPanel/utils.test.ts
+++ b/packages/manager/src/features/components/PlansPanel/utils.test.ts
@@ -3,6 +3,7 @@ import { renderHook } from '@testing-library/react';
 
 import { extendedTypes } from 'src/__data__/ExtendedType';
 import { planSelectionTypeFactory, typeFactory } from 'src/factories/types';
+import { wrapWithTheme } from 'src/utilities/testHelpers';
 
 import { PLAN_IS_CURRENTLY_UNAVAILABLE_COPY } from './constants';
 import {
@@ -20,25 +21,16 @@ import type { PlanSelectionType } from './types';
 
 const queryMocks = vi.hoisted(() => ({
   useAccount: vi.fn().mockReturnValue({}),
-  useFlags: vi.fn().mockReturnValue({}),
 }));
 
-vi.mock('@linode/queries', () => {
-  const actual = vi.importActual('@linode/queries');
+vi.mock('@linode/queries', async () => {
+  const actual = await vi.importActual('@linode/queries');
   return {
     ...actual,
     useAccount: queryMocks.useAccount,
   };
 });
 
-vi.mock('src/hooks/useFlags', () => {
-  const actual = vi.importActual('src/hooks/useFlags');
-  return {
-    ...actual,
-    useFlags: queryMocks.useFlags,
-  };
-});
-
 const standard = typeFactory.build({ class: 'standard', id: 'g6-standard-1' });
 const metal = typeFactory.build({ class: 'metal', id: 'g6-metal-alpha-2' });
 const dedicated = typeFactory.build({
@@ -563,14 +555,18 @@ describe('useIsAcceleratedPlansEnabled', () => {
         capabilities: [],
       },
     });
-    queryMocks.useFlags.mockReturnValue({
-      acceleratedPlans: {
-        linodePlans: false,
-        lkePlans: false,
-      },
-    });
 
-    const { result } = renderHook(() => useIsAcceleratedPlansEnabled());
+    const { result } = renderHook(() => useIsAcceleratedPlansEnabled(), {
+      wrapper: (ui) =>
+        wrapWithTheme(ui, {
+          flags: {
+            acceleratedPlans: {
+              linodePlans: false,
+              lkePlans: false,
+            },
+          },
+        }),
+    });
     expect(result.current).toStrictEqual({
       isAcceleratedLKEPlansEnabled: false,
       isAcceleratedLinodePlansEnabled: false,
@@ -583,14 +579,18 @@ describe('useIsAcceleratedPlansEnabled', () => {
         capabilities: [],
       },
     });
-    queryMocks.useFlags.mockReturnValue({
-      acceleratedPlans: {
-        linodePlans: true,
-        lkePlans: true,
-      },
-    });
 
-    const { result } = renderHook(() => useIsAcceleratedPlansEnabled());
+    const { result } = renderHook(() => useIsAcceleratedPlansEnabled(), {
+      wrapper: (ui) =>
+        wrapWithTheme(ui, {
+          flags: {
+            acceleratedPlans: {
+              linodePlans: true,
+              lkePlans: true,
+            },
+          },
+        }),
+    });
     expect(result.current).toStrictEqual({
       isAcceleratedLKEPlansEnabled: false,
       isAcceleratedLinodePlansEnabled: false,
@@ -603,14 +603,18 @@ describe('useIsAcceleratedPlansEnabled', () => {
         capabilities: ['NETINT Quadra T1U'],
       },
     });
-    queryMocks.useFlags.mockReturnValue({
-      acceleratedPlans: {
-        linodePlans: false,
-        lkePlans: false,
-      },
-    });
 
-    const { result } = renderHook(() => useIsAcceleratedPlansEnabled());
+    const { result } = renderHook(() => useIsAcceleratedPlansEnabled(), {
+      wrapper: (ui) =>
+        wrapWithTheme(ui, {
+          flags: {
+            acceleratedPlans: {
+              linodePlans: false,
+              lkePlans: false,
+            },
+          },
+        }),
+    });
     expect(result.current).toStrictEqual({
       isAcceleratedLKEPlansEnabled: false,
       isAcceleratedLinodePlansEnabled: false,
@@ -623,14 +627,18 @@ describe('useIsAcceleratedPlansEnabled', () => {
         capabilities: ['NETINT Quadra T1U'],
       },
     });
-    queryMocks.useFlags.mockReturnValue({
-      acceleratedPlans: {
-        linodePlans: true,
-        lkePlans: true,
-      },
-    });
 
-    const { result } = renderHook(() => useIsAcceleratedPlansEnabled());
+    const { result } = renderHook(() => useIsAcceleratedPlansEnabled(), {
+      wrapper: (ui) =>
+        wrapWithTheme(ui, {
+          flags: {
+            acceleratedPlans: {
+              linodePlans: true,
+              lkePlans: true,
+            },
+          },
+        }),
+    });
     expect(result.current).toStrictEqual({
       isAcceleratedLKEPlansEnabled: true,
       isAcceleratedLinodePlansEnabled: true,
@@ -644,14 +652,18 @@ describe('useIsAcceleratedPlansEnabled', () => {
         capabilities: ['NETINT Quadra T1U'],
       },
     });
-    queryMocks.useFlags.mockReturnValue({
-      acceleratedPlans: {
-        linodePlans: true,
-        lkePlans: false,
-      },
-    });
 
-    const { result } = renderHook(() => useIsAcceleratedPlansEnabled());
+    const { result } = renderHook(() => useIsAcceleratedPlansEnabled(), {
+      wrapper: (ui) =>
+        wrapWithTheme(ui, {
+          flags: {
+            acceleratedPlans: {
+              linodePlans: true,
+              lkePlans: false,
+            },
+          },
+        }),
+    });
     expect(result.current).toStrictEqual({
       isAcceleratedLKEPlansEnabled: false,
       isAcceleratedLinodePlansEnabled: true,
diff --git a/packages/manager/src/utilities/analytics/utils.test.ts b/packages/manager/src/utilities/analytics/utils.test.ts
index d2ec1e9b138..916d16855f4 100644
--- a/packages/manager/src/utilities/analytics/utils.test.ts
+++ b/packages/manager/src/utilities/analytics/utils.test.ts
@@ -120,13 +120,13 @@ describe('waitForAdobeAnalyticsToBeLoaded', () => {
 
   it(
     'should reject if adobe is not defined after 5 seconds',
+    { timeout: 7000 },
     () => {
       vi.stubGlobal('_satellite', undefined);
       expect(waitForAdobeAnalyticsToBeLoaded()).rejects.toThrow(
         'Adobe Analytics did not load after 5 seconds'
       );
-    },
-    { timeout: 7000 }
+    }
   );
 });
 
diff --git a/packages/manager/vite.config.ts b/packages/manager/vite.config.ts
index da562e52401..e09e6b07809 100644
--- a/packages/manager/vite.config.ts
+++ b/packages/manager/vite.config.ts
@@ -28,6 +28,7 @@ export default defineConfig({
     port: 3000,
   },
   test: {
+    include: ['**/*.test.{js,jsx,ts,tsx}'],
     coverage: {
       exclude: [
         'src/**/*.constants.{js,jsx,ts,tsx}',
@@ -44,7 +45,6 @@ export default defineConfig({
     },
     environment: 'jsdom',
     globals: true,
-    pool: 'forks',
     setupFiles: './src/testSetup.ts',
   },
 });
diff --git a/packages/search/vitest.config.ts b/packages/search/vitest.config.ts
new file mode 100644
index 00000000000..94ede10e225
--- /dev/null
+++ b/packages/search/vitest.config.ts
@@ -0,0 +1,3 @@
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({});
diff --git a/packages/utilities/.changeset/pr-13119-tech-stories-1764007518381.md b/packages/utilities/.changeset/pr-13119-tech-stories-1764007518381.md
new file mode 100644
index 00000000000..00ff19841a8
--- /dev/null
+++ b/packages/utilities/.changeset/pr-13119-tech-stories-1764007518381.md
@@ -0,0 +1,5 @@
+---
+"@linode/utilities": Tech Stories
+---
+
+Update `scrollErrorIntoViewV2.test.tsx‎` to not mock  MutationObserver` ([#13119](https://github.com/linode/manager/pull/13119))
diff --git a/packages/utilities/src/helpers/scrollErrorIntoViewV2.test.tsx b/packages/utilities/src/helpers/scrollErrorIntoViewV2.test.tsx
index d0e875c1a58..1259601381b 100644
--- a/packages/utilities/src/helpers/scrollErrorIntoViewV2.test.tsx
+++ b/packages/utilities/src/helpers/scrollErrorIntoViewV2.test.tsx
@@ -1,47 +1,32 @@
+import { waitFor } from '@testing-library/react';
 import { describe, expect, it, vi } from 'vitest';
 
 import { scrollErrorIntoViewV2 } from './scrollErrorIntoViewV2';
 
-import type { Mock } from 'vitest';
-
 describe('scrollErrorIntoViewV2', () => {
-  it('should scroll to the error element when it exists', () => {
+  it('should scroll to the error element when it exists', async () => {
     window.HTMLElement.prototype.scrollIntoView = vi.fn();
 
     const errorElement = document.createElement('div');
     errorElement.classList.add('error-for-scroll');
     const formContainer = document.createElement('div');
-    formContainer.appendChild(errorElement);
 
     const formContainerRef = {
       current: formContainer,
     };
 
-    const observeMock = vi.fn();
-    const disconnectMock = vi.fn();
-    const takeRecords = vi.fn();
-    window.MutationObserver = vi.fn(() => ({
-      disconnect: disconnectMock,
-      observe: observeMock,
-      takeRecords,
-    }));
-
     scrollErrorIntoViewV2(formContainerRef);
 
-    expect(observeMock).toHaveBeenCalledWith(formContainer, {
-      attributes: true,
-      childList: true,
-      subtree: true,
-    });
+    expect(errorElement.scrollIntoView).not.toHaveBeenCalled();
 
-    const mutationCallback = (window.MutationObserver as Mock).mock.calls[0][0];
-    mutationCallback([{ target: formContainer, type: 'childList' }]);
+    formContainer.appendChild(errorElement);
 
-    expect(errorElement.scrollIntoView).toHaveBeenCalledWith({
-      behavior: 'smooth',
-      block: 'center',
-      inline: 'nearest',
+    await waitFor(() => {
+      expect(errorElement.scrollIntoView).toHaveBeenCalledWith({
+        behavior: 'smooth',
+        block: 'center',
+        inline: 'nearest',
+      });
     });
-    expect(disconnectMock).toHaveBeenCalled();
   });
 });
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e99605e90e6..2002db8f2e2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -28,8 +28,8 @@ importers:
         specifier: ^8.38.0
         version: 8.38.0(eslint@9.31.0(jiti@2.4.2))(typescript@5.7.3)
       '@vitest/ui':
-        specifier: ^3.2.4
-        version: 3.2.4(vitest@3.2.4)
+        specifier: ^4.0.10
+        version: 4.0.10(vitest@4.0.10)
       concurrently:
         specifier: 9.1.0
         version: 9.1.0
@@ -85,8 +85,8 @@ importers:
         specifier: ^8.29.0
         version: 8.29.0(eslint@9.31.0(jiti@2.4.2))(typescript@5.7.3)
       vitest:
-        specifier: ^3.2.4
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.1)(@vitest/ui@3.2.4)(jiti@2.4.2)(jsdom@24.1.3)(msw@2.6.5(@types/node@22.18.1)(typescript@5.7.3))(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+        specifier: ^4.0.10
+        version: 4.0.10(@types/debug@4.1.12)(@types/node@22.18.1)(@vitest/ui@4.0.10)(jiti@2.4.2)(jsdom@24.1.3)(msw@2.6.5(@types/node@22.18.1)(typescript@5.7.3))(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
 
   packages/api-v4:
     dependencies:
@@ -106,6 +106,9 @@ importers:
       '@linode/tsconfig':
         specifier: workspace:*
         version: link:../tsconfig
+      '@types/node':
+        specifier: ^22.13.14
+        version: 22.18.1
       axios-mock-adapter:
         specifier: ^1.22.0
         version: 1.22.0(axios@1.12.0)
@@ -358,7 +361,7 @@ importers:
         version: 9.0.12(@types/react@19.1.6)(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))
       '@storybook/react-vite':
         specifier: ^9.0.12
-        version: 9.0.12(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(rollup@4.50.1)(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(typescript@5.7.3)(vite@7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
+        version: 9.0.12(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(rollup@4.53.3)(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(typescript@5.7.3)(vite@7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
       '@swc/core':
         specifier: ^1.10.9
         version: 1.10.11
@@ -442,10 +445,10 @@ importers:
         version: 4.4.5
       '@vitejs/plugin-react-swc':
         specifier: ^4.0.1
-        version: 4.0.1(vite@7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
+        version: 4.0.1(vite@7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
       '@vitest/coverage-v8':
         specifier: ^3.2.4
-        version: 3.2.4(vitest@3.2.4)
+        version: 3.2.4(vitest@4.0.10)
       '@vueless/storybook-dark-mode':
         specifier: ^9.0.5
         version: 9.0.5(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
@@ -454,7 +457,7 @@ importers:
         version: 4.10.2
       chai-string:
         specifier: ^1.5.0
-        version: 1.5.0(chai@5.2.0)
+        version: 1.5.0(chai@6.2.1)
       concurrently:
         specifier: ^9.1.0
         version: 9.1.0
@@ -484,7 +487,7 @@ importers:
         version: 1.14.0(cypress@15.4.0)
       cypress-vite:
         specifier: ^1.8.0
-        version: 1.8.0(vite@7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
+        version: 1.8.0(vite@7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
       dotenv:
         specifier: ^16.0.3
         version: 16.4.5
@@ -519,11 +522,11 @@ importers:
         specifier: ^9.0.12
         version: 9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3)
       vite:
-        specifier: ^7.1.11
-        version: 7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+        specifier: ^7.2.2
+        version: 7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
       vite-plugin-svgr:
         specifier: ^4.5.0
-        version: 4.5.0(rollup@4.50.1)(typescript@5.7.3)(vite@7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
+        version: 4.5.0(rollup@4.53.3)(typescript@5.7.3)(vite@7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
 
   packages/queries:
     dependencies:
@@ -575,7 +578,7 @@ importers:
         version: 4.2.0
       vite:
         specifier: '*'
-        version: 7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+        version: 7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
     devDependencies:
       '@linode/tsconfig':
         specifier: workspace:*
@@ -607,7 +610,7 @@ importers:
         version: link:../tsconfig
       '@storybook/react-vite':
         specifier: ^9.0.12
-        version: 9.0.12(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(rollup@4.50.1)(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(typescript@5.7.3)(vite@7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
+        version: 9.0.12(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(rollup@4.53.3)(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(typescript@5.7.3)(vite@7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
       '@testing-library/dom':
         specifier: ^10.1.0
         version: 10.4.0
@@ -631,7 +634,7 @@ importers:
         version: 9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3)
       vite-plugin-svgr:
         specifier: ^4.5.0
-        version: 4.5.0(rollup@4.50.1)(typescript@5.7.3)(vite@7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
+        version: 4.5.0(rollup@4.53.3)(typescript@5.7.3)(vite@7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
 
   packages/tsconfig: {}
 
@@ -676,7 +679,7 @@ importers:
         version: link:../tsconfig
       '@storybook/react-vite':
         specifier: ^9.0.12
-        version: 9.0.12(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(rollup@4.50.1)(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(typescript@5.7.3)(vite@7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
+        version: 9.0.12(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(rollup@4.53.3)(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(typescript@5.7.3)(vite@7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
       '@testing-library/dom':
         specifier: ^10.1.0
         version: 10.4.0
@@ -703,7 +706,7 @@ importers:
         version: 9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3)
       vite-plugin-svgr:
         specifier: ^4.5.0
-        version: 4.5.0(rollup@4.50.1)(typescript@5.7.3)(vite@7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
+        version: 4.5.0(rollup@4.53.3)(typescript@5.7.3)(vite@7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
 
   packages/utilities:
     dependencies:
@@ -1059,28 +1062,34 @@ packages:
   '@emotion/weak-memoize@0.4.0':
     resolution: {integrity: sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==}
 
-  '@esbuild/aix-ppc64@0.25.3':
-    resolution: {integrity: sha512-W8bFfPA8DowP8l//sxjJLSLkD8iEjMc7cBVyP+u4cEv9sM7mdUCkgsj+t0n/BWPFtv7WWCN5Yzj0N6FJNUUqBQ==}
+  '@esbuild/aix-ppc64@0.25.12':
+    resolution: {integrity: sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [aix]
 
-  '@esbuild/aix-ppc64@0.25.9':
-    resolution: {integrity: sha512-OaGtL73Jck6pBKjNIe24BnFE6agGl+6KxDtTfHhy1HmhthfKouEcOhqpSL64K4/0WCtbKFLOdzD/44cJ4k9opA==}
+  '@esbuild/aix-ppc64@0.25.3':
+    resolution: {integrity: sha512-W8bFfPA8DowP8l//sxjJLSLkD8iEjMc7cBVyP+u4cEv9sM7mdUCkgsj+t0n/BWPFtv7WWCN5Yzj0N6FJNUUqBQ==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [aix]
 
+  '@esbuild/android-arm64@0.25.12':
+    resolution: {integrity: sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [android]
+
   '@esbuild/android-arm64@0.25.3':
     resolution: {integrity: sha512-XelR6MzjlZuBM4f5z2IQHK6LkK34Cvv6Rj2EntER3lwCBFdg6h2lKbtRjpTTsdEjD/WSe1q8UyPBXP1x3i/wYQ==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm64@0.25.9':
-    resolution: {integrity: sha512-IDrddSmpSv51ftWslJMvl3Q2ZT98fUSL2/rlUXuVqRXHCs5EUF1/f+jbjF5+NG9UffUDMCiTyh8iec7u8RlTLg==}
+  '@esbuild/android-arm@0.25.12':
+    resolution: {integrity: sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==}
     engines: {node: '>=18'}
-    cpu: [arm64]
+    cpu: [arm]
     os: [android]
 
   '@esbuild/android-arm@0.25.3':
@@ -1089,10 +1098,10 @@ packages:
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-arm@0.25.9':
-    resolution: {integrity: sha512-5WNI1DaMtxQ7t7B6xa572XMXpHAaI/9Hnhk8lcxF4zVN4xstUgTlvuGDorBguKEnZO70qwEcLpfifMLoxiPqHQ==}
+  '@esbuild/android-x64@0.25.12':
+    resolution: {integrity: sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==}
     engines: {node: '>=18'}
-    cpu: [arm]
+    cpu: [x64]
     os: [android]
 
   '@esbuild/android-x64@0.25.3':
@@ -1101,11 +1110,11 @@ packages:
     cpu: [x64]
     os: [android]
 
-  '@esbuild/android-x64@0.25.9':
-    resolution: {integrity: sha512-I853iMZ1hWZdNllhVZKm34f4wErd4lMyeV7BLzEExGEIZYsOzqDWDf+y082izYUE8gtJnYHdeDpN/6tUdwvfiw==}
+  '@esbuild/darwin-arm64@0.25.12':
+    resolution: {integrity: sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==}
     engines: {node: '>=18'}
-    cpu: [x64]
-    os: [android]
+    cpu: [arm64]
+    os: [darwin]
 
   '@esbuild/darwin-arm64@0.25.3':
     resolution: {integrity: sha512-eESK5yfPNTqpAmDfFWNsOhmIOaQA59tAcF/EfYvo5/QWQCzXn5iUSOnqt3ra3UdzBv073ykTtmeLJZGt3HhA+w==}
@@ -1113,10 +1122,10 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-arm64@0.25.9':
-    resolution: {integrity: sha512-XIpIDMAjOELi/9PB30vEbVMs3GV1v2zkkPnuyRRURbhqjyzIINwj+nbQATh4H9GxUgH1kFsEyQMxwiLFKUS6Rg==}
+  '@esbuild/darwin-x64@0.25.12':
+    resolution: {integrity: sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==}
     engines: {node: '>=18'}
-    cpu: [arm64]
+    cpu: [x64]
     os: [darwin]
 
   '@esbuild/darwin-x64@0.25.3':
@@ -1125,11 +1134,11 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.25.9':
-    resolution: {integrity: sha512-jhHfBzjYTA1IQu8VyrjCX4ApJDnH+ez+IYVEoJHeqJm9VhG9Dh2BYaJritkYK3vMaXrf7Ogr/0MQ8/MeIefsPQ==}
+  '@esbuild/freebsd-arm64@0.25.12':
+    resolution: {integrity: sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==}
     engines: {node: '>=18'}
-    cpu: [x64]
-    os: [darwin]
+    cpu: [arm64]
+    os: [freebsd]
 
   '@esbuild/freebsd-arm64@0.25.3':
     resolution: {integrity: sha512-EJiyS70BYybOBpJth3M0KLOus0n+RRMKTYzhYhFeMwp7e/RaajXvP+BWlmEXNk6uk+KAu46j/kaQzr6au+JcIw==}
@@ -1137,10 +1146,10 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-arm64@0.25.9':
-    resolution: {integrity: sha512-z93DmbnY6fX9+KdD4Ue/H6sYs+bhFQJNCPZsi4XWJoYblUqT06MQUdBCpcSfuiN72AbqeBFu5LVQTjfXDE2A6Q==}
+  '@esbuild/freebsd-x64@0.25.12':
+    resolution: {integrity: sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==}
     engines: {node: '>=18'}
-    cpu: [arm64]
+    cpu: [x64]
     os: [freebsd]
 
   '@esbuild/freebsd-x64@0.25.3':
@@ -1149,11 +1158,11 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.25.9':
-    resolution: {integrity: sha512-mrKX6H/vOyo5v71YfXWJxLVxgy1kyt1MQaD8wZJgJfG4gq4DpQGpgTB74e5yBeQdyMTbgxp0YtNj7NuHN0PoZg==}
+  '@esbuild/linux-arm64@0.25.12':
+    resolution: {integrity: sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==}
     engines: {node: '>=18'}
-    cpu: [x64]
-    os: [freebsd]
+    cpu: [arm64]
+    os: [linux]
 
   '@esbuild/linux-arm64@0.25.3':
     resolution: {integrity: sha512-xCUgnNYhRD5bb1C1nqrDV1PfkwgbswTTBRbAd8aH5PhYzikdf/ddtsYyMXFfGSsb/6t6QaPSzxtbfAZr9uox4A==}
@@ -1161,10 +1170,10 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm64@0.25.9':
-    resolution: {integrity: sha512-BlB7bIcLT3G26urh5Dmse7fiLmLXnRlopw4s8DalgZ8ef79Jj4aUcYbk90g8iCa2467HX8SAIidbL7gsqXHdRw==}
+  '@esbuild/linux-arm@0.25.12':
+    resolution: {integrity: sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==}
     engines: {node: '>=18'}
-    cpu: [arm64]
+    cpu: [arm]
     os: [linux]
 
   '@esbuild/linux-arm@0.25.3':
@@ -1173,10 +1182,10 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-arm@0.25.9':
-    resolution: {integrity: sha512-HBU2Xv78SMgaydBmdor38lg8YDnFKSARg1Q6AT0/y2ezUAKiZvc211RDFHlEZRFNRVhcMamiToo7bDx3VEOYQw==}
+  '@esbuild/linux-ia32@0.25.12':
+    resolution: {integrity: sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==}
     engines: {node: '>=18'}
-    cpu: [arm]
+    cpu: [ia32]
     os: [linux]
 
   '@esbuild/linux-ia32@0.25.3':
@@ -1185,10 +1194,10 @@ packages:
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.25.9':
-    resolution: {integrity: sha512-e7S3MOJPZGp2QW6AK6+Ly81rC7oOSerQ+P8L0ta4FhVi+/j/v2yZzx5CqqDaWjtPFfYz21Vi1S0auHrap3Ma3A==}
+  '@esbuild/linux-loong64@0.25.12':
+    resolution: {integrity: sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==}
     engines: {node: '>=18'}
-    cpu: [ia32]
+    cpu: [loong64]
     os: [linux]
 
   '@esbuild/linux-loong64@0.25.3':
@@ -1197,10 +1206,10 @@ packages:
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.25.9':
-    resolution: {integrity: sha512-Sbe10Bnn0oUAB2AalYztvGcK+o6YFFA/9829PhOCUS9vkJElXGdphz0A3DbMdP8gmKkqPmPcMJmJOrI3VYB1JQ==}
+  '@esbuild/linux-mips64el@0.25.12':
+    resolution: {integrity: sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==}
     engines: {node: '>=18'}
-    cpu: [loong64]
+    cpu: [mips64el]
     os: [linux]
 
   '@esbuild/linux-mips64el@0.25.3':
@@ -1209,10 +1218,10 @@ packages:
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.25.9':
-    resolution: {integrity: sha512-YcM5br0mVyZw2jcQeLIkhWtKPeVfAerES5PvOzaDxVtIyZ2NUBZKNLjC5z3/fUlDgT6w89VsxP2qzNipOaaDyA==}
+  '@esbuild/linux-ppc64@0.25.12':
+    resolution: {integrity: sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==}
     engines: {node: '>=18'}
-    cpu: [mips64el]
+    cpu: [ppc64]
     os: [linux]
 
   '@esbuild/linux-ppc64@0.25.3':
@@ -1221,10 +1230,10 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.25.9':
-    resolution: {integrity: sha512-++0HQvasdo20JytyDpFvQtNrEsAgNG2CY1CLMwGXfFTKGBGQT3bOeLSYE2l1fYdvML5KUuwn9Z8L1EWe2tzs1w==}
+  '@esbuild/linux-riscv64@0.25.12':
+    resolution: {integrity: sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==}
     engines: {node: '>=18'}
-    cpu: [ppc64]
+    cpu: [riscv64]
     os: [linux]
 
   '@esbuild/linux-riscv64@0.25.3':
@@ -1233,10 +1242,10 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.25.9':
-    resolution: {integrity: sha512-uNIBa279Y3fkjV+2cUjx36xkx7eSjb8IvnL01eXUKXez/CBHNRw5ekCGMPM0BcmqBxBcdgUWuUXmVWwm4CH9kg==}
+  '@esbuild/linux-s390x@0.25.12':
+    resolution: {integrity: sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==}
     engines: {node: '>=18'}
-    cpu: [riscv64]
+    cpu: [s390x]
     os: [linux]
 
   '@esbuild/linux-s390x@0.25.3':
@@ -1245,10 +1254,10 @@ packages:
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.25.9':
-    resolution: {integrity: sha512-Mfiphvp3MjC/lctb+7D287Xw1DGzqJPb/J2aHHcHxflUo+8tmN/6d4k6I2yFR7BVo5/g7x2Monq4+Yew0EHRIA==}
+  '@esbuild/linux-x64@0.25.12':
+    resolution: {integrity: sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==}
     engines: {node: '>=18'}
-    cpu: [s390x]
+    cpu: [x64]
     os: [linux]
 
   '@esbuild/linux-x64@0.25.3':
@@ -1257,11 +1266,11 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/linux-x64@0.25.9':
-    resolution: {integrity: sha512-iSwByxzRe48YVkmpbgoxVzn76BXjlYFXC7NvLYq+b+kDjyyk30J0JY47DIn8z1MO3K0oSl9fZoRmZPQI4Hklzg==}
+  '@esbuild/netbsd-arm64@0.25.12':
+    resolution: {integrity: sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==}
     engines: {node: '>=18'}
-    cpu: [x64]
-    os: [linux]
+    cpu: [arm64]
+    os: [netbsd]
 
   '@esbuild/netbsd-arm64@0.25.3':
     resolution: {integrity: sha512-1QaLtOWq0mzK6tzzp0jRN3eccmN3hezey7mhLnzC6oNlJoUJz4nym5ZD7mDnS/LZQgkrhEbEiTn515lPeLpgWA==}
@@ -1269,10 +1278,10 @@ packages:
     cpu: [arm64]
     os: [netbsd]
 
-  '@esbuild/netbsd-arm64@0.25.9':
-    resolution: {integrity: sha512-9jNJl6FqaUG+COdQMjSCGW4QiMHH88xWbvZ+kRVblZsWrkXlABuGdFJ1E9L7HK+T0Yqd4akKNa/lO0+jDxQD4Q==}
+  '@esbuild/netbsd-x64@0.25.12':
+    resolution: {integrity: sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==}
     engines: {node: '>=18'}
-    cpu: [arm64]
+    cpu: [x64]
     os: [netbsd]
 
   '@esbuild/netbsd-x64@0.25.3':
@@ -1281,11 +1290,11 @@ packages:
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/netbsd-x64@0.25.9':
-    resolution: {integrity: sha512-RLLdkflmqRG8KanPGOU7Rpg829ZHu8nFy5Pqdi9U01VYtG9Y0zOG6Vr2z4/S+/3zIyOxiK6cCeYNWOFR9QP87g==}
+  '@esbuild/openbsd-arm64@0.25.12':
+    resolution: {integrity: sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==}
     engines: {node: '>=18'}
-    cpu: [x64]
-    os: [netbsd]
+    cpu: [arm64]
+    os: [openbsd]
 
   '@esbuild/openbsd-arm64@0.25.3':
     resolution: {integrity: sha512-zGAVApJEYTbOC6H/3QBr2mq3upG/LBEXr85/pTtKiv2IXcgKV0RT0QA/hSXZqSvLEpXeIxah7LczB4lkiYhTAQ==}
@@ -1293,10 +1302,10 @@ packages:
     cpu: [arm64]
     os: [openbsd]
 
-  '@esbuild/openbsd-arm64@0.25.9':
-    resolution: {integrity: sha512-YaFBlPGeDasft5IIM+CQAhJAqS3St3nJzDEgsgFixcfZeyGPCd6eJBWzke5piZuZ7CtL656eOSYKk4Ls2C0FRQ==}
+  '@esbuild/openbsd-x64@0.25.12':
+    resolution: {integrity: sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==}
     engines: {node: '>=18'}
-    cpu: [arm64]
+    cpu: [x64]
     os: [openbsd]
 
   '@esbuild/openbsd-x64@0.25.3':
@@ -1305,62 +1314,56 @@ packages:
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/openbsd-x64@0.25.9':
-    resolution: {integrity: sha512-1MkgTCuvMGWuqVtAvkpkXFmtL8XhWy+j4jaSO2wxfJtilVCi0ZE37b8uOdMItIHz4I6z1bWWtEX4CJwcKYLcuA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [openbsd]
-
-  '@esbuild/openharmony-arm64@0.25.9':
-    resolution: {integrity: sha512-4Xd0xNiMVXKh6Fa7HEJQbrpP3m3DDn43jKxMjxLLRjWnRsfxjORYJlXPO4JNcXtOyfajXorRKY9NkOpTHptErg==}
+  '@esbuild/openharmony-arm64@0.25.12':
+    resolution: {integrity: sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openharmony]
 
-  '@esbuild/sunos-x64@0.25.3':
-    resolution: {integrity: sha512-ROJhm7d8bk9dMCUZjkS8fgzsPAZEjtRJqCAmVgB0gMrvG7hfmPmz9k1rwO4jSiblFjYmNvbECL9uhaPzONMfgA==}
+  '@esbuild/sunos-x64@0.25.12':
+    resolution: {integrity: sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/sunos-x64@0.25.9':
-    resolution: {integrity: sha512-WjH4s6hzo00nNezhp3wFIAfmGZ8U7KtrJNlFMRKxiI9mxEK1scOMAaa9i4crUtu+tBr+0IN6JCuAcSBJZfnphw==}
+  '@esbuild/sunos-x64@0.25.3':
+    resolution: {integrity: sha512-ROJhm7d8bk9dMCUZjkS8fgzsPAZEjtRJqCAmVgB0gMrvG7hfmPmz9k1rwO4jSiblFjYmNvbECL9uhaPzONMfgA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/win32-arm64@0.25.3':
-    resolution: {integrity: sha512-YWcow8peiHpNBiIXHwaswPnAXLsLVygFwCB3A7Bh5jRkIBFWHGmNQ48AlX4xDvQNoMZlPYzjVOQDYEzWCqufMQ==}
+  '@esbuild/win32-arm64@0.25.12':
+    resolution: {integrity: sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-arm64@0.25.9':
-    resolution: {integrity: sha512-mGFrVJHmZiRqmP8xFOc6b84/7xa5y5YvR1x8djzXpJBSv/UsNK6aqec+6JDjConTgvvQefdGhFDAs2DLAds6gQ==}
+  '@esbuild/win32-arm64@0.25.3':
+    resolution: {integrity: sha512-YWcow8peiHpNBiIXHwaswPnAXLsLVygFwCB3A7Bh5jRkIBFWHGmNQ48AlX4xDvQNoMZlPYzjVOQDYEzWCqufMQ==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.25.3':
-    resolution: {integrity: sha512-qspTZOIGoXVS4DpNqUYUs9UxVb04khS1Degaw/MnfMe7goQ3lTfQ13Vw4qY/Nj0979BGvMRpAYbs/BAxEvU8ew==}
+  '@esbuild/win32-ia32@0.25.12':
+    resolution: {integrity: sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.25.9':
-    resolution: {integrity: sha512-b33gLVU2k11nVx1OhX3C8QQP6UHQK4ZtN56oFWvVXvz2VkDoe6fbG8TOgHFxEvqeqohmRnIHe5A1+HADk4OQww==}
+  '@esbuild/win32-ia32@0.25.3':
+    resolution: {integrity: sha512-qspTZOIGoXVS4DpNqUYUs9UxVb04khS1Degaw/MnfMe7goQ3lTfQ13Vw4qY/Nj0979BGvMRpAYbs/BAxEvU8ew==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-x64@0.25.3':
-    resolution: {integrity: sha512-ICgUR+kPimx0vvRzf+N/7L7tVSQeE3BYY+NhHRHXS1kBuPO7z2+7ea2HbhDyZdTephgvNvKrlDDKUexuCVBVvg==}
+  '@esbuild/win32-x64@0.25.12':
+    resolution: {integrity: sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [win32]
 
-  '@esbuild/win32-x64@0.25.9':
-    resolution: {integrity: sha512-PPOl1mi6lpLNQxnGoyAfschAodRFYXJ+9fs6WHXz7CSWKbOqiMZsubC+BQsVKuul+3vKLuwTHsS2c2y9EoKwxQ==}
+  '@esbuild/win32-x64@0.25.3':
+    resolution: {integrity: sha512-ICgUR+kPimx0vvRzf+N/7L7tVSQeE3BYY+NhHRHXS1kBuPO7z2+7ea2HbhDyZdTephgvNvKrlDDKUexuCVBVvg==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [win32]
@@ -1947,8 +1950,8 @@ packages:
     cpu: [arm]
     os: [android]
 
-  '@rollup/rollup-android-arm-eabi@4.50.1':
-    resolution: {integrity: sha512-HJXwzoZN4eYTdD8bVV22DN8gsPCAj3V20NHKOs8ezfXanGpmVPR7kalUHd+Y31IJp9stdB87VKPFbsGY3H/2ag==}
+  '@rollup/rollup-android-arm-eabi@4.53.3':
+    resolution: {integrity: sha512-mRSi+4cBjrRLoaal2PnqH82Wqyb+d3HsPUN/W+WslCXsZsyHa9ZeQQX/pQsZaVIWDkPcpV6jJ+3KLbTbgnwv8w==}
     cpu: [arm]
     os: [android]
 
@@ -1957,8 +1960,8 @@ packages:
     cpu: [arm64]
     os: [android]
 
-  '@rollup/rollup-android-arm64@4.50.1':
-    resolution: {integrity: sha512-PZlsJVcjHfcH53mOImyt3bc97Ep3FJDXRpk9sMdGX0qgLmY0EIWxCag6EigerGhLVuL8lDVYNnSo8qnTElO4xw==}
+  '@rollup/rollup-android-arm64@4.53.3':
+    resolution: {integrity: sha512-CbDGaMpdE9sh7sCmTrTUyllhrg65t6SwhjlMJsLr+J8YjFuPmCEjbBSx4Z/e4SmDyH3aB5hGaJUP2ltV/vcs4w==}
     cpu: [arm64]
     os: [android]
 
@@ -1967,8 +1970,8 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-arm64@4.50.1':
-    resolution: {integrity: sha512-xc6i2AuWh++oGi4ylOFPmzJOEeAa2lJeGUGb4MudOtgfyyjr4UPNK+eEWTPLvmPJIY/pgw6ssFIox23SyrkkJw==}
+  '@rollup/rollup-darwin-arm64@4.53.3':
+    resolution: {integrity: sha512-Nr7SlQeqIBpOV6BHHGZgYBuSdanCXuw09hon14MGOLGmXAFYjx1wNvquVPmpZnl0tLjg25dEdr4IQ6GgyToCUA==}
     cpu: [arm64]
     os: [darwin]
 
@@ -1977,8 +1980,8 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-x64@4.50.1':
-    resolution: {integrity: sha512-2ofU89lEpDYhdLAbRdeyz/kX3Y2lpYc6ShRnDjY35bZhd2ipuDMDi6ZTQ9NIag94K28nFMofdnKeHR7BT0CATw==}
+  '@rollup/rollup-darwin-x64@4.53.3':
+    resolution: {integrity: sha512-DZ8N4CSNfl965CmPktJ8oBnfYr3F8dTTNBQkRlffnUarJ2ohudQD17sZBa097J8xhQ26AwhHJ5mvUyQW8ddTsQ==}
     cpu: [x64]
     os: [darwin]
 
@@ -1987,8 +1990,8 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
-  '@rollup/rollup-freebsd-arm64@4.50.1':
-    resolution: {integrity: sha512-wOsE6H2u6PxsHY/BeFHA4VGQN3KUJFZp7QJBmDYI983fgxq5Th8FDkVuERb2l9vDMs1D5XhOrhBrnqcEY6l8ZA==}
+  '@rollup/rollup-freebsd-arm64@4.53.3':
+    resolution: {integrity: sha512-yMTrCrK92aGyi7GuDNtGn2sNW+Gdb4vErx4t3Gv/Tr+1zRb8ax4z8GWVRfr3Jw8zJWvpGHNpss3vVlbF58DZ4w==}
     cpu: [arm64]
     os: [freebsd]
 
@@ -1997,8 +2000,8 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
-  '@rollup/rollup-freebsd-x64@4.50.1':
-    resolution: {integrity: sha512-A/xeqaHTlKbQggxCqispFAcNjycpUEHP52mwMQZUNqDUJFFYtPHCXS1VAG29uMlDzIVr+i00tSFWFLivMcoIBQ==}
+  '@rollup/rollup-freebsd-x64@4.53.3':
+    resolution: {integrity: sha512-lMfF8X7QhdQzseM6XaX0vbno2m3hlyZFhwcndRMw8fbAGUGL3WFMBdK0hbUBIUYcEcMhVLr1SIamDeuLBnXS+Q==}
     cpu: [x64]
     os: [freebsd]
 
@@ -2007,8 +2010,8 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.50.1':
-    resolution: {integrity: sha512-54v4okehwl5TaSIkpp97rAHGp7t3ghinRd/vyC1iXqXMfjYUTm7TfYmCzXDoHUPTTf36L8pr0E7YsD3CfB3ZDg==}
+  '@rollup/rollup-linux-arm-gnueabihf@4.53.3':
+    resolution: {integrity: sha512-k9oD15soC/Ln6d2Wv/JOFPzZXIAIFLp6B+i14KhxAfnq76ajt0EhYc5YPeX6W1xJkAdItcVT+JhKl1QZh44/qw==}
     cpu: [arm]
     os: [linux]
 
@@ -2017,8 +2020,8 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm-musleabihf@4.50.1':
-    resolution: {integrity: sha512-p/LaFyajPN/0PUHjv8TNyxLiA7RwmDoVY3flXHPSzqrGcIp/c2FjwPPP5++u87DGHtw+5kSH5bCJz0mvXngYxw==}
+  '@rollup/rollup-linux-arm-musleabihf@4.53.3':
+    resolution: {integrity: sha512-vTNlKq+N6CK/8UktsrFuc+/7NlEYVxgaEgRXVUVK258Z5ymho29skzW1sutgYjqNnquGwVUObAaxae8rZ6YMhg==}
     cpu: [arm]
     os: [linux]
 
@@ -2027,8 +2030,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-gnu@4.50.1':
-    resolution: {integrity: sha512-2AbMhFFkTo6Ptna1zO7kAXXDLi7H9fGTbVaIq2AAYO7yzcAsuTNWPHhb2aTA6GPiP+JXh85Y8CiS54iZoj4opw==}
+  '@rollup/rollup-linux-arm64-gnu@4.53.3':
+    resolution: {integrity: sha512-RGrFLWgMhSxRs/EWJMIFM1O5Mzuz3Xy3/mnxJp/5cVhZ2XoCAxJnmNsEyeMJtpK+wu0FJFWz+QF4mjCA7AUQ3w==}
     cpu: [arm64]
     os: [linux]
 
@@ -2037,18 +2040,18 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-musl@4.50.1':
-    resolution: {integrity: sha512-Cgef+5aZwuvesQNw9eX7g19FfKX5/pQRIyhoXLCiBOrWopjo7ycfB292TX9MDcDijiuIJlx1IzJz3IoCPfqs9w==}
+  '@rollup/rollup-linux-arm64-musl@4.53.3':
+    resolution: {integrity: sha512-kASyvfBEWYPEwe0Qv4nfu6pNkITLTb32p4yTgzFCocHnJLAHs+9LjUu9ONIhvfT/5lv4YS5muBHyuV84epBo/A==}
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-loongarch64-gnu@4.40.1':
-    resolution: {integrity: sha512-ySyWikVhNzv+BV/IDCsrraOAZ3UaC8SZB67FZlqVwXwnFhPihOso9rPOxzZbjp81suB1O2Topw+6Ug3JNegejQ==}
+  '@rollup/rollup-linux-loong64-gnu@4.53.3':
+    resolution: {integrity: sha512-JiuKcp2teLJwQ7vkJ95EwESWkNRFJD7TQgYmCnrPtlu50b4XvT5MOmurWNrCj3IFdyjBQ5p9vnrX4JM6I8OE7g==}
     cpu: [loong64]
     os: [linux]
 
-  '@rollup/rollup-linux-loongarch64-gnu@4.50.1':
-    resolution: {integrity: sha512-RPhTwWMzpYYrHrJAS7CmpdtHNKtt2Ueo+BlLBjfZEhYBhK00OsEqM08/7f+eohiF6poe0YRDDd8nAvwtE/Y62Q==}
+  '@rollup/rollup-linux-loongarch64-gnu@4.40.1':
+    resolution: {integrity: sha512-ySyWikVhNzv+BV/IDCsrraOAZ3UaC8SZB67FZlqVwXwnFhPihOso9rPOxzZbjp81suB1O2Topw+6Ug3JNegejQ==}
     cpu: [loong64]
     os: [linux]
 
@@ -2057,8 +2060,8 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
-  '@rollup/rollup-linux-ppc64-gnu@4.50.1':
-    resolution: {integrity: sha512-eSGMVQw9iekut62O7eBdbiccRguuDgiPMsw++BVUg+1K7WjZXHOg/YOT9SWMzPZA+w98G+Fa1VqJgHZOHHnY0Q==}
+  '@rollup/rollup-linux-ppc64-gnu@4.53.3':
+    resolution: {integrity: sha512-EoGSa8nd6d3T7zLuqdojxC20oBfNT8nexBbB/rkxgKj5T5vhpAQKKnD+h3UkoMuTyXkP5jTjK/ccNRmQrPNDuw==}
     cpu: [ppc64]
     os: [linux]
 
@@ -2067,8 +2070,8 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-gnu@4.50.1':
-    resolution: {integrity: sha512-S208ojx8a4ciIPrLgazF6AgdcNJzQE4+S9rsmOmDJkusvctii+ZvEuIC4v/xFqzbuP8yDjn73oBlNDgF6YGSXQ==}
+  '@rollup/rollup-linux-riscv64-gnu@4.53.3':
+    resolution: {integrity: sha512-4s+Wped2IHXHPnAEbIB0YWBv7SDohqxobiiPA1FIWZpX+w9o2i4LezzH/NkFUl8LRci/8udci6cLq+jJQlh+0g==}
     cpu: [riscv64]
     os: [linux]
 
@@ -2077,8 +2080,8 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-musl@4.50.1':
-    resolution: {integrity: sha512-3Ag8Ls1ggqkGUvSZWYcdgFwriy2lWo+0QlYgEFra/5JGtAd6C5Hw59oojx1DeqcA2Wds2ayRgvJ4qxVTzCHgzg==}
+  '@rollup/rollup-linux-riscv64-musl@4.53.3':
+    resolution: {integrity: sha512-68k2g7+0vs2u9CxDt5ktXTngsxOQkSEV/xBbwlqYcUrAVh6P9EgMZvFsnHy4SEiUl46Xf0IObWVbMvPrr2gw8A==}
     cpu: [riscv64]
     os: [linux]
 
@@ -2087,8 +2090,8 @@ packages:
     cpu: [s390x]
     os: [linux]
 
-  '@rollup/rollup-linux-s390x-gnu@4.50.1':
-    resolution: {integrity: sha512-t9YrKfaxCYe7l7ldFERE1BRg/4TATxIg+YieHQ966jwvo7ddHJxPj9cNFWLAzhkVsbBvNA4qTbPVNsZKBO4NSg==}
+  '@rollup/rollup-linux-s390x-gnu@4.53.3':
+    resolution: {integrity: sha512-VYsFMpULAz87ZW6BVYw3I6sWesGpsP9OPcyKe8ofdg9LHxSbRMd7zrVrr5xi/3kMZtpWL/wC+UIJWJYVX5uTKg==}
     cpu: [s390x]
     os: [linux]
 
@@ -2097,8 +2100,8 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-gnu@4.50.1':
-    resolution: {integrity: sha512-MCgtFB2+SVNuQmmjHf+wfI4CMxy3Tk8XjA5Z//A0AKD7QXUYFMQcns91K6dEHBvZPCnhJSyDWLApk40Iq/H3tA==}
+  '@rollup/rollup-linux-x64-gnu@4.53.3':
+    resolution: {integrity: sha512-3EhFi1FU6YL8HTUJZ51imGJWEX//ajQPfqWLI3BQq4TlvHy4X0MOr5q3D2Zof/ka0d5FNdPwZXm3Yyib/UEd+w==}
     cpu: [x64]
     os: [linux]
 
@@ -2107,13 +2110,13 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-musl@4.50.1':
-    resolution: {integrity: sha512-nEvqG+0jeRmqaUMuwzlfMKwcIVffy/9KGbAGyoa26iu6eSngAYQ512bMXuqqPrlTyfqdlB9FVINs93j534UJrg==}
+  '@rollup/rollup-linux-x64-musl@4.53.3':
+    resolution: {integrity: sha512-eoROhjcc6HbZCJr+tvVT8X4fW3/5g/WkGvvmwz/88sDtSJzO7r/blvoBDgISDiCjDRZmHpwud7h+6Q9JxFwq1Q==}
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-openharmony-arm64@4.50.1':
-    resolution: {integrity: sha512-RDsLm+phmT3MJd9SNxA9MNuEAO/J2fhW8GXk62G/B4G7sLVumNFbRwDL6v5NrESb48k+QMqdGbHgEtfU0LCpbA==}
+  '@rollup/rollup-openharmony-arm64@4.53.3':
+    resolution: {integrity: sha512-OueLAWgrNSPGAdUdIjSWXw+u/02BRTcnfw9PN41D2vq/JSEPnJnVuBgw18VkN8wcd4fjUs+jFHVM4t9+kBSNLw==}
     cpu: [arm64]
     os: [openharmony]
 
@@ -2122,8 +2125,8 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@rollup/rollup-win32-arm64-msvc@4.50.1':
-    resolution: {integrity: sha512-hpZB/TImk2FlAFAIsoElM3tLzq57uxnGYwplg6WDyAxbYczSi8O2eQ+H2Lx74504rwKtZ3N2g4bCUkiamzS6TQ==}
+  '@rollup/rollup-win32-arm64-msvc@4.53.3':
+    resolution: {integrity: sha512-GOFuKpsxR/whszbF/bzydebLiXIHSgsEUp6M0JI8dWvi+fFa1TD6YQa4aSZHtpmh2/uAlj/Dy+nmby3TJ3pkTw==}
     cpu: [arm64]
     os: [win32]
 
@@ -2132,18 +2135,23 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@rollup/rollup-win32-ia32-msvc@4.50.1':
-    resolution: {integrity: sha512-SXjv8JlbzKM0fTJidX4eVsH+Wmnp0/WcD8gJxIZyR6Gay5Qcsmdbi9zVtnbkGPG8v2vMR1AD06lGWy5FLMcG7A==}
+  '@rollup/rollup-win32-ia32-msvc@4.53.3':
+    resolution: {integrity: sha512-iah+THLcBJdpfZ1TstDFbKNznlzoxa8fmnFYK4V67HvmuNYkVdAywJSoteUszvBQ9/HqN2+9AZghbajMsFT+oA==}
     cpu: [ia32]
     os: [win32]
 
+  '@rollup/rollup-win32-x64-gnu@4.53.3':
+    resolution: {integrity: sha512-J9QDiOIZlZLdcot5NXEepDkstocktoVjkaKUtqzgzpt2yWjGlbYiKyp05rWwk4nypbYUNoFAztEgixoLaSETkg==}
+    cpu: [x64]
+    os: [win32]
+
   '@rollup/rollup-win32-x64-msvc@4.40.1':
     resolution: {integrity: sha512-ECyOuDeH3C1I8jH2MK1RtBJW+YPMvSfT0a5NN0nHfQYnDSJ6tUiZH3gzwVP5/Kfh/+Tt7tpWVF9LXNTnhTJ3kA==}
     cpu: [x64]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-msvc@4.50.1':
-    resolution: {integrity: sha512-StxAO/8ts62KZVRAm4JZYq9+NqNsV7RvimNK+YM7ry//zebEH6meuugqW/P5OFUCjyQgui+9fUxT6d5NShvMvA==}
+  '@rollup/rollup-win32-x64-msvc@4.53.3':
+    resolution: {integrity: sha512-UhTd8u31dXadv0MopwGgNOBpUVROFKWVQgAg5N1ESyCz8AuBcMqm4AuTjrwgQKGDfoFuz02EuMRHQIw/frmYKQ==}
     cpu: [x64]
     os: [win32]
 
@@ -2198,6 +2206,9 @@ packages:
   '@shikijs/vscode-textmate@10.0.2':
     resolution: {integrity: sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==}
 
+  '@standard-schema/spec@1.0.0':
+    resolution: {integrity: sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==}
+
   '@storybook/addon-a11y@9.0.12':
     resolution: {integrity: sha512-xdJPYNxYU6A3DA48h6y0o3XziCp4YDGXcFKkc5Ce1GPFCa7ebFFh2trHqzevoFSGdQxWc5M3W0A4dhQtkpT4Ww==}
     peerDependencies:
@@ -2903,14 +2914,14 @@ packages:
   '@vitest/expect@3.0.9':
     resolution: {integrity: sha512-5eCqRItYgIML7NNVgJj6TVCmdzE7ZVgJhruW0ziSQV4V7PvLkDL1bBkBdcTs/VuIz0IxPb5da1IDSqc1TR9eig==}
 
-  '@vitest/expect@3.2.4':
-    resolution: {integrity: sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==}
+  '@vitest/expect@4.0.10':
+    resolution: {integrity: sha512-3QkTX/lK39FBNwARCQRSQr0TP9+ywSdxSX+LgbJ2M1WmveXP72anTbnp2yl5fH+dU6SUmBzNMrDHs80G8G2DZg==}
 
-  '@vitest/mocker@3.2.4':
-    resolution: {integrity: sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==}
+  '@vitest/mocker@4.0.10':
+    resolution: {integrity: sha512-e2OfdexYkjkg8Hh3L9NVEfbwGXq5IZbDovkf30qW2tOh7Rh9sVtmSr2ztEXOFbymNxS4qjzLXUQIvATvN4B+lg==}
     peerDependencies:
       msw: ^2.4.9
-      vite: ^5.0.0 || ^6.0.0 || ^7.0.0-0
+      vite: ^6.0.0 || ^7.0.0-0
     peerDependenciesMeta:
       msw:
         optional: true
@@ -2920,31 +2931,31 @@ packages:
   '@vitest/pretty-format@3.0.9':
     resolution: {integrity: sha512-OW9F8t2J3AwFEwENg3yMyKWweF7oRJlMyHOMIhO5F3n0+cgQAJZBjNgrF8dLwFTEXl5jUqBLXd9QyyKv8zEcmA==}
 
-  '@vitest/pretty-format@3.2.4':
-    resolution: {integrity: sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==}
+  '@vitest/pretty-format@4.0.10':
+    resolution: {integrity: sha512-99EQbpa/zuDnvVjthwz5bH9o8iPefoQZ63WV8+bsRJZNw3qQSvSltfut8yu1Jc9mqOYi7pEbsKxYTi/rjaq6PA==}
 
-  '@vitest/runner@3.2.4':
-    resolution: {integrity: sha512-oukfKT9Mk41LreEW09vt45f8wx7DordoWUZMYdY/cyAk7w5TWkTRCNZYF7sX7n2wB7jyGAl74OxgwhPgKaqDMQ==}
+  '@vitest/runner@4.0.10':
+    resolution: {integrity: sha512-EXU2iSkKvNwtlL8L8doCpkyclw0mc/t4t9SeOnfOFPyqLmQwuceMPA4zJBa6jw0MKsZYbw7kAn+gl7HxrlB8UQ==}
 
-  '@vitest/snapshot@3.2.4':
-    resolution: {integrity: sha512-dEYtS7qQP2CjU27QBC5oUOxLE/v5eLkGqPE0ZKEIDGMs4vKWe7IjgLOeauHsR0D5YuuycGRO5oSRXnwnmA78fQ==}
+  '@vitest/snapshot@4.0.10':
+    resolution: {integrity: sha512-2N4X2ZZl7kZw0qeGdQ41H0KND96L3qX1RgwuCfy6oUsF2ISGD/HpSbmms+CkIOsQmg2kulwfhJ4CI0asnZlvkg==}
 
   '@vitest/spy@3.0.9':
     resolution: {integrity: sha512-/CcK2UDl0aQ2wtkp3YVWldrpLRNCfVcIOFGlVGKO4R5eajsH393Z1yiXLVQ7vWsj26JOEjeZI0x5sm5P4OGUNQ==}
 
-  '@vitest/spy@3.2.4':
-    resolution: {integrity: sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==}
+  '@vitest/spy@4.0.10':
+    resolution: {integrity: sha512-AsY6sVS8OLb96GV5RoG8B6I35GAbNrC49AO+jNRF9YVGb/g9t+hzNm1H6kD0NDp8tt7VJLs6hb7YMkDXqu03iw==}
 
-  '@vitest/ui@3.2.4':
-    resolution: {integrity: sha512-hGISOaP18plkzbWEcP/QvtRW1xDXF2+96HbEX6byqQhAUbiS5oH6/9JwW+QsQCIYON2bI6QZBF+2PvOmrRZ9wA==}
+  '@vitest/ui@4.0.10':
+    resolution: {integrity: sha512-oWtNM89Np+YsQO3ttT5i1Aer/0xbzQzp66NzuJn/U16bB7MnvSzdLKXgk1kkMLYyKSSzA2ajzqMkYheaE9opuQ==}
     peerDependencies:
-      vitest: 3.2.4
+      vitest: 4.0.10
 
   '@vitest/utils@3.0.9':
     resolution: {integrity: sha512-ilHM5fHhZ89MCp5aAaM9uhfl1c2JdxVxl3McqsdVyVNN6JffnEen8UMCdRTzOhGXNQGo5GNL9QugHrz727Wnng==}
 
-  '@vitest/utils@3.2.4':
-    resolution: {integrity: sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==}
+  '@vitest/utils@4.0.10':
+    resolution: {integrity: sha512-kOuqWnEwZNtQxMKg3WmPK1vmhZu9WcoX69iwWjVz+jvKTsF1emzsv3eoPcDr6ykA3qP2bsCQE7CwqfNtAVzsmg==}
 
   '@vueless/storybook-dark-mode@9.0.5':
     resolution: {integrity: sha512-JU0bQe+KHvmg04k2yprzVkM0d8xdKwqFaFuQmO7afIUm//ttroDpfHfPzwLZuTDW9coB5bt2+qMSHZOBbt0w4g==}
@@ -3142,6 +3153,10 @@ packages:
   balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
+  balanced-match@3.0.1:
+    resolution: {integrity: sha512-vjtV3hiLqYDNRoiAv0zC4QaGAMPomEoq83PRmYIofPswwZurCeWR5LByXm7SyoL0Zh5+2z0+HC7jG8gSZJUh0w==}
+    engines: {node: '>= 16'}
+
   base64-arraybuffer@1.0.2:
     resolution: {integrity: sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==}
     engines: {node: '>= 0.6.0'}
@@ -3169,6 +3184,10 @@ packages:
   brace-expansion@2.0.2:
     resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==}
 
+  brace-expansion@4.0.1:
+    resolution: {integrity: sha512-YClrbvTCXGe70pU2JiEiPLYXO9gQkyxYeKpJIQHVS/gOs6EWMQP2RYBwjFLNT322Ji8TOC3IMPfsYCedNpzKfA==}
+    engines: {node: '>= 18'}
+
   braces@3.0.3:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
     engines: {node: '>=8'}
@@ -3264,6 +3283,10 @@ packages:
     resolution: {integrity: sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==}
     engines: {node: '>=12'}
 
+  chai@6.2.1:
+    resolution: {integrity: sha512-p4Z49OGG5W/WBCPSS/dH3jQ73kD6tiMmUM+bckNK6Jr5JHMG3k9bg/BvKR8lKmtVBKmOiuVaV2ws8s9oSbwysg==}
+    engines: {node: '>=18'}
+
   chalk@3.0.0:
     resolution: {integrity: sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==}
     engines: {node: '>=8'}
@@ -3636,6 +3659,15 @@ packages:
       supports-color:
         optional: true
 
+  debug@4.4.3:
+    resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
   decamelize@1.2.0:
     resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
     engines: {node: '>=0.10.0'}
@@ -3801,13 +3833,13 @@ packages:
     peerDependencies:
       esbuild: '>=0.12 <1'
 
-  esbuild@0.25.3:
-    resolution: {integrity: sha512-qKA6Pvai73+M2FtftpNKRxJ78GIjmFXFxd/1DVBqGo/qNhLSfv+G12n9pNoWdytJC8U00TrViOwpjT0zgqQS8Q==}
+  esbuild@0.25.12:
+    resolution: {integrity: sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==}
     engines: {node: '>=18'}
     hasBin: true
 
-  esbuild@0.25.9:
-    resolution: {integrity: sha512-CRbODhYyQx3qp7ZEwzxOk4JBqmD/seJrzPa/cGjY1VtIn5E09Oi9/dB4JwctnfZ8Q8iT7rioVv5k/FNT/uf54g==}
+  esbuild@0.25.3:
+    resolution: {integrity: sha512-qKA6Pvai73+M2FtftpNKRxJ78GIjmFXFxd/1DVBqGo/qNhLSfv+G12n9pNoWdytJC8U00TrViOwpjT0zgqQS8Q==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -3973,8 +4005,8 @@ packages:
     resolution: {integrity: sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==}
     engines: {node: '>=4'}
 
-  expect-type@1.2.1:
-    resolution: {integrity: sha512-/kP8CAwxzLVEeFrMm4kMmy4CCDlpipyA7MYLVrdJIkV0fYF0UaigQHRsxHiuY/GEea+bh4KSv3TIlgr+2UL6bw==}
+  expect-type@1.2.2:
+    resolution: {integrity: sha512-JhFGDVJ7tmDJItKhYgJCGLOWjuK9vPxiXoUFLwLDc99NlmklilbiQJwoctZtt13+xMw91MCk/REan6MWHqDjyA==}
     engines: {node: '>=12.0.0'}
 
   extend@3.0.2:
@@ -4651,6 +4683,10 @@ packages:
     resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
     hasBin: true
 
+  js-yaml@4.1.1:
+    resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}
+    hasBin: true
+
   jsbn@0.1.1:
     resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==}
 
@@ -4881,6 +4917,9 @@ packages:
   magic-string@0.30.17:
     resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==}
 
+  magic-string@0.30.21:
+    resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
+
   magicast@0.3.5:
     resolution: {integrity: sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==}
 
@@ -5623,8 +5662,8 @@ packages:
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
-  rollup@4.50.1:
-    resolution: {integrity: sha512-78E9voJHwnXQMiQdiqswVLZwJIzdBKJ1GdI5Zx6XwoFKUIk09/sSrr+05QFzvYb8q6Y9pPV45zzDuYa3907TZA==}
+  rollup@4.53.3:
+    resolution: {integrity: sha512-w8GmOxZfBmKknvdXU1sdM9NHcoQejwF/4mNgj2JuEEdRaHwwF12K7e9eXn1nLZ07ad+du76mkVsyeb2rKGllsA==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
@@ -5752,8 +5791,8 @@ packages:
   simple-git@3.27.0:
     resolution: {integrity: sha512-ivHoFS9Yi9GY49ogc6/YAi3Fl9ROnF4VyubNylgCkA+RVqLaKWnDSzXOVzya8csELIaWaYNutsEuAhZrtOjozA==}
 
-  sirv@3.0.1:
-    resolution: {integrity: sha512-FoqMu0NCGBLCcAkS1qA+XJIQTR6/JHfQXl+uGteNCQ76T91DMUjPa9xfmeqMY3z80nLSg9yQmNjK0Px6RWsH/A==}
+  sirv@3.0.2:
+    resolution: {integrity: sha512-2wcC/oGxHis/BoHkkPwldgiPSYcpZK3JU28WoMVv55yHJgcZ8rlXvuG9iZggz+sU1d4bRgIGASwyWqjxu3FM0g==}
     engines: {node: '>=18'}
 
   slice-ansi@3.0.0:
@@ -5818,6 +5857,9 @@ packages:
     resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
     engines: {node: '>= 0.8'}
 
+  std-env@3.10.0:
+    resolution: {integrity: sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==}
+
   std-env@3.9.0:
     resolution: {integrity: sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==}
 
@@ -5907,9 +5949,6 @@ packages:
     resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
     engines: {node: '>=8'}
 
-  strip-literal@3.0.0:
-    resolution: {integrity: sha512-TcccoMhJOM3OebGhSBEmp3UZ2SfDMZUEBdRA/9ynfLi8yYajyWX3JiXArcJt4Umh4vISpspkQIY8ZZoCqjbviA==}
-
   stylis@4.2.0:
     resolution: {integrity: sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==}
 
@@ -6004,28 +6043,20 @@ packages:
     resolution: {integrity: sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==}
     engines: {node: '>=12.0.0'}
 
-  tinyglobby@0.2.14:
-    resolution: {integrity: sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==}
-    engines: {node: '>=12.0.0'}
-
   tinyglobby@0.2.15:
     resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==}
     engines: {node: '>=12.0.0'}
 
-  tinypool@1.1.1:
-    resolution: {integrity: sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==}
-    engines: {node: ^18.0.0 || >=20.0.0}
-
   tinyrainbow@2.0.0:
     resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==}
     engines: {node: '>=14.0.0'}
 
-  tinyspy@3.0.2:
-    resolution: {integrity: sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==}
+  tinyrainbow@3.0.3:
+    resolution: {integrity: sha512-PSkbLUoxOFRzJYjjxHJt9xro7D+iilgMX/C9lawzVuYiIdcihh9DXmVibBe8lmcFrRi/VzlPjBxbN7rH24q8/Q==}
     engines: {node: '>=14.0.0'}
 
-  tinyspy@4.0.3:
-    resolution: {integrity: sha512-t2T/WLB2WRgZ9EpE4jgPJ9w+i66UZfDc8wHh0xrwiRNN+UwH98GIJkTeZqX9rg0i0ptwzqW+uYeIF0T4F8LR7A==}
+  tinyspy@3.0.2:
+    resolution: {integrity: sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==}
     engines: {node: '>=14.0.0'}
 
   tldts-core@6.1.61:
@@ -6300,58 +6331,13 @@ packages:
   victory-vendor@36.9.2:
     resolution: {integrity: sha512-PnpQQMuxlwYdocC8fIJqVXvkeViHYzotI+NJrCuav0ZYFoq912ZHBk3mCeuj+5/VpodOjPe1z0Fk2ihgzlXqjQ==}
 
-  vite-node@3.2.4:
-    resolution: {integrity: sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==}
-    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
-    hasBin: true
-
   vite-plugin-svgr@4.5.0:
     resolution: {integrity: sha512-W+uoSpmVkSmNOGPSsDCWVW/DDAyv+9fap9AZXBvWiQqrboJ08j2vh0tFxTD/LjwqwAd3yYSVJgm54S/1GhbdnA==}
     peerDependencies:
       vite: '>=2.6.0'
 
-  vite@7.1.11:
-    resolution: {integrity: sha512-uzcxnSDVjAopEUjljkWh8EIrg6tlzrjFUfMcR1EVsRDGwf/ccef0qQPRyOrROwhrTDaApueq+ja+KLPlzR/zdg==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': ^20.19.0 || >=22.12.0
-      jiti: '>=1.21.0'
-      less: ^4.0.0
-      lightningcss: ^1.21.0
-      sass: ^1.70.0
-      sass-embedded: ^1.70.0
-      stylus: '>=0.54.8'
-      sugarss: ^5.0.0
-      terser: ^5.16.0
-      tsx: ^4.8.1
-      yaml: ^2.3.0
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      jiti:
-        optional: true
-      less:
-        optional: true
-      lightningcss:
-        optional: true
-      sass:
-        optional: true
-      sass-embedded:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
-      tsx:
-        optional: true
-      yaml:
-        optional: true
-
-  vite@7.1.3:
-    resolution: {integrity: sha512-OOUi5zjkDxYrKhTV3V7iKsoS37VUM7v40+HuwEmcrsf11Cdx9y3DIr2Px6liIcZFwt3XSRpQvFpL3WVy7ApkGw==}
+  vite@7.2.2:
+    resolution: {integrity: sha512-BxAKBWmIbrDgrokdGZH1IgkIk/5mMHDreLDmCJ0qpyJaAteP8NvMhkwr/ZCQNqNH97bw/dANTE9PDzqwJghfMQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
@@ -6390,16 +6376,18 @@ packages:
       yaml:
         optional: true
 
-  vitest@3.2.4:
-    resolution: {integrity: sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==}
-    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
+  vitest@4.0.10:
+    resolution: {integrity: sha512-2Fqty3MM9CDwOVet/jaQalYlbcjATZwPYGcqpiYQqgQ/dLC7GuHdISKgTYIVF/kaishKxLzleKWWfbSDklyIKg==}
+    engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0}
     hasBin: true
     peerDependencies:
       '@edge-runtime/vm': '*'
       '@types/debug': ^4.1.12
-      '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0
-      '@vitest/browser': 3.2.4
-      '@vitest/ui': 3.2.4
+      '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0
+      '@vitest/browser-playwright': 4.0.10
+      '@vitest/browser-preview': 4.0.10
+      '@vitest/browser-webdriverio': 4.0.10
+      '@vitest/ui': 4.0.10
       happy-dom: '*'
       jsdom: '*'
     peerDependenciesMeta:
@@ -6409,7 +6397,11 @@ packages:
         optional: true
       '@types/node':
         optional: true
-      '@vitest/browser':
+      '@vitest/browser-playwright':
+        optional: true
+      '@vitest/browser-preview':
+        optional: true
+      '@vitest/browser-webdriverio':
         optional: true
       '@vitest/ui':
         optional: true
@@ -6965,159 +6957,159 @@ snapshots:
 
   '@emotion/weak-memoize@0.4.0': {}
 
+  '@esbuild/aix-ppc64@0.25.12':
+    optional: true
+
   '@esbuild/aix-ppc64@0.25.3':
     optional: true
 
-  '@esbuild/aix-ppc64@0.25.9':
+  '@esbuild/android-arm64@0.25.12':
     optional: true
 
   '@esbuild/android-arm64@0.25.3':
     optional: true
 
-  '@esbuild/android-arm64@0.25.9':
+  '@esbuild/android-arm@0.25.12':
     optional: true
 
   '@esbuild/android-arm@0.25.3':
     optional: true
 
-  '@esbuild/android-arm@0.25.9':
+  '@esbuild/android-x64@0.25.12':
     optional: true
 
   '@esbuild/android-x64@0.25.3':
     optional: true
 
-  '@esbuild/android-x64@0.25.9':
+  '@esbuild/darwin-arm64@0.25.12':
     optional: true
 
   '@esbuild/darwin-arm64@0.25.3':
     optional: true
 
-  '@esbuild/darwin-arm64@0.25.9':
+  '@esbuild/darwin-x64@0.25.12':
     optional: true
 
   '@esbuild/darwin-x64@0.25.3':
     optional: true
 
-  '@esbuild/darwin-x64@0.25.9':
+  '@esbuild/freebsd-arm64@0.25.12':
     optional: true
 
   '@esbuild/freebsd-arm64@0.25.3':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.25.9':
+  '@esbuild/freebsd-x64@0.25.12':
     optional: true
 
   '@esbuild/freebsd-x64@0.25.3':
     optional: true
 
-  '@esbuild/freebsd-x64@0.25.9':
+  '@esbuild/linux-arm64@0.25.12':
     optional: true
 
   '@esbuild/linux-arm64@0.25.3':
     optional: true
 
-  '@esbuild/linux-arm64@0.25.9':
+  '@esbuild/linux-arm@0.25.12':
     optional: true
 
   '@esbuild/linux-arm@0.25.3':
     optional: true
 
-  '@esbuild/linux-arm@0.25.9':
+  '@esbuild/linux-ia32@0.25.12':
     optional: true
 
   '@esbuild/linux-ia32@0.25.3':
     optional: true
 
-  '@esbuild/linux-ia32@0.25.9':
+  '@esbuild/linux-loong64@0.25.12':
     optional: true
 
   '@esbuild/linux-loong64@0.25.3':
     optional: true
 
-  '@esbuild/linux-loong64@0.25.9':
+  '@esbuild/linux-mips64el@0.25.12':
     optional: true
 
   '@esbuild/linux-mips64el@0.25.3':
     optional: true
 
-  '@esbuild/linux-mips64el@0.25.9':
+  '@esbuild/linux-ppc64@0.25.12':
     optional: true
 
   '@esbuild/linux-ppc64@0.25.3':
     optional: true
 
-  '@esbuild/linux-ppc64@0.25.9':
+  '@esbuild/linux-riscv64@0.25.12':
     optional: true
 
   '@esbuild/linux-riscv64@0.25.3':
     optional: true
 
-  '@esbuild/linux-riscv64@0.25.9':
+  '@esbuild/linux-s390x@0.25.12':
     optional: true
 
   '@esbuild/linux-s390x@0.25.3':
     optional: true
 
-  '@esbuild/linux-s390x@0.25.9':
+  '@esbuild/linux-x64@0.25.12':
     optional: true
 
   '@esbuild/linux-x64@0.25.3':
     optional: true
 
-  '@esbuild/linux-x64@0.25.9':
+  '@esbuild/netbsd-arm64@0.25.12':
     optional: true
 
   '@esbuild/netbsd-arm64@0.25.3':
     optional: true
 
-  '@esbuild/netbsd-arm64@0.25.9':
+  '@esbuild/netbsd-x64@0.25.12':
     optional: true
 
   '@esbuild/netbsd-x64@0.25.3':
     optional: true
 
-  '@esbuild/netbsd-x64@0.25.9':
+  '@esbuild/openbsd-arm64@0.25.12':
     optional: true
 
   '@esbuild/openbsd-arm64@0.25.3':
     optional: true
 
-  '@esbuild/openbsd-arm64@0.25.9':
+  '@esbuild/openbsd-x64@0.25.12':
     optional: true
 
   '@esbuild/openbsd-x64@0.25.3':
     optional: true
 
-  '@esbuild/openbsd-x64@0.25.9':
+  '@esbuild/openharmony-arm64@0.25.12':
     optional: true
 
-  '@esbuild/openharmony-arm64@0.25.9':
+  '@esbuild/sunos-x64@0.25.12':
     optional: true
 
   '@esbuild/sunos-x64@0.25.3':
     optional: true
 
-  '@esbuild/sunos-x64@0.25.9':
+  '@esbuild/win32-arm64@0.25.12':
     optional: true
 
   '@esbuild/win32-arm64@0.25.3':
     optional: true
 
-  '@esbuild/win32-arm64@0.25.9':
+  '@esbuild/win32-ia32@0.25.12':
     optional: true
 
   '@esbuild/win32-ia32@0.25.3':
     optional: true
 
-  '@esbuild/win32-ia32@0.25.9':
+  '@esbuild/win32-x64@0.25.12':
     optional: true
 
   '@esbuild/win32-x64@0.25.3':
     optional: true
 
-  '@esbuild/win32-x64@0.25.9':
-    optional: true
-
   '@eslint-community/eslint-utils@4.4.1(eslint@9.31.0(jiti@2.4.2))':
     dependencies:
       eslint: 9.31.0(jiti@2.4.2)
@@ -7350,12 +7342,12 @@ snapshots:
 
   '@istanbuljs/schema@0.1.3': {}
 
-  '@joshwooding/vite-plugin-react-docgen-typescript@0.6.0(typescript@5.7.3)(vite@7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))':
+  '@joshwooding/vite-plugin-react-docgen-typescript@0.6.0(typescript@5.7.3)(vite@7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))':
     dependencies:
       glob: 10.5.0
       magic-string: 0.30.17
       react-docgen-typescript: 2.2.2(typescript@5.7.3)
-      vite: 7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+      vite: 7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
     optionalDependencies:
       typescript: 5.7.3
 
@@ -7664,143 +7656,146 @@ snapshots:
 
   '@rolldown/pluginutils@1.0.0-beta.32': {}
 
-  '@rollup/pluginutils@5.1.3(rollup@4.50.1)':
+  '@rollup/pluginutils@5.1.3(rollup@4.53.3)':
     dependencies:
       '@types/estree': 1.0.7
       estree-walker: 2.0.2
       picomatch: 4.0.3
     optionalDependencies:
-      rollup: 4.50.1
+      rollup: 4.53.3
 
-  '@rollup/pluginutils@5.2.0(rollup@4.50.1)':
+  '@rollup/pluginutils@5.2.0(rollup@4.53.3)':
     dependencies:
       '@types/estree': 1.0.8
       estree-walker: 2.0.2
       picomatch: 4.0.3
     optionalDependencies:
-      rollup: 4.50.1
+      rollup: 4.53.3
 
   '@rollup/rollup-android-arm-eabi@4.40.1':
     optional: true
 
-  '@rollup/rollup-android-arm-eabi@4.50.1':
+  '@rollup/rollup-android-arm-eabi@4.53.3':
     optional: true
 
   '@rollup/rollup-android-arm64@4.40.1':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.50.1':
+  '@rollup/rollup-android-arm64@4.53.3':
     optional: true
 
   '@rollup/rollup-darwin-arm64@4.40.1':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.50.1':
+  '@rollup/rollup-darwin-arm64@4.53.3':
     optional: true
 
   '@rollup/rollup-darwin-x64@4.40.1':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.50.1':
+  '@rollup/rollup-darwin-x64@4.53.3':
     optional: true
 
   '@rollup/rollup-freebsd-arm64@4.40.1':
     optional: true
 
-  '@rollup/rollup-freebsd-arm64@4.50.1':
+  '@rollup/rollup-freebsd-arm64@4.53.3':
     optional: true
 
   '@rollup/rollup-freebsd-x64@4.40.1':
     optional: true
 
-  '@rollup/rollup-freebsd-x64@4.50.1':
+  '@rollup/rollup-freebsd-x64@4.53.3':
     optional: true
 
   '@rollup/rollup-linux-arm-gnueabihf@4.40.1':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.50.1':
+  '@rollup/rollup-linux-arm-gnueabihf@4.53.3':
     optional: true
 
   '@rollup/rollup-linux-arm-musleabihf@4.40.1':
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.50.1':
+  '@rollup/rollup-linux-arm-musleabihf@4.53.3':
     optional: true
 
   '@rollup/rollup-linux-arm64-gnu@4.40.1':
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.50.1':
+  '@rollup/rollup-linux-arm64-gnu@4.53.3':
     optional: true
 
   '@rollup/rollup-linux-arm64-musl@4.40.1':
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.50.1':
+  '@rollup/rollup-linux-arm64-musl@4.53.3':
     optional: true
 
-  '@rollup/rollup-linux-loongarch64-gnu@4.40.1':
+  '@rollup/rollup-linux-loong64-gnu@4.53.3':
     optional: true
 
-  '@rollup/rollup-linux-loongarch64-gnu@4.50.1':
+  '@rollup/rollup-linux-loongarch64-gnu@4.40.1':
     optional: true
 
   '@rollup/rollup-linux-powerpc64le-gnu@4.40.1':
     optional: true
 
-  '@rollup/rollup-linux-ppc64-gnu@4.50.1':
+  '@rollup/rollup-linux-ppc64-gnu@4.53.3':
     optional: true
 
   '@rollup/rollup-linux-riscv64-gnu@4.40.1':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-gnu@4.50.1':
+  '@rollup/rollup-linux-riscv64-gnu@4.53.3':
     optional: true
 
   '@rollup/rollup-linux-riscv64-musl@4.40.1':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-musl@4.50.1':
+  '@rollup/rollup-linux-riscv64-musl@4.53.3':
     optional: true
 
   '@rollup/rollup-linux-s390x-gnu@4.40.1':
     optional: true
 
-  '@rollup/rollup-linux-s390x-gnu@4.50.1':
+  '@rollup/rollup-linux-s390x-gnu@4.53.3':
     optional: true
 
   '@rollup/rollup-linux-x64-gnu@4.40.1':
     optional: true
 
-  '@rollup/rollup-linux-x64-gnu@4.50.1':
+  '@rollup/rollup-linux-x64-gnu@4.53.3':
     optional: true
 
   '@rollup/rollup-linux-x64-musl@4.40.1':
     optional: true
 
-  '@rollup/rollup-linux-x64-musl@4.50.1':
+  '@rollup/rollup-linux-x64-musl@4.53.3':
     optional: true
 
-  '@rollup/rollup-openharmony-arm64@4.50.1':
+  '@rollup/rollup-openharmony-arm64@4.53.3':
     optional: true
 
   '@rollup/rollup-win32-arm64-msvc@4.40.1':
     optional: true
 
-  '@rollup/rollup-win32-arm64-msvc@4.50.1':
+  '@rollup/rollup-win32-arm64-msvc@4.53.3':
     optional: true
 
   '@rollup/rollup-win32-ia32-msvc@4.40.1':
     optional: true
 
-  '@rollup/rollup-win32-ia32-msvc@4.50.1':
+  '@rollup/rollup-win32-ia32-msvc@4.53.3':
+    optional: true
+
+  '@rollup/rollup-win32-x64-gnu@4.53.3':
     optional: true
 
   '@rollup/rollup-win32-x64-msvc@4.40.1':
     optional: true
 
-  '@rollup/rollup-win32-x64-msvc@4.50.1':
+  '@rollup/rollup-win32-x64-msvc@4.53.3':
     optional: true
 
   '@sentry-internal/browser-utils@9.19.0':
@@ -7871,6 +7866,8 @@ snapshots:
 
   '@shikijs/vscode-textmate@10.0.2': {}
 
+  '@standard-schema/spec@1.0.0': {}
+
   '@storybook/addon-a11y@9.0.12(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))':
     dependencies:
       '@storybook/global': 5.0.0
@@ -7890,12 +7887,12 @@ snapshots:
     transitivePeerDependencies:
       - '@types/react'
 
-  '@storybook/builder-vite@9.0.12(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(vite@7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))':
+  '@storybook/builder-vite@9.0.12(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(vite@7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))':
     dependencies:
       '@storybook/csf-plugin': 9.0.12(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))
       storybook: 9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3)
       ts-dedent: 2.2.0
-      vite: 7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+      vite: 7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
 
   '@storybook/csf-plugin@9.0.12(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))':
     dependencies:
@@ -7920,11 +7917,11 @@ snapshots:
       react-dom: 19.1.0(react@19.1.0)
       storybook: 9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3)
 
-  '@storybook/react-vite@9.0.12(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(rollup@4.50.1)(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(typescript@5.7.3)(vite@7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))':
+  '@storybook/react-vite@9.0.12(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(rollup@4.53.3)(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(typescript@5.7.3)(vite@7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))':
     dependencies:
-      '@joshwooding/vite-plugin-react-docgen-typescript': 0.6.0(typescript@5.7.3)(vite@7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
-      '@rollup/pluginutils': 5.1.3(rollup@4.50.1)
-      '@storybook/builder-vite': 9.0.12(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(vite@7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
+      '@joshwooding/vite-plugin-react-docgen-typescript': 0.6.0(typescript@5.7.3)(vite@7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
+      '@rollup/pluginutils': 5.1.3(rollup@4.53.3)
+      '@storybook/builder-vite': 9.0.12(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(vite@7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
       '@storybook/react': 9.0.12(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(typescript@5.7.3)
       find-up: 7.0.0
       magic-string: 0.30.17
@@ -7934,7 +7931,7 @@ snapshots:
       resolve: 1.22.8
       storybook: 9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3)
       tsconfig-paths: 4.2.0
-      vite: 7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+      vite: 7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -8602,15 +8599,15 @@ snapshots:
 
   '@ungap/structured-clone@1.3.0': {}
 
-  '@vitejs/plugin-react-swc@4.0.1(vite@7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))':
+  '@vitejs/plugin-react-swc@4.0.1(vite@7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))':
     dependencies:
       '@rolldown/pluginutils': 1.0.0-beta.32
       '@swc/core': 1.13.5
-      vite: 7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+      vite: 7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
     transitivePeerDependencies:
       - '@swc/helpers'
 
-  '@vitest/coverage-v8@3.2.4(vitest@3.2.4)':
+  '@vitest/coverage-v8@3.2.4(vitest@4.0.10)':
     dependencies:
       '@ampproject/remapping': 2.3.0
       '@bcoe/v8-coverage': 1.0.2
@@ -8625,7 +8622,7 @@ snapshots:
       std-env: 3.9.0
       test-exclude: 7.0.1
       tinyrainbow: 2.0.0
-      vitest: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.1)(@vitest/ui@3.2.4)(jiti@2.4.2)(jsdom@24.1.3)(msw@2.6.5(@types/node@22.18.1)(typescript@5.7.3))(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+      vitest: 4.0.10(@types/debug@4.1.12)(@types/node@22.18.1)(@vitest/ui@4.0.10)(jiti@2.4.2)(jsdom@24.1.3)(msw@2.6.5(@types/node@22.18.1)(typescript@5.7.3))(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -8636,61 +8633,59 @@ snapshots:
       chai: 5.2.0
       tinyrainbow: 2.0.0
 
-  '@vitest/expect@3.2.4':
+  '@vitest/expect@4.0.10':
     dependencies:
+      '@standard-schema/spec': 1.0.0
       '@types/chai': 5.2.2
-      '@vitest/spy': 3.2.4
-      '@vitest/utils': 3.2.4
-      chai: 5.2.0
-      tinyrainbow: 2.0.0
+      '@vitest/spy': 4.0.10
+      '@vitest/utils': 4.0.10
+      chai: 6.2.1
+      tinyrainbow: 3.0.3
 
-  '@vitest/mocker@3.2.4(msw@2.6.5(@types/node@22.18.1)(typescript@5.7.3))(vite@7.1.3(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))':
+  '@vitest/mocker@4.0.10(msw@2.6.5(@types/node@22.18.1)(typescript@5.7.3))(vite@7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))':
     dependencies:
-      '@vitest/spy': 3.2.4
+      '@vitest/spy': 4.0.10
       estree-walker: 3.0.3
-      magic-string: 0.30.17
+      magic-string: 0.30.21
     optionalDependencies:
       msw: 2.6.5(@types/node@22.18.1)(typescript@5.7.3)
-      vite: 7.1.3(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+      vite: 7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
 
   '@vitest/pretty-format@3.0.9':
     dependencies:
       tinyrainbow: 2.0.0
 
-  '@vitest/pretty-format@3.2.4':
+  '@vitest/pretty-format@4.0.10':
     dependencies:
-      tinyrainbow: 2.0.0
+      tinyrainbow: 3.0.3
 
-  '@vitest/runner@3.2.4':
+  '@vitest/runner@4.0.10':
     dependencies:
-      '@vitest/utils': 3.2.4
+      '@vitest/utils': 4.0.10
       pathe: 2.0.3
-      strip-literal: 3.0.0
 
-  '@vitest/snapshot@3.2.4':
+  '@vitest/snapshot@4.0.10':
     dependencies:
-      '@vitest/pretty-format': 3.2.4
-      magic-string: 0.30.17
+      '@vitest/pretty-format': 4.0.10
+      magic-string: 0.30.21
       pathe: 2.0.3
 
   '@vitest/spy@3.0.9':
     dependencies:
       tinyspy: 3.0.2
 
-  '@vitest/spy@3.2.4':
-    dependencies:
-      tinyspy: 4.0.3
+  '@vitest/spy@4.0.10': {}
 
-  '@vitest/ui@3.2.4(vitest@3.2.4)':
+  '@vitest/ui@4.0.10(vitest@4.0.10)':
     dependencies:
-      '@vitest/utils': 3.2.4
+      '@vitest/utils': 4.0.10
       fflate: 0.8.2
       flatted: 3.3.3
       pathe: 2.0.3
-      sirv: 3.0.1
-      tinyglobby: 0.2.14
-      tinyrainbow: 2.0.0
-      vitest: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.1)(@vitest/ui@3.2.4)(jiti@2.4.2)(jsdom@24.1.3)(msw@2.6.5(@types/node@22.18.1)(typescript@5.7.3))(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+      sirv: 3.0.2
+      tinyglobby: 0.2.15
+      tinyrainbow: 3.0.3
+      vitest: 4.0.10(@types/debug@4.1.12)(@types/node@22.18.1)(@vitest/ui@4.0.10)(jiti@2.4.2)(jsdom@24.1.3)(msw@2.6.5(@types/node@22.18.1)(typescript@5.7.3))(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
 
   '@vitest/utils@3.0.9':
     dependencies:
@@ -8698,11 +8693,10 @@ snapshots:
       loupe: 3.1.3
       tinyrainbow: 2.0.0
 
-  '@vitest/utils@3.2.4':
+  '@vitest/utils@4.0.10':
     dependencies:
-      '@vitest/pretty-format': 3.2.4
-      loupe: 3.2.1
-      tinyrainbow: 2.0.0
+      '@vitest/pretty-format': 4.0.10
+      tinyrainbow: 3.0.3
 
   '@vueless/storybook-dark-mode@9.0.5(react-dom@19.1.0(react@19.1.0))(react@19.1.0)':
     dependencies:
@@ -8931,6 +8925,8 @@ snapshots:
 
   balanced-match@1.0.2: {}
 
+  balanced-match@3.0.1: {}
+
   base64-arraybuffer@1.0.2:
     optional: true
 
@@ -8954,6 +8950,10 @@ snapshots:
     dependencies:
       balanced-match: 1.0.2
 
+  brace-expansion@4.0.1:
+    dependencies:
+      balanced-match: 3.0.1
+
   braces@3.0.3:
     dependencies:
       fill-range: 7.1.1
@@ -9052,9 +9052,9 @@ snapshots:
 
   ccount@2.0.1: {}
 
-  chai-string@1.5.0(chai@5.2.0):
+  chai-string@1.5.0(chai@6.2.1):
     dependencies:
-      chai: 5.2.0
+      chai: 6.2.1
 
   chai@5.2.0:
     dependencies:
@@ -9064,6 +9064,8 @@ snapshots:
       loupe: 3.2.1
       pathval: 2.0.0
 
+  chai@6.2.1: {}
+
   chalk@3.0.0:
     dependencies:
       ansi-styles: 4.3.0
@@ -9326,11 +9328,11 @@ snapshots:
     dependencies:
       cypress: 15.4.0
 
-  cypress-vite@1.8.0(vite@7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)):
+  cypress-vite@1.8.0(vite@7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)):
     dependencies:
       chokidar: 3.6.0
       debug: 4.4.1(supports-color@8.1.1)
-      vite: 7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+      vite: 7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -9467,6 +9469,12 @@ snapshots:
     optionalDependencies:
       supports-color: 8.1.1
 
+  debug@4.4.3(supports-color@8.1.1):
+    dependencies:
+      ms: 2.1.3
+    optionalDependencies:
+      supports-color: 8.1.1
+
   decamelize@1.2.0: {}
 
   decamelize@4.0.0: {}
@@ -9685,6 +9693,35 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  esbuild@0.25.12:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.25.12
+      '@esbuild/android-arm': 0.25.12
+      '@esbuild/android-arm64': 0.25.12
+      '@esbuild/android-x64': 0.25.12
+      '@esbuild/darwin-arm64': 0.25.12
+      '@esbuild/darwin-x64': 0.25.12
+      '@esbuild/freebsd-arm64': 0.25.12
+      '@esbuild/freebsd-x64': 0.25.12
+      '@esbuild/linux-arm': 0.25.12
+      '@esbuild/linux-arm64': 0.25.12
+      '@esbuild/linux-ia32': 0.25.12
+      '@esbuild/linux-loong64': 0.25.12
+      '@esbuild/linux-mips64el': 0.25.12
+      '@esbuild/linux-ppc64': 0.25.12
+      '@esbuild/linux-riscv64': 0.25.12
+      '@esbuild/linux-s390x': 0.25.12
+      '@esbuild/linux-x64': 0.25.12
+      '@esbuild/netbsd-arm64': 0.25.12
+      '@esbuild/netbsd-x64': 0.25.12
+      '@esbuild/openbsd-arm64': 0.25.12
+      '@esbuild/openbsd-x64': 0.25.12
+      '@esbuild/openharmony-arm64': 0.25.12
+      '@esbuild/sunos-x64': 0.25.12
+      '@esbuild/win32-arm64': 0.25.12
+      '@esbuild/win32-ia32': 0.25.12
+      '@esbuild/win32-x64': 0.25.12
+
   esbuild@0.25.3:
     optionalDependencies:
       '@esbuild/aix-ppc64': 0.25.3
@@ -9713,35 +9750,6 @@ snapshots:
       '@esbuild/win32-ia32': 0.25.3
       '@esbuild/win32-x64': 0.25.3
 
-  esbuild@0.25.9:
-    optionalDependencies:
-      '@esbuild/aix-ppc64': 0.25.9
-      '@esbuild/android-arm': 0.25.9
-      '@esbuild/android-arm64': 0.25.9
-      '@esbuild/android-x64': 0.25.9
-      '@esbuild/darwin-arm64': 0.25.9
-      '@esbuild/darwin-x64': 0.25.9
-      '@esbuild/freebsd-arm64': 0.25.9
-      '@esbuild/freebsd-x64': 0.25.9
-      '@esbuild/linux-arm': 0.25.9
-      '@esbuild/linux-arm64': 0.25.9
-      '@esbuild/linux-ia32': 0.25.9
-      '@esbuild/linux-loong64': 0.25.9
-      '@esbuild/linux-mips64el': 0.25.9
-      '@esbuild/linux-ppc64': 0.25.9
-      '@esbuild/linux-riscv64': 0.25.9
-      '@esbuild/linux-s390x': 0.25.9
-      '@esbuild/linux-x64': 0.25.9
-      '@esbuild/netbsd-arm64': 0.25.9
-      '@esbuild/netbsd-x64': 0.25.9
-      '@esbuild/openbsd-arm64': 0.25.9
-      '@esbuild/openbsd-x64': 0.25.9
-      '@esbuild/openharmony-arm64': 0.25.9
-      '@esbuild/sunos-x64': 0.25.9
-      '@esbuild/win32-arm64': 0.25.9
-      '@esbuild/win32-ia32': 0.25.9
-      '@esbuild/win32-x64': 0.25.9
-
   escalade@3.2.0: {}
 
   escape-html@1.0.3: {}
@@ -9967,7 +9975,7 @@ snapshots:
     dependencies:
       pify: 2.3.0
 
-  expect-type@1.2.1: {}
+  expect-type@1.2.2: {}
 
   extend@3.0.2: {}
 
@@ -10026,10 +10034,6 @@ snapshots:
     optionalDependencies:
       picomatch: 4.0.2
 
-  fdir@6.4.4(picomatch@4.0.3):
-    optionalDependencies:
-      picomatch: 4.0.3
-
   fdir@6.5.0(picomatch@4.0.3):
     optionalDependencies:
       picomatch: 4.0.3
@@ -10638,6 +10642,10 @@ snapshots:
     dependencies:
       argparse: 2.0.1
 
+  js-yaml@4.1.1:
+    dependencies:
+      argparse: 2.0.1
+
   jsbn@0.1.1: {}
 
   jsdom@24.1.3:
@@ -10912,6 +10920,10 @@ snapshots:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.0
 
+  magic-string@0.30.21:
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.5
+
   magicast@0.3.5:
     dependencies:
       '@babel/parser': 7.27.0
@@ -11005,7 +11017,7 @@ snapshots:
 
   minimatch@5.1.6:
     dependencies:
-      brace-expansion: 2.0.2
+      brace-expansion: 4.0.1
 
   minimatch@9.0.5:
     dependencies:
@@ -11033,13 +11045,13 @@ snapshots:
       ansi-colors: 4.1.3
       browser-stdout: 1.3.1
       chokidar: 3.6.0
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.3(supports-color@8.1.1)
       diff: 5.2.0
       escape-string-regexp: 4.0.0
       find-up: 5.0.0
       glob: 8.1.0
       he: 1.2.0
-      js-yaml: 4.1.0
+      js-yaml: 4.1.1
       log-symbols: 4.1.0
       minimatch: 5.1.6
       ms: 2.1.3
@@ -11709,31 +11721,32 @@ snapshots:
       '@rollup/rollup-win32-x64-msvc': 4.40.1
       fsevents: 2.3.3
 
-  rollup@4.50.1:
+  rollup@4.53.3:
     dependencies:
       '@types/estree': 1.0.8
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.50.1
-      '@rollup/rollup-android-arm64': 4.50.1
-      '@rollup/rollup-darwin-arm64': 4.50.1
-      '@rollup/rollup-darwin-x64': 4.50.1
-      '@rollup/rollup-freebsd-arm64': 4.50.1
-      '@rollup/rollup-freebsd-x64': 4.50.1
-      '@rollup/rollup-linux-arm-gnueabihf': 4.50.1
-      '@rollup/rollup-linux-arm-musleabihf': 4.50.1
-      '@rollup/rollup-linux-arm64-gnu': 4.50.1
-      '@rollup/rollup-linux-arm64-musl': 4.50.1
-      '@rollup/rollup-linux-loongarch64-gnu': 4.50.1
-      '@rollup/rollup-linux-ppc64-gnu': 4.50.1
-      '@rollup/rollup-linux-riscv64-gnu': 4.50.1
-      '@rollup/rollup-linux-riscv64-musl': 4.50.1
-      '@rollup/rollup-linux-s390x-gnu': 4.50.1
-      '@rollup/rollup-linux-x64-gnu': 4.50.1
-      '@rollup/rollup-linux-x64-musl': 4.50.1
-      '@rollup/rollup-openharmony-arm64': 4.50.1
-      '@rollup/rollup-win32-arm64-msvc': 4.50.1
-      '@rollup/rollup-win32-ia32-msvc': 4.50.1
-      '@rollup/rollup-win32-x64-msvc': 4.50.1
+      '@rollup/rollup-android-arm-eabi': 4.53.3
+      '@rollup/rollup-android-arm64': 4.53.3
+      '@rollup/rollup-darwin-arm64': 4.53.3
+      '@rollup/rollup-darwin-x64': 4.53.3
+      '@rollup/rollup-freebsd-arm64': 4.53.3
+      '@rollup/rollup-freebsd-x64': 4.53.3
+      '@rollup/rollup-linux-arm-gnueabihf': 4.53.3
+      '@rollup/rollup-linux-arm-musleabihf': 4.53.3
+      '@rollup/rollup-linux-arm64-gnu': 4.53.3
+      '@rollup/rollup-linux-arm64-musl': 4.53.3
+      '@rollup/rollup-linux-loong64-gnu': 4.53.3
+      '@rollup/rollup-linux-ppc64-gnu': 4.53.3
+      '@rollup/rollup-linux-riscv64-gnu': 4.53.3
+      '@rollup/rollup-linux-riscv64-musl': 4.53.3
+      '@rollup/rollup-linux-s390x-gnu': 4.53.3
+      '@rollup/rollup-linux-x64-gnu': 4.53.3
+      '@rollup/rollup-linux-x64-musl': 4.53.3
+      '@rollup/rollup-openharmony-arm64': 4.53.3
+      '@rollup/rollup-win32-arm64-msvc': 4.53.3
+      '@rollup/rollup-win32-ia32-msvc': 4.53.3
+      '@rollup/rollup-win32-x64-gnu': 4.53.3
+      '@rollup/rollup-win32-x64-msvc': 4.53.3
       fsevents: 2.3.3
 
   rrweb-cssom@0.7.1: {}
@@ -11891,7 +11904,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  sirv@3.0.1:
+  sirv@3.0.2:
     dependencies:
       '@polka/url': 1.0.0-next.28
       mrmime: 2.0.0
@@ -11962,6 +11975,8 @@ snapshots:
 
   statuses@2.0.1: {}
 
+  std-env@3.10.0: {}
+
   std-env@3.9.0: {}
 
   storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3):
@@ -12086,10 +12101,6 @@ snapshots:
 
   strip-json-comments@3.1.1: {}
 
-  strip-literal@3.0.0:
-    dependencies:
-      js-tokens: 9.0.1
-
   stylis@4.2.0: {}
 
   sucrase@3.35.0:
@@ -12180,23 +12191,16 @@ snapshots:
       fdir: 6.4.4(picomatch@4.0.2)
       picomatch: 4.0.2
 
-  tinyglobby@0.2.14:
-    dependencies:
-      fdir: 6.4.4(picomatch@4.0.3)
-      picomatch: 4.0.3
-
   tinyglobby@0.2.15:
     dependencies:
       fdir: 6.5.0(picomatch@4.0.3)
       picomatch: 4.0.3
 
-  tinypool@1.1.1: {}
-
   tinyrainbow@2.0.0: {}
 
-  tinyspy@3.0.2: {}
+  tinyrainbow@3.0.3: {}
 
-  tinyspy@4.0.3: {}
+  tinyspy@3.0.2: {}
 
   tldts-core@6.1.61: {}
 
@@ -12489,61 +12493,24 @@ snapshots:
       d3-time: 3.1.0
       d3-timer: 3.0.1
 
-  vite-node@3.2.4(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1):
-    dependencies:
-      cac: 6.7.14
-      debug: 4.4.1(supports-color@8.1.1)
-      es-module-lexer: 1.7.0
-      pathe: 2.0.3
-      vite: 7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
-    transitivePeerDependencies:
-      - '@types/node'
-      - jiti
-      - less
-      - lightningcss
-      - sass
-      - sass-embedded
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-      - tsx
-      - yaml
-
-  vite-plugin-svgr@4.5.0(rollup@4.50.1)(typescript@5.7.3)(vite@7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)):
+  vite-plugin-svgr@4.5.0(rollup@4.53.3)(typescript@5.7.3)(vite@7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)):
     dependencies:
-      '@rollup/pluginutils': 5.2.0(rollup@4.50.1)
+      '@rollup/pluginutils': 5.2.0(rollup@4.53.3)
       '@svgr/core': 8.1.0(typescript@5.7.3)
       '@svgr/plugin-jsx': 8.1.0(@svgr/core@8.1.0(typescript@5.7.3))
-      vite: 7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+      vite: 7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
     transitivePeerDependencies:
       - rollup
       - supports-color
       - typescript
 
-  vite@7.1.11(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1):
-    dependencies:
-      esbuild: 0.25.9
-      fdir: 6.5.0(picomatch@4.0.3)
-      picomatch: 4.0.3
-      postcss: 8.5.6
-      rollup: 4.50.1
-      tinyglobby: 0.2.15
-    optionalDependencies:
-      '@types/node': 22.18.1
-      fsevents: 2.3.3
-      jiti: 2.4.2
-      terser: 5.36.0
-      tsx: 4.19.3
-      yaml: 2.6.1
-
-  vite@7.1.3(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1):
+  vite@7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1):
     dependencies:
-      esbuild: 0.25.9
+      esbuild: 0.25.12
       fdir: 6.5.0(picomatch@4.0.3)
       picomatch: 4.0.3
       postcss: 8.5.6
-      rollup: 4.50.1
+      rollup: 4.53.3
       tinyglobby: 0.2.15
     optionalDependencies:
       '@types/node': 22.18.1
@@ -12553,35 +12520,32 @@ snapshots:
       tsx: 4.19.3
       yaml: 2.6.1
 
-  vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.18.1)(@vitest/ui@3.2.4)(jiti@2.4.2)(jsdom@24.1.3)(msw@2.6.5(@types/node@22.18.1)(typescript@5.7.3))(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1):
+  vitest@4.0.10(@types/debug@4.1.12)(@types/node@22.18.1)(@vitest/ui@4.0.10)(jiti@2.4.2)(jsdom@24.1.3)(msw@2.6.5(@types/node@22.18.1)(typescript@5.7.3))(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1):
     dependencies:
-      '@types/chai': 5.2.2
-      '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(msw@2.6.5(@types/node@22.18.1)(typescript@5.7.3))(vite@7.1.3(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
-      '@vitest/pretty-format': 3.2.4
-      '@vitest/runner': 3.2.4
-      '@vitest/snapshot': 3.2.4
-      '@vitest/spy': 3.2.4
-      '@vitest/utils': 3.2.4
-      chai: 5.2.0
-      debug: 4.4.1(supports-color@8.1.1)
-      expect-type: 1.2.1
-      magic-string: 0.30.17
+      '@vitest/expect': 4.0.10
+      '@vitest/mocker': 4.0.10(msw@2.6.5(@types/node@22.18.1)(typescript@5.7.3))(vite@7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
+      '@vitest/pretty-format': 4.0.10
+      '@vitest/runner': 4.0.10
+      '@vitest/snapshot': 4.0.10
+      '@vitest/spy': 4.0.10
+      '@vitest/utils': 4.0.10
+      debug: 4.4.3(supports-color@8.1.1)
+      es-module-lexer: 1.7.0
+      expect-type: 1.2.2
+      magic-string: 0.30.21
       pathe: 2.0.3
       picomatch: 4.0.3
-      std-env: 3.9.0
+      std-env: 3.10.0
       tinybench: 2.9.0
       tinyexec: 0.3.2
       tinyglobby: 0.2.15
-      tinypool: 1.1.1
-      tinyrainbow: 2.0.0
-      vite: 7.1.3(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
-      vite-node: 3.2.4(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+      tinyrainbow: 3.0.3
+      vite: 7.2.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/debug': 4.1.12
       '@types/node': 22.18.1
-      '@vitest/ui': 3.2.4(vitest@3.2.4)
+      '@vitest/ui': 4.0.10(vitest@4.0.10)
       jsdom: 24.1.3
     transitivePeerDependencies:
       - jiti
diff --git a/vitest.config.ts b/vitest.config.ts
new file mode 100644
index 00000000000..838d14d7957
--- /dev/null
+++ b/vitest.config.ts
@@ -0,0 +1,14 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    projects: [
+      "packages/api-v4",
+      "packages/manager",
+      "packages/search",
+      "packages/shared",
+      "packages/ui",
+      "packages/utilities",
+    ],
+  },
+});
diff --git a/vitest.workspace.ts b/vitest.workspace.ts
deleted file mode 100644
index d54bb838a3a..00000000000
--- a/vitest.workspace.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export default [
-  "packages/api-v4",
-  "packages/manager",
-  "packages/search",
-  "packages/shared",
-  "packages/ui",
-  "packages/utilities",
-];

From 3660a040f6d767d30d1e67cf2259e3d69df5cbcb Mon Sep 17 00:00:00 2001
From: Purvesh Makode <pmakode@akamai.com>
Date: Tue, 25 Nov 2025 14:27:32 +0530
Subject: [PATCH 37/91] upcoming: [UIE-9512, UIE-9530] - New Rule Set Details
 Drawer with Marked for Deletion status (#13108)

* Save progress

* Update tests

* Few more changes

* Add more changes

* Clean up tests

* Few changes

* Layout updates

* Update tests

* Add ruleset loading state

* Clean up mocks

* Fix mocks

* Add comments to the type

* Added changeset: Update FirewallRuleType to support ruleset

* Added changeset: Update FirewallRuleTypeSchema to support ruleset

* Added changeset: Add new Firewall RuleSet row layout

* Update ruleset action text - Delete to Remove

* Save progress...

* Update comment

* Exclude 'addresses' from rulesets reference payloads

* Some fixes

* Add more details to the drawer for rulset

* More changes...

* Move Action column and improve table responsiveness for long labels

* Update Cypress component test

* Add more changes to the drawer for rulesets

* Update gap & fontsize of firwall add rules selection card

* Fix Chip shrink issue

* Revert Action column movement since its not yet confirmed

* More Refactoring + better formstate typesaftey

* Add renderOptions for Add ruleset Autocomplete

* Fix typos

* Few updates

* Few fixes

* Update cypress component tests

* More changes

* Update Add rulesets button copy

* More Updates

* Feature flag create entity selection for ruleset

* More refactoring - separating form states

* Add ruleset details drawer

* Some clean up...

* Save progress

* Add more changes

* Show only rulsets in dropdown applicable to the given catergory

* Update Date format and some minor changes

* Update mark for deletion date format

* Update date format

* Update badge color tokens

* Capitalize action label in chip

* Update Chip width

* Added changeset: Update Firewall Rule Drawer to support referencing Rule Set

* Use right color tokens for badge

* Update placeholder for Select Rule Set

* Some clean up

* Few updates and clean up

* Make cy test work

* Clean up: remove duplicate validation

* Add cancel btn for rules form + some design tokens for dropdown options

* Add cancel btn and some styling fixes

* Add mocks for Marked for deletion status

* Add unit tests for Add Rule Set Drawer

* Update test title

* Mock useIsFirewallRulesetsPrefixlistsEnabled instead of feature flag

* Fix styling and a bit of clean up

* Clean up and refactor

* Minor styling fixes

* Add unit tests

* Add omitted props for StyledListItem

* Added changeset: New Rule Set Details drawer with Marked for Deletion status

* Some clean up

* Update unit tests

* Fix typo

* Make Rule Drawer accessible via routes

* Improve tests

* Add error state

* Mock getUserTimezone

* Some Clean up and allow route-based access only for view and create modes

* Few changes
---
 ...r-13108-upcoming-features-1763746838424.md |   5 +
 .../Rules/FirewallRuleDrawer.test.tsx         | 117 ++++++++++-
 .../Rules/FirewallRuleDrawer.tsx              |  54 +++--
 .../Rules/FirewallRuleDrawer.types.ts         |   4 +-
 .../Rules/FirewallRuleSetDetailsView.tsx      | 196 ++++++++++++++++++
 .../Rules/FirewallRuleTable.tsx               |  29 ++-
 .../Rules/FirewallRulesLanding.tsx            | 141 ++++++++++---
 .../FirewallDetail/Rules/shared.styles.ts     |  67 +++++-
 .../Firewalls/FirewallDetail/Rules/shared.ts  |   3 +
 packages/manager/src/mocks/serverHandlers.ts  |   6 +-
 .../manager/src/routes/firewalls/index.ts     |  10 +
 11 files changed, 562 insertions(+), 70 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13108-upcoming-features-1763746838424.md
 create mode 100644 packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetDetailsView.tsx

diff --git a/packages/manager/.changeset/pr-13108-upcoming-features-1763746838424.md b/packages/manager/.changeset/pr-13108-upcoming-features-1763746838424.md
new file mode 100644
index 00000000000..cd7c25bc363
--- /dev/null
+++ b/packages/manager/.changeset/pr-13108-upcoming-features-1763746838424.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+New Rule Set Details drawer with Marked for Deletion status ([#13108](https://github.com/linode/manager/pull/13108))
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
index 10f2c67b2a6..f9c1ab27b22 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
@@ -1,6 +1,8 @@
+import { capitalize } from '@linode/utilities';
 import userEvent from '@testing-library/user-event';
 import * as React from 'react';
 
+import { firewallRuleSetFactory } from 'src/factories';
 import { allIPs } from 'src/features/Firewalls/shared';
 import { stringToExtendedIP } from 'src/utilities/ipUtils';
 import { renderWithTheme } from 'src/utilities/testHelpers';
@@ -18,12 +20,35 @@ import {
   validateForm,
   validateIPs,
 } from './FirewallRuleDrawer.utils';
-import { PORT_PRESETS } from './shared';
+import { PORT_PRESETS, RULESET_MARKED_FOR_DELETION_TEXT } from './shared';
 
 import type { FirewallRuleDrawerProps } from './FirewallRuleDrawer.types';
 import type { ExtendedFirewallRule } from './firewallRuleEditor';
-import type { FirewallRuleError } from './shared';
-import type { FirewallPolicyType } from '@linode/api-v4/lib/firewalls/types';
+import type { Category, FirewallRuleError } from './shared';
+import type {
+  FirewallPolicyType,
+  FirewallRuleSet,
+} from '@linode/api-v4/lib/firewalls/types';
+
+const queryMocks = vi.hoisted(() => ({
+  useFirewallRuleSetQuery: vi.fn().mockReturnValue({}),
+}));
+
+vi.mock('@linode/queries', async () => {
+  const actual = await vi.importActual('@linode/queries');
+  return {
+    ...actual,
+    useFirewallRuleSetQuery: queryMocks.useFirewallRuleSetQuery,
+  };
+});
+
+vi.mock('@linode/utilities', async () => {
+  const actual = await vi.importActual('@linode/utilities');
+  return {
+    ...actual,
+    getUserTimezone: vi.fn().mockReturnValue('utc'),
+  };
+});
 
 const mockOnClose = vi.fn();
 const mockOnSubmit = vi.fn();
@@ -144,6 +169,92 @@ describe('AddRuleSetDrawer', () => {
   });
 });
 
+describe('ViewRuleSetDetailsDrawer', () => {
+  beforeEach(() => {
+    spy.mockReturnValue({ isFirewallRulesetsPrefixlistsEnabled: true });
+  });
+
+  const activeRuleSet = firewallRuleSetFactory.build({ id: 123 });
+  const deletedRuleSet = firewallRuleSetFactory.build({
+    id: 456,
+    deleted: '2025-07-24T04:23:17',
+  });
+
+  it.each([
+    ['inbound', activeRuleSet],
+    ['outbound', activeRuleSet],
+    ['inbound', deletedRuleSet],
+    ['outbound', deletedRuleSet],
+  ] as [Category, FirewallRuleSet][])(
+    'renders %s ruleset drawer (%s)',
+    async (category, mockData) => {
+      queryMocks.useFirewallRuleSetQuery.mockReturnValue({
+        data: mockData,
+        isFetching: false,
+        error: null,
+      });
+
+      const { getByText, getByRole, getByTestId, findByText, queryByText } =
+        renderWithTheme(
+          <FirewallRuleDrawer
+            {...props}
+            category={category}
+            mode="view"
+            ruleToModifyOrView={{
+              ruleset: mockData.id,
+              originalIndex: 0,
+              status: 'NEW',
+            }}
+          />
+        );
+
+      // Drawer title
+      expect(
+        getByText(`${capitalize(category)} Rule Set details`)
+      ).toBeVisible();
+
+      // Labels
+      const labels = [
+        'Label',
+        'ID',
+        'Description',
+        'Service Defined',
+        'Version',
+        'Created',
+        'Updated',
+      ];
+      labels.forEach((label) => expect(getByText(`${label}:`)).toBeVisible());
+
+      // Check ID value
+      expect(getByText(`${mockData.id}`)).toBeVisible();
+
+      if (mockData.deleted) {
+        // Marked for deletion status section
+        expect(getByText('Marked for deletion:')).toBeVisible();
+        expect(getByText('2025-07-24 04:23')).toBeVisible();
+        // Tooltip icon should exist
+        const tooltipIcon = getByTestId('tooltip-info-icon');
+        expect(tooltipIcon).toBeInTheDocument();
+
+        // Tooltip text should exist
+        await userEvent.hover(tooltipIcon);
+        expect(
+          await findByText(RULESET_MARKED_FOR_DELETION_TEXT)
+        ).toBeVisible();
+      } else {
+        // Marked for deletion status section should not exist
+        expect(queryByText('Marked for deletion:')).not.toBeInTheDocument();
+      }
+
+      // Rules section
+      expect(getByText(`${capitalize(category)} Rules`)).toBeVisible();
+
+      // Cancel button
+      expect(getByRole('button', { name: 'Cancel' })).toBeVisible();
+    }
+  );
+});
+
 describe('utilities', () => {
   describe('formValueToIPs', () => {
     it('returns a complete set of IPs given a string form value', () => {
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
index cdf612bef2c..5000f6c192f 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
@@ -6,10 +6,7 @@ import * as React from 'react';
 
 import { SelectionCard } from 'src/components/SelectionCard/SelectionCard';
 
-import {
-  type FirewallOptionItem,
-  useIsFirewallRulesetsPrefixlistsEnabled,
-} from '../../shared';
+import { useIsFirewallRulesetsPrefixlistsEnabled } from '../../shared';
 import {
   formValueToIPs,
   getInitialFormValues,
@@ -20,9 +17,11 @@ import {
   validateIPs,
 } from './FirewallRuleDrawer.utils';
 import { FirewallRuleForm } from './FirewallRuleForm';
+import { FirewallRuleSetDetailsView } from './FirewallRuleSetDetailsView';
 import { FirewallRuleSetForm } from './FirewallRuleSetForm';
 import { firewallRuleCreateOptions } from './shared';
 
+import type { FirewallOptionItem } from '../../shared';
 import type {
   FirewallCreateEntityType,
   FirewallRuleDrawerProps,
@@ -40,7 +39,7 @@ import type { ExtendedIP } from 'src/utilities/ipUtils';
 // =============================================================================
 export const FirewallRuleDrawer = React.memo(
   (props: FirewallRuleDrawerProps) => {
-    const { category, isOpen, mode, onClose, ruleToModify } = props;
+    const { category, isOpen, mode, onClose, ruleToModifyOrView } = props;
 
     const { isFirewallRulesetsPrefixlistsEnabled } =
       useIsFirewallRulesetsPrefixlistsEnabled();
@@ -69,9 +68,9 @@ export const FirewallRuleDrawer = React.memo(
     React.useEffect(() => {
       // Reset state. If we're in EDIT mode, set IPs to the addresses of the rule we're modifying
       // (along with any errors we may have).
-      if (mode === 'edit' && ruleToModify) {
-        setIPs(getInitialIPs(ruleToModify));
-        setPresetPorts(portStringToItems(ruleToModify.ports)[0]);
+      if (mode === 'edit' && ruleToModifyOrView) {
+        setIPs(getInitialIPs(ruleToModifyOrView));
+        setPresetPorts(portStringToItems(ruleToModifyOrView.ports)[0]);
       } else if (isOpen) {
         setPresetPorts([]);
       } else {
@@ -87,14 +86,21 @@ export const FirewallRuleDrawer = React.memo(
       ) {
         setCreateEntityType('rule');
       }
-    }, [mode, isOpen, ruleToModify, isFirewallRulesetsPrefixlistsEnabled]);
+    }, [
+      mode,
+      isOpen,
+      ruleToModifyOrView,
+      isFirewallRulesetsPrefixlistsEnabled,
+    ]);
 
     const title =
       mode === 'create'
         ? `Add an ${capitalize(category)} Rule${
             isFirewallRulesetsPrefixlistsEnabled ? ' or Rule Set' : ''
           }`
-        : 'Edit Rule';
+        : mode === 'edit'
+          ? 'Edit Rule'
+          : `${capitalize(category)} Rule Set details`;
 
     const addressesLabel = category === 'inbound' ? 'source' : 'destination';
 
@@ -185,9 +191,10 @@ export const FirewallRuleDrawer = React.memo(
           </Grid>
         )}
 
-        {(mode === 'edit' || createEntityType === 'rule') && (
+        {(mode === 'edit' ||
+          (mode === 'create' && createEntityType === 'rule')) && (
           <Formik<FormState>
-            initialValues={getInitialFormValues(ruleToModify)}
+            initialValues={getInitialFormValues(ruleToModifyOrView)}
             onSubmit={onSubmitRule}
             validate={onValidateRule}
             validateOnBlur={false}
@@ -210,7 +217,7 @@ export const FirewallRuleDrawer = React.memo(
                   ips={ips}
                   mode={mode}
                   presetPorts={presetPorts}
-                  ruleErrors={ruleToModify?.errors}
+                  ruleErrors={ruleToModifyOrView?.errors}
                   setIPs={setIPs}
                   setPresetPorts={setPresetPorts}
                   {...formikProps}
@@ -246,17 +253,28 @@ export const FirewallRuleDrawer = React.memo(
                   <FirewallRuleSetForm
                     category={category}
                     closeDrawer={onClose}
-                    ruleErrors={ruleToModify?.errors}
+                    ruleErrors={ruleToModifyOrView?.errors}
                     {...formikProps}
                   />
                 </>
               )}
             </Formik>
           )}
-        <Typography variant="body1">
-          Rule changes don&rsquo;t take effect immediately. You can add or
-          delete rules before saving all your changes to this Firewall.
-        </Typography>
+
+        {mode === 'view' && (
+          <FirewallRuleSetDetailsView
+            category={category}
+            closeDrawer={onClose}
+            ruleset={ruleToModifyOrView?.ruleset}
+          />
+        )}
+
+        {(mode === 'create' || mode === 'edit') && (
+          <Typography variant="body1">
+            Rule changes don&rsquo;t take effect immediately. You can add or
+            delete rules before saving all your changes to this Firewall.
+          </Typography>
+        )}
       </Drawer>
     );
   }
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts
index f08c91d190d..c48ff4a91a6 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts
@@ -8,7 +8,7 @@ import type {
 import type { FormikProps } from 'formik';
 import type { ExtendedIP } from 'src/utilities/ipUtils';
 
-export type FirewallRuleDrawerMode = 'create' | 'edit';
+export type FirewallRuleDrawerMode = 'create' | 'edit' | 'view';
 
 export interface FirewallRuleDrawerProps {
   category: Category;
@@ -16,7 +16,7 @@ export interface FirewallRuleDrawerProps {
   mode: FirewallRuleDrawerMode;
   onClose: () => void;
   onSubmit: (category: 'inbound' | 'outbound', rule: FirewallRuleType) => void;
-  ruleToModify?: ExtendedFirewallRule;
+  ruleToModifyOrView?: ExtendedFirewallRule;
 }
 
 export interface FormState {
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetDetailsView.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetDetailsView.tsx
new file mode 100644
index 00000000000..167163726ae
--- /dev/null
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetDetailsView.tsx
@@ -0,0 +1,196 @@
+import { useFirewallRuleSetQuery } from '@linode/queries';
+import {
+  ActionsPanel,
+  Box,
+  CircleProgress,
+  ErrorState,
+  NotFound,
+  Paper,
+  TooltipIcon,
+} from '@linode/ui';
+import { capitalize } from '@linode/utilities';
+import * as React from 'react';
+
+import { CopyTooltip } from 'src/components/CopyTooltip/CopyTooltip';
+import { DateTimeDisplay } from 'src/components/DateTimeDisplay';
+
+import {
+  generateAddressesLabel,
+  useIsFirewallRulesetsPrefixlistsEnabled,
+} from '../../shared';
+import { RULESET_MARKED_FOR_DELETION_TEXT } from './shared';
+import {
+  StyledChip,
+  StyledLabel,
+  StyledListItem,
+  StyledWarningIcon,
+  useStyles,
+} from './shared.styles';
+
+import type { Category } from './shared';
+import type { FirewallRuleType } from '@linode/api-v4';
+
+interface FirewallRuleSetDetailsViewProps {
+  category: Category;
+  closeDrawer: () => void;
+  ruleset: FirewallRuleType['ruleset'];
+}
+
+export const FirewallRuleSetDetailsView = (
+  props: FirewallRuleSetDetailsViewProps
+) => {
+  const { category, closeDrawer, ruleset } = props;
+
+  const { isFirewallRulesetsPrefixlistsEnabled } =
+    useIsFirewallRulesetsPrefixlistsEnabled();
+  const { classes } = useStyles();
+
+  const isValidRuleSetId = ruleset !== undefined && ruleset !== null;
+
+  const {
+    data: ruleSetDetails,
+    isFetching,
+    isError,
+    error,
+  } = useFirewallRuleSetQuery(
+    ruleset ?? -1,
+    isValidRuleSetId && isFirewallRulesetsPrefixlistsEnabled
+  );
+
+  if (!isValidRuleSetId) {
+    return <NotFound alignTop />;
+  }
+
+  if (isFetching) {
+    return (
+      <Box display="flex" justifyContent="center" mt={12}>
+        <CircleProgress size="md" />
+      </Box>
+    );
+  }
+
+  if (isError) {
+    return <ErrorState errorText={error[0].reason} />;
+  }
+
+  return (
+    <Box mt={2}>
+      {[
+        { label: 'Label', value: ruleSetDetails?.label },
+        { label: 'ID', value: ruleSetDetails?.id, copy: true },
+        {
+          label: 'Description',
+          value: ruleSetDetails?.description,
+          column: true,
+        },
+        {
+          label: 'Service Defined',
+          value: ruleSetDetails?.is_service_defined ? 'Yes' : 'No',
+        },
+        { label: 'Version', value: ruleSetDetails?.version },
+        {
+          label: 'Created',
+          value: ruleSetDetails?.created && (
+            <DateTimeDisplay value={ruleSetDetails.created} />
+          ),
+        },
+        {
+          label: 'Updated',
+          value: ruleSetDetails?.updated && (
+            <DateTimeDisplay value={ruleSetDetails.updated} />
+          ),
+        },
+      ].map((item, idx) => (
+        <StyledListItem
+          key={`item-${idx}`}
+          paddingMultiplier={2}
+          sx={
+            item.column
+              ? { flexDirection: 'column', alignItems: 'flex-start' }
+              : {}
+          }
+        >
+          {item.label && (
+            <StyledLabel component="span">{item.label}:</StyledLabel>
+          )}
+          {item.value}
+          {item.copy && (
+            <CopyTooltip
+              className={classes.copyIcon}
+              text={String(ruleSetDetails?.id)}
+            />
+          )}
+        </StyledListItem>
+      ))}
+
+      {ruleSetDetails?.deleted && (
+        <StyledListItem paddingMultiplier={2}>
+          <StyledWarningIcon />
+          <StyledLabel
+            component="span"
+            sx={(theme) => ({
+              color: theme.tokens.alias.Content.Text.Negative,
+            })}
+          >
+            Marked for deletion:
+          </StyledLabel>
+          <DateTimeDisplay
+            sx={(theme) => ({
+              color: theme.tokens.alias.Content.Text.Negative,
+              marginRight: theme.spacingFunction(4),
+            })}
+            value={ruleSetDetails.deleted}
+          />
+          <TooltipIcon
+            status="info"
+            sxTooltipIcon={{
+              '& svg': { width: '16px', height: '16px' },
+              padding: 0,
+              mb: 0.1,
+            }}
+            text={RULESET_MARKED_FOR_DELETION_TEXT}
+          />
+        </StyledListItem>
+      )}
+
+      <Paper
+        sx={(theme) => ({
+          backgroundColor: theme.tokens.alias.Background.Neutral,
+          padding: theme.spacingFunction(12),
+          marginTop: theme.spacingFunction(8),
+        })}
+      >
+        <StyledLabel
+          sx={(theme) => ({ marginBottom: theme.spacingFunction(4) })}
+        >
+          {capitalize(category)} Rules
+        </StyledLabel>
+        {ruleSetDetails?.rules.map((rule, idx) => (
+          <StyledListItem
+            component="span"
+            key={`firewall-ruleset-rule-${idx}`}
+            sx={(theme) => ({
+              padding: `${theme.spacingFunction(4)} 0`,
+            })}
+          >
+            <StyledChip
+              action={rule.action}
+              label={capitalize(rule.action?.toLowerCase() ?? '')}
+            />
+            <Box>
+              {rule.protocol};&nbsp;{rule.ports};&nbsp;
+              {generateAddressesLabel(rule.addresses)}
+            </Box>
+          </StyledListItem>
+        ))}
+      </Paper>
+
+      <ActionsPanel
+        primaryButtonProps={{
+          label: 'Cancel',
+          onClick: closeDrawer,
+        }}
+      />
+    </Box>
+  );
+};
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
index eedfe2cd508..9f24a04580f 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
@@ -87,6 +87,7 @@ interface RowActionHandlers {
   handleCloneFirewallRule: (idx: number) => void;
   handleDeleteFirewallRule: (idx: number) => void;
   handleOpenRuleDrawerForEditing: (idx: number) => void;
+  handleOpenRuleSetDrawerForViewing?: (ruleset: number) => void;
   handleReorder: (startIdx: number, endIdx: number) => void;
   handleUndo: (idx: number) => void;
 }
@@ -110,6 +111,7 @@ export const FirewallRuleTable = (props: FirewallRuleTableProps) => {
     handleCloneFirewallRule,
     handleDeleteFirewallRule,
     handleOpenRuleDrawerForEditing,
+    handleOpenRuleSetDrawerForViewing,
     handlePolicyChange,
     handleReorder,
     handleUndo,
@@ -245,6 +247,9 @@ export const FirewallRuleTable = (props: FirewallRuleTableProps) => {
                       handleOpenRuleDrawerForEditing={
                         handleOpenRuleDrawerForEditing
                       }
+                      handleOpenRuleSetDrawerForViewing={
+                        handleOpenRuleSetDrawerForViewing
+                      }
                       handleUndo={handleUndo}
                       key={thisRuleRow.id}
                       {...thisRuleRow}
@@ -280,6 +285,7 @@ export interface FirewallRuleTableRowProps extends RuleRow {
   handleCloneFirewallRule: RowActionHandlersWithDisabled['handleCloneFirewallRule'];
   handleDeleteFirewallRule: RowActionHandlersWithDisabled['handleDeleteFirewallRule'];
   handleOpenRuleDrawerForEditing: RowActionHandlersWithDisabled['handleOpenRuleDrawerForEditing'];
+  handleOpenRuleSetDrawerForViewing?: RowActionHandlersWithDisabled['handleOpenRuleSetDrawerForViewing'];
   handleUndo: RowActionHandlersWithDisabled['handleUndo'];
 }
 
@@ -292,6 +298,7 @@ const FirewallRuleTableRow = React.memo((props: FirewallRuleTableRowProps) => {
     handleCloneFirewallRule,
     handleDeleteFirewallRule,
     handleOpenRuleDrawerForEditing,
+    handleOpenRuleSetDrawerForViewing,
     handleUndo,
     id,
     index,
@@ -310,10 +317,12 @@ const FirewallRuleTableRow = React.memo((props: FirewallRuleTableRowProps) => {
   const isRuleSetRowEnabled =
     isRuleSetRow && isFirewallRulesetsPrefixlistsEnabled;
 
+  const isValidRuleSetId = ruleset !== undefined && ruleset !== null;
+
   const { data: rulesetDetails, isLoading: isRuleSetLoading } =
     useFirewallRuleSetQuery(
       ruleset ?? -1,
-      ruleset !== undefined && isRuleSetRowEnabled
+      isValidRuleSetId && isRuleSetRowEnabled
     );
 
   const actionMenuProps = {
@@ -418,24 +427,34 @@ const FirewallRuleTableRow = React.memo((props: FirewallRuleTableRowProps) => {
       {isRuleSetRowEnabled && (
         <>
           <TableCell aria-label={`Label: ${label}`}>
-            <Box alignItems="center" display="flex" gap={1}>
+            <Box
+              alignItems="center"
+              display="flex"
+              gap={rulesetDetails ? 1 : 0}
+            >
               <Box alignItems="center" display="flex">
                 <StyledDragIndicator
                   aria-label="Drag indicator icon"
                   sx={{ flexShrink: 0 }}
                 />
                 {rulesetDetails && (
-                  <Link onClick={() => {}}>{rulesetDetails?.label}</Link>
+                  <Link
+                    onClick={() =>
+                      handleOpenRuleSetDrawerForViewing?.(rulesetDetails.id)
+                    }
+                  >
+                    {rulesetDetails?.label}
+                  </Link>
                 )}
               </Box>
-              <Hidden smDown>
+              <Hidden smDown={!!rulesetDetails}>
                 <Box
                   sx={{
                     alignItems: 'center',
                     display: 'flex',
                   }}
                 >
-                  <span>ID:&nbsp;</span>
+                  <span>{rulesetDetails ? 'ID:' : 'Rule Set ID:'}&nbsp;</span>
                   <span>{ruleset}</span>
                   <CopyTooltip
                     className={classes.copyIcon}
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRulesLanding.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRulesLanding.tsx
index 913ea297f3d..ae20a00fcb7 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRulesLanding.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRulesLanding.tsx
@@ -7,7 +7,12 @@ import {
 import { ActionsPanel, Notice, Typography } from '@linode/ui';
 import { styled } from '@mui/material/styles';
 import { useQueryClient } from '@tanstack/react-query';
-import { useBlocker, useLocation, useNavigate } from '@tanstack/react-router';
+import {
+  useBlocker,
+  useLocation,
+  useNavigate,
+  useParams,
+} from '@tanstack/react-router';
 import { useSnackbar } from 'notistack';
 import * as React from 'react';
 
@@ -41,10 +46,13 @@ interface Props {
   rules: FirewallRules;
 }
 
+type RulesDrawerEntityType = 'rule' | 'ruleset';
+
 interface Drawer {
   category: Category;
+  entityType?: RulesDrawerEntityType; // Not applicable for 'create', since 'create' can involve both entity types
   mode: FirewallRuleDrawerMode;
-  ruleIdx?: number;
+  ruleIdx?: number; // Rule row index or ruleset Id (not applicable for 'create')
 }
 
 // TODO: Refactor this code - Becoming too large and hard to maintain
@@ -59,6 +67,18 @@ export const FirewallRulesLanding = React.memo((props: Props) => {
   const location = useLocation();
   const { enqueueSnackbar } = useSnackbar();
 
+  const getCategoryFromPath = (pathname: string): Category =>
+    pathname.includes('inbound') ? 'inbound' : 'outbound';
+
+  const getDrawerEntityTypeFromPath = (
+    pathname: string
+  ): RulesDrawerEntityType =>
+    pathname.includes('/ruleset') ? 'ruleset' : 'rule';
+
+  const params = useParams({ strict: false });
+  const category = getCategoryFromPath(location.pathname);
+  const entityType = getDrawerEntityTypeFromPath(location.pathname);
+
   /**
    * inbound and outbound policy aren't part of any particular rule
    * so they are managed separately rather than through the reducer.
@@ -83,10 +103,19 @@ export const FirewallRulesLanding = React.memo((props: Props) => {
   /**
    * Component state and handlers
    */
-  const [ruleDrawer, setRuleDrawer] = React.useState<Drawer>({
-    category: 'inbound',
-    mode: 'create',
-  });
+
+  // - Initialize the drawer state based on the current route.
+  // - Drawers can be accessed via the route ONLY for viewing rulesets or adding rules/rulesets.
+  // - Accessing the Edit Rule drawer via the route is not allowed (for now),
+  //   since individual rules don't have unique IDs and are part of drag-and-drop feature.
+  const initialDrawer: Drawer = {
+    category,
+    mode: entityType === 'ruleset' ? 'view' : 'create',
+    entityType: entityType === 'ruleset' ? entityType : undefined,
+    ruleIdx: entityType === 'ruleset' ? Number(params.ruleId) : undefined,
+  };
+
+  const [ruleDrawer, setRuleDrawer] = React.useState<Drawer>(initialDrawer);
   const [submitting, setSubmitting] = React.useState<boolean>(false);
   // @todo fine-grained error handling.
   const [generalErrors, setGeneralErrors] = React.useState<
@@ -95,26 +124,36 @@ export const FirewallRulesLanding = React.memo((props: Props) => {
   const [discardChangesModalOpen, setDiscardChangesModalOpen] =
     React.useState<boolean>(false);
 
-  const openRuleDrawer = (
-    category: Category,
-    mode: FirewallRuleDrawerMode,
-    idx?: number
-  ) => {
+  const openRuleDrawer = (options: {
+    category: Category;
+    entityType?: RulesDrawerEntityType;
+    idx?: number;
+    mode: FirewallRuleDrawerMode;
+  }) => {
+    const { category, mode, idx, entityType = 'rule' } = options;
+
     setRuleDrawer({
       category,
       mode,
       ruleIdx: idx,
+      entityType,
     });
+
+    let path: string;
+
+    if (mode === 'create') {
+      path = `/firewalls/$id/rules/add/${category}`;
+    } else if (mode === 'edit') {
+      path = `/firewalls/$id/rules/${mode}/${category}/$ruleId`;
+    } else if (mode === 'view') {
+      path = `/firewalls/$id/rules/${mode}/${category}/ruleset/$ruleId`;
+    } else {
+      throw new Error(`Unknown mode: ${mode}`);
+    }
+
     navigate({
       params: { id: String(firewallID), ruleId: String(idx) },
-      to:
-        category === 'inbound' && mode === 'create'
-          ? '/firewalls/$id/rules/add/inbound'
-          : category === 'inbound' && mode === 'edit'
-            ? `/firewalls/$id/rules/edit/inbound/$ruleId`
-            : category === 'outbound' && mode === 'create'
-              ? '/firewalls/$id/rules/add/outbound'
-              : `/firewalls/$id/rules/edit/outbound/$ruleId`,
+      to: path,
     });
   };
 
@@ -293,7 +332,8 @@ export const FirewallRulesLanding = React.memo((props: Props) => {
         next.routeId === '/firewalls/$id/rules/add/inbound' ||
         next.routeId === '/firewalls/$id/rules/add/outbound' ||
         next.routeId === '/firewalls/$id/rules/edit/inbound/$ruleId' ||
-        next.routeId === '/firewalls/$id/rules/edit/outbound/$ruleId';
+        next.routeId === '/firewalls/$id/rules/edit/outbound/$ruleId' ||
+        next.routeId === '/firewalls/$id/rules/view/$category/ruleset/$ruleId';
 
       return !isNavigatingToAllowedRoute;
     },
@@ -323,13 +363,16 @@ export const FirewallRulesLanding = React.memo((props: Props) => {
     [outboundState]
   );
 
-  // This is for the Rule Drawer. If there is a rule to modify,
+  const rulesByCategory =
+    ruleDrawer.category === 'inbound' ? inboundRules : outboundRules;
+
+  // This is for the Rule Drawer. If there is a rule to modify or view,
   // we need to pass it to the drawer to pre-populate the form fields.
-  const ruleToModify =
+  const ruleToModifyOrView =
     ruleDrawer.ruleIdx !== undefined
-      ? ruleDrawer.category === 'inbound'
-        ? inboundRules[ruleDrawer.ruleIdx]
-        : outboundRules[ruleDrawer.ruleIdx]
+      ? ruleDrawer.entityType === 'ruleset'
+        ? rulesByCategory.find((r) => r.ruleset === ruleDrawer.ruleIdx) // Find ruleset by ruleset id
+        : rulesByCategory[ruleDrawer.ruleIdx] // find rule by rule index
       : undefined;
 
   return (
@@ -381,14 +424,29 @@ export const FirewallRulesLanding = React.memo((props: Props) => {
           }
           handleDeleteFirewallRule={(idx) => handleDeleteRule('inbound', idx)}
           handleOpenRuleDrawerForEditing={(idx: number) =>
-            openRuleDrawer('inbound', 'edit', idx)
+            openRuleDrawer({
+              category: 'inbound',
+              mode: 'edit',
+              idx,
+              entityType: 'rule',
+            })
+          }
+          handleOpenRuleSetDrawerForViewing={(ruleset: number) =>
+            openRuleDrawer({
+              category: 'inbound',
+              mode: 'view',
+              idx: ruleset,
+              entityType: 'ruleset',
+            })
           }
           handlePolicyChange={handlePolicyChange}
           handleReorder={(startIdx: number, endIdx: number) =>
             handleReorder('inbound', startIdx, endIdx)
           }
           handleUndo={(idx) => handleUndo('inbound', idx)}
-          openRuleDrawer={openRuleDrawer}
+          openRuleDrawer={(category, mode) => {
+            openRuleDrawer({ category, mode });
+          }}
           policy={policy.inbound}
           rulesWithStatus={inboundRules}
         />
@@ -402,14 +460,29 @@ export const FirewallRulesLanding = React.memo((props: Props) => {
           }
           handleDeleteFirewallRule={(idx) => handleDeleteRule('outbound', idx)}
           handleOpenRuleDrawerForEditing={(idx: number) =>
-            openRuleDrawer('outbound', 'edit', idx)
+            openRuleDrawer({
+              category: 'outbound',
+              mode: 'edit',
+              idx,
+              entityType: 'rule',
+            })
+          }
+          handleOpenRuleSetDrawerForViewing={(ruleset: number) =>
+            openRuleDrawer({
+              category: 'outbound',
+              mode: 'view',
+              idx: ruleset,
+              entityType: 'ruleset',
+            })
           }
           handlePolicyChange={handlePolicyChange}
           handleReorder={(startIdx: number, endIdx: number) =>
             handleReorder('outbound', startIdx, endIdx)
           }
           handleUndo={(idx) => handleUndo('outbound', idx)}
-          openRuleDrawer={openRuleDrawer}
+          openRuleDrawer={(category, mode) => {
+            openRuleDrawer({ category, mode });
+          }}
           policy={policy.outbound}
           rulesWithStatus={outboundRules}
         />
@@ -420,12 +493,18 @@ export const FirewallRulesLanding = React.memo((props: Props) => {
           location.pathname.endsWith('add/inbound') ||
           location.pathname.endsWith('add/outbound') ||
           location.pathname.endsWith(`edit/inbound/${ruleDrawer.ruleIdx}`) ||
-          location.pathname.endsWith(`edit/outbound/${ruleDrawer.ruleIdx}`)
+          location.pathname.endsWith(`edit/outbound/${ruleDrawer.ruleIdx}`) ||
+          location.pathname.endsWith(
+            `view/inbound/ruleset/${ruleDrawer.ruleIdx}`
+          ) ||
+          location.pathname.endsWith(
+            `view/outbound/ruleset/${ruleDrawer.ruleIdx}`
+          )
         }
         mode={ruleDrawer.mode}
         onClose={closeRuleDrawer}
         onSubmit={ruleDrawer.mode === 'create' ? handleAddRule : handleEditRule}
-        ruleToModify={ruleToModify}
+        ruleToModifyOrView={ruleToModifyOrView}
       />
       <StyledActionsPanel
         primaryButtonProps={{
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.styles.ts b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.styles.ts
index deace8a6d08..391bf1ace37 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.styles.ts
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.styles.ts
@@ -1,14 +1,28 @@
-import { Box, Typography } from '@linode/ui';
-import { styled } from '@mui/material';
+import {
+  Box,
+  Chip,
+  omittedProps,
+  styled,
+  Typography,
+  WarningIcon,
+} from '@linode/ui';
 import { makeStyles } from 'tss-react/mui';
 
-export const StyledListItem = styled(Typography, { label: 'StyledTypography' })(
-  ({ theme }) => ({
-    alignItems: 'center',
-    display: 'flex',
-    padding: `${theme.spacingFunction(4)} 0`,
-  })
-);
+import type { FirewallPolicyType } from '@linode/api-v4';
+import type { Theme } from '@linode/ui';
+
+interface StyledListItemProps {
+  paddingMultiplier?: number; // optional, default 1
+}
+
+export const StyledListItem = styled(Typography, {
+  label: 'StyledTypography',
+  shouldForwardProp: omittedProps(['paddingMultiplier']),
+})<StyledListItemProps>(({ theme, paddingMultiplier = 1 }) => ({
+  alignItems: 'center',
+  display: 'flex',
+  padding: `${theme.spacingFunction(4 * paddingMultiplier)} 0`,
+}));
 
 export const StyledLabel = styled(Box, {
   label: 'StyledLabelBox',
@@ -17,7 +31,40 @@ export const StyledLabel = styled(Box, {
   marginRight: theme.spacingFunction(4),
 }));
 
-export const useStyles = makeStyles()((theme) => ({
+export const StyledWarningIcon = styled(WarningIcon, {
+  label: 'StyledWarningIcon',
+})(({ theme }) => ({
+  '& > path:nth-of-type(1)': {
+    fill: theme.tokens.alias.Content.Icon.Warning,
+  },
+  '& > path:nth-of-type(2)': {
+    fill: theme.tokens.color.Neutrals[90],
+  },
+  marginRight: theme.spacingFunction(4),
+  width: '16px',
+  height: '16px',
+}));
+
+export const StyledChip = styled(Chip, {
+  shouldForwardProp: omittedProps(['action']),
+})<{ action?: FirewallPolicyType | null }>(({ theme, action }) => ({
+  background:
+    action === 'ACCEPT'
+      ? theme.tokens.component.Badge.Positive.Subtle.Background
+      : theme.tokens.component.Badge.Negative.Subtle.Background,
+  color:
+    action === 'ACCEPT'
+      ? theme.tokens.component.Badge.Positive.Subtle.Text
+      : theme.tokens.component.Badge.Negative.Subtle.Text,
+  font: theme.font.bold,
+  width: '51px',
+  fontSize: theme.tokens.font.FontSize.Xxxs,
+  marginRight: theme.spacingFunction(6),
+  flexShrink: 0,
+  alignSelf: 'flex-start',
+}));
+
+export const useStyles = makeStyles()((theme: Theme) => ({
   copyIcon: {
     '& svg': {
       height: '1em',
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.ts b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.ts
index 46d9b8aba2a..58cfe9f0a0c 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.ts
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.ts
@@ -32,6 +32,9 @@ export const PORT_PRESETS_ITEMS = sortBy(
   Object.values(PORT_PRESETS)
 );
 
+export const RULESET_MARKED_FOR_DELETION_TEXT =
+  'This rule set will be automatically deleted when it’s no longer referenced by other firewalls.';
+
 /**
  * The API returns very good Firewall error messages that look like this:
  *
diff --git a/packages/manager/src/mocks/serverHandlers.ts b/packages/manager/src/mocks/serverHandlers.ts
index dcf176ec753..debc8849708 100644
--- a/packages/manager/src/mocks/serverHandlers.ts
+++ b/packages/manager/src/mocks/serverHandlers.ts
@@ -1356,10 +1356,14 @@ export const handlers = [
               id: 123,
             });
           case 123456789:
-            // Ruleset with larger ID 123456789 & Longer label with 32 chars
+            // Ruleset with larger ID 123456789, Longer label with 32 chars, and
+            // Marked for deletion status
             return firewallRuleSetFactory.build({
               id: 123456789,
               label: 'ruleset-with-a-longer-32ch-label',
+              deleted: '2025-11-18T18:51:11',
+              description:
+                'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a fermentum quam. Mauris posuere dapibus aliquet. Ut id dictum magna, vitae congue turpis. Curabitur sollicitudin odio vel lacus vehicula maximus.',
             });
           default:
             return firewallRuleSetFactory.build();
diff --git a/packages/manager/src/routes/firewalls/index.ts b/packages/manager/src/routes/firewalls/index.ts
index 72fb1d374db..e9ec4de124c 100644
--- a/packages/manager/src/routes/firewalls/index.ts
+++ b/packages/manager/src/routes/firewalls/index.ts
@@ -95,6 +95,15 @@ const firewallDetailRulesEditOutboundRuleRoute = createRoute({
   )
 );
 
+const firewallDetailRulesViewRuleSetRoute = createRoute({
+  getParentRoute: () => firewallDetailRulesRoute,
+  path: 'view/$category/ruleset/$ruleId',
+}).lazy(() =>
+  import('src/features/Firewalls/FirewallDetail/firewallDetailLazyRoute').then(
+    (m) => m.firewallDetailLazyRoute
+  )
+);
+
 const firewallDetailRulesAddInboundRuleRoute = createRoute({
   getParentRoute: () => firewallDetailRulesAddRuleRoute,
   path: 'inbound',
@@ -180,6 +189,7 @@ export const firewallsRouteTree = firewallsRoute.addChildren([
       firewallDetailRulesEditOutboundRuleRoute,
       firewallDetailRulesAddInboundRuleRoute,
       firewallDetailRulesAddOutboundRuleRoute,
+      firewallDetailRulesViewRuleSetRoute,
     ]),
     firewallDetailNodebalancersRoute.addChildren([
       firewallDetailNodebalancersAddNodebalancerRoute,

From b76293de2b1e7c3383fb308e1fcb1ec8957777b9 Mon Sep 17 00:00:00 2001
From: Dmytro Chyrva <dchyrva@akamai.com>
Date: Tue, 25 Nov 2025 10:45:22 +0100
Subject: [PATCH 38/91] change: [STORIF-106] Object Storage Summary page
 changed. (#13087)

* change: [STORIF-106] Object Storage Summary page changed.

* Added changeset: Object storage summary page migrated to use table view
---
 ...r-13087-upcoming-features-1763109384091.md |   5 +
 .../Partials/EndpointSummaryRow.test.tsx      |  11 +-
 .../Partials/EndpointSummaryRow.tsx           | 109 +++++++++---------
 .../Partials/EndpointSummaryTable.tsx         |  61 ++++++++++
 .../SummaryLanding/SummaryLanding.tsx         |  12 +-
 5 files changed, 133 insertions(+), 65 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13087-upcoming-features-1763109384091.md
 create mode 100644 packages/manager/src/features/ObjectStorage/SummaryLanding/Partials/EndpointSummaryTable.tsx

diff --git a/packages/manager/.changeset/pr-13087-upcoming-features-1763109384091.md b/packages/manager/.changeset/pr-13087-upcoming-features-1763109384091.md
new file mode 100644
index 00000000000..96635443a16
--- /dev/null
+++ b/packages/manager/.changeset/pr-13087-upcoming-features-1763109384091.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Object storage summary page migrated to use table view ([#13087](https://github.com/linode/manager/pull/13087))
diff --git a/packages/manager/src/features/ObjectStorage/SummaryLanding/Partials/EndpointSummaryRow.test.tsx b/packages/manager/src/features/ObjectStorage/SummaryLanding/Partials/EndpointSummaryRow.test.tsx
index dd1829edc93..6a35e80827b 100644
--- a/packages/manager/src/features/ObjectStorage/SummaryLanding/Partials/EndpointSummaryRow.test.tsx
+++ b/packages/manager/src/features/ObjectStorage/SummaryLanding/Partials/EndpointSummaryRow.test.tsx
@@ -108,14 +108,15 @@ describe('EndpointSummaryRow', () => {
       isFetching: false,
     });
 
-    const { findByText } = renderWithTheme(
+    const { findByText, findAllByText } = renderWithTheme(
       <EndpointSummaryRow endpoint={testEndpoint} />
     );
 
-    expect(await findByText(testEndpoint)).toBeVisible();
-    expect(await findByText('Number of Buckets')).toBeVisible();
-    expect(await findByText('Total Capacity')).toBeVisible();
-    expect(await findByText('Number of Objects')).toBeVisible();
+    const cellEndpoints = await findAllByText(testEndpoint);
+    expect(cellEndpoints.length).toBe(3);
+    cellEndpoints.forEach((endpoint) => {
+      expect(endpoint).toBeVisible();
+    });
     expect(await findByText('3 of 10 Buckets used')).toBeVisible();
     expect(await findByText('1 of 2 KB used')).toBeVisible();
     expect(await findByText('5 of 10 Objects used')).toBeVisible();
diff --git a/packages/manager/src/features/ObjectStorage/SummaryLanding/Partials/EndpointSummaryRow.tsx b/packages/manager/src/features/ObjectStorage/SummaryLanding/Partials/EndpointSummaryRow.tsx
index 9d090602e20..5e85f1b9662 100644
--- a/packages/manager/src/features/ObjectStorage/SummaryLanding/Partials/EndpointSummaryRow.tsx
+++ b/packages/manager/src/features/ObjectStorage/SummaryLanding/Partials/EndpointSummaryRow.tsx
@@ -1,13 +1,11 @@
-import {
-  Box,
-  CircleProgress,
-  ErrorState,
-  Typography,
-  useTheme,
-} from '@linode/ui';
+import { Typography, useTheme } from '@linode/ui';
 import * as React from 'react';
 
 import { QuotaUsageBar } from 'src/components/QuotaUsageBar/QuotaUsageBar';
+import { TableCell } from 'src/components/TableCell';
+import { TableRow } from 'src/components/TableRow';
+import { TableRowError } from 'src/components/TableRowError/TableRowError';
+import { TableRowLoading } from 'src/components/TableRowLoading/TableRowLoading';
 
 import { useGetObjUsagePerEndpoint } from '../hooks/useGetObjUsagePerEndpoint';
 
@@ -24,58 +22,61 @@ export const EndpointSummaryRow = ({ endpoint }: Props) => {
     isError,
   } = useGetObjUsagePerEndpoint(endpoint);
 
+  if (isFetching) {
+    return <TableRowLoading columns={3} />;
+  }
+
   if (isError) {
     return (
-      <>
-        <hr />
-        <ErrorState
-          compact={true}
-          errorText={`There was an error retrieving ${endpoint} endpoint data.`}
-        />
-      </>
+      <TableRowError
+        colSpan={3}
+        message={`There was an error retrieving ${endpoint} endpoint data.`}
+      />
     );
   }
 
-  return (
-    <>
-      <hr />
-
-      <Box
-        sx={{
-          display: 'flex',
-          flexDirection: 'column',
-          gap: theme.spacingFunction(16),
-          padding: theme.spacingFunction(8),
-        }}
-      >
-        <Box
-          sx={{
-            display: 'flex',
-            alignItems: 'center',
-            justifyContent: 'space-between',
-          }}
-        >
-          <h3>{endpoint}</h3>
-        </Box>
-
-        <Box sx={{ display: 'flex', gap: '3rem', justifyContent: 'center' }}>
-          {isFetching && <CircleProgress size="md" />}
+  const capacityQuota = quotaWithUsage.find(
+    (quota) => quota.quota_name === 'Total Capacity'
+  );
+  const objectsQuota = quotaWithUsage.find(
+    (quota) => quota.quota_name === 'Number of Objects'
+  );
+  const bucketsQuota = quotaWithUsage.find(
+    (quota) => quota.quota_name === 'Number of Buckets'
+  );
 
-          {!isFetching &&
-            quotaWithUsage.map((quota, index) => {
-              return (
-                <Box key={index} sx={{ flex: 1 }}>
-                  <Typography>{quota.quota_name}</Typography>
-                  <QuotaUsageBar
-                    limit={quota.quota_limit}
-                    resourceMetric={quota.resource_metric}
-                    usage={quota?.usage?.usage ?? 0}
-                  />
-                </Box>
-              );
-            })}
-        </Box>
-      </Box>
-    </>
+  return (
+    <TableRow>
+      {!!capacityQuota && (
+        <TableCell sx={{ paddingY: theme.spacingFunction(8) }}>
+          <Typography>{endpoint}</Typography>
+          <QuotaUsageBar
+            limit={capacityQuota.quota_limit}
+            resourceMetric={capacityQuota.resource_metric}
+            usage={capacityQuota?.usage?.usage ?? 0}
+          />
+        </TableCell>
+      )}
+      {!!objectsQuota && (
+        <TableCell sx={{ paddingY: theme.spacingFunction(8) }}>
+          <Typography>{endpoint}</Typography>
+          <QuotaUsageBar
+            limit={objectsQuota.quota_limit}
+            resourceMetric={objectsQuota.resource_metric}
+            usage={objectsQuota?.usage?.usage ?? 0}
+          />
+        </TableCell>
+      )}
+      {!!bucketsQuota && (
+        <TableCell sx={{ paddingY: theme.spacingFunction(8) }}>
+          <Typography>{endpoint}</Typography>
+          <QuotaUsageBar
+            limit={bucketsQuota.quota_limit}
+            resourceMetric={bucketsQuota.resource_metric}
+            usage={bucketsQuota?.usage?.usage ?? 0}
+          />
+        </TableCell>
+      )}
+    </TableRow>
   );
 };
diff --git a/packages/manager/src/features/ObjectStorage/SummaryLanding/Partials/EndpointSummaryTable.tsx b/packages/manager/src/features/ObjectStorage/SummaryLanding/Partials/EndpointSummaryTable.tsx
new file mode 100644
index 00000000000..3a9d1f24eb5
--- /dev/null
+++ b/packages/manager/src/features/ObjectStorage/SummaryLanding/Partials/EndpointSummaryTable.tsx
@@ -0,0 +1,61 @@
+import { Box, useTheme } from '@linode/ui';
+import React from 'react';
+
+import { PaginationFooter } from 'src/components/PaginationFooter/PaginationFooter';
+import { Table } from 'src/components/Table';
+import { TableBody } from 'src/components/TableBody';
+import { TableCell } from 'src/components/TableCell';
+import { TableHead } from 'src/components/TableHead';
+import { TableRow } from 'src/components/TableRow';
+
+import { EndpointSummaryRow } from './EndpointSummaryRow';
+
+interface Props {
+  endpoints: string[];
+}
+
+const PAGE_SIZE = 6;
+
+export const EndpointSummaryTable = ({ endpoints }: Props) => {
+  const theme = useTheme();
+  const [page, setPage] = React.useState(1);
+  const [paginatedEndpoints, setPaginatedEndpoints] = React.useState<string[]>(
+    []
+  );
+
+  React.useEffect(() => {
+    const offset = PAGE_SIZE * (page - 1);
+    setPaginatedEndpoints(endpoints.slice(offset, offset + PAGE_SIZE));
+  }, [endpoints, page]);
+
+  return (
+    <Box>
+      <Table>
+        <TableHead>
+          <TableRow>
+            <TableCell>Content Stored</TableCell>
+            <TableCell>Objects</TableCell>
+            <TableCell>Buckets</TableCell>
+          </TableRow>
+        </TableHead>
+
+        <TableBody>
+          {paginatedEndpoints.map((endpoint, index) => {
+            return <EndpointSummaryRow endpoint={endpoint} key={index} />;
+          })}
+        </TableBody>
+      </Table>
+
+      <PaginationFooter
+        count={endpoints.length}
+        eventCategory="Endpoints Table"
+        fixedSize={true}
+        handlePageChange={setPage}
+        handleSizeChange={() => {}}
+        page={page}
+        pageSize={PAGE_SIZE}
+        sx={{ padding: theme.spacingFunction(4) }}
+      />
+    </Box>
+  );
+};
diff --git a/packages/manager/src/features/ObjectStorage/SummaryLanding/SummaryLanding.tsx b/packages/manager/src/features/ObjectStorage/SummaryLanding/SummaryLanding.tsx
index 51f4e1c9f3d..646cfeab731 100644
--- a/packages/manager/src/features/ObjectStorage/SummaryLanding/SummaryLanding.tsx
+++ b/packages/manager/src/features/ObjectStorage/SummaryLanding/SummaryLanding.tsx
@@ -4,7 +4,7 @@ import React from 'react';
 import { Link } from 'src/components/Link';
 
 import { EndpointMultiselect } from './Partials/EndpointMultiselect';
-import { EndpointSummaryRow } from './Partials/EndpointSummaryRow';
+import { EndpointSummaryTable } from './Partials/EndpointSummaryTable';
 
 import type { EndpointMultiselectValue } from './Partials/EndpointMultiselect';
 
@@ -35,11 +35,11 @@ export const SummaryLanding = () => {
         values={selectedEndpoints}
       />
 
-      <Box>
-        {selectedEndpoints.map((endpoint, index) => {
-          return <EndpointSummaryRow endpoint={endpoint.label} key={index} />;
-        })}
-      </Box>
+      {!!selectedEndpoints.length && (
+        <EndpointSummaryTable
+          endpoints={selectedEndpoints.map((endpoint) => endpoint.label)}
+        />
+      )}
     </Box>
   );
 };

From 39025ad4bb7546b6fa74d237b45296dc484e22a1 Mon Sep 17 00:00:00 2001
From: venkatmano-akamai <vmangalr@akamai.com>
Date: Tue, 25 Nov 2025 15:29:09 +0530
Subject: [PATCH 39/91] upcoming: [DI-28395] - Added enabling, disabling and
 provisioning statuses and updated messages in CloudPulse alerts (#13127)

* upcoming: [DI-28395] - Added enabling, disabling and provisioning statuses in alerts

* upcoming: [DI-28395] - Updated server handlers

* upcoming: [DI-28395] - Code refactoring

* upcoming: [DI-28395] - Add changeset

* upcoming: [DI-28395] - Update status messages on enable, disable , create and update

* upcoming: [DI-28395] - Code refactoring

* upcoming: [DI-28395] - Cypress fixes

* upcoming: [DI-28395] - Lint issue fix

---------

Co-authored-by: nikhagra-akamai <nagrawal@akamai.com>
---
 ...r-13127-upcoming-features-1763979506001.md |  5 +++++
 packages/api-v4/src/cloudpulse/types.ts       |  9 +++++++-
 ...r-13127-upcoming-features-1763979546789.md |  5 +++++
 .../cloudpulse/alerts-listing-page.spec.ts    |  8 +++++--
 .../cypress/support/constants/alert.ts        |  3 +++
 .../manager/src/factories/featureFlags.ts     |  7 +++++++
 .../AlertsListing/AlertListTable.test.tsx     |  7 ++++---
 .../Alerts/AlertsListing/AlertListTable.tsx   | 21 +++++++++++++------
 .../Alerts/AlertsListing/constants.ts         |  3 +++
 .../Alerts/Utils/AlertsActionMenu.ts          |  7 ++++++-
 .../features/CloudPulse/Alerts/Utils/utils.ts |  5 ++++-
 .../features/CloudPulse/Alerts/constants.ts   | 21 +++++++++++++++++--
 packages/manager/src/mocks/serverHandlers.ts  | 12 +++++++++++
 packages/validation/src/cloudpulse.schema.ts  | 10 ++++++++-
 14 files changed, 106 insertions(+), 17 deletions(-)
 create mode 100644 packages/api-v4/.changeset/pr-13127-upcoming-features-1763979506001.md
 create mode 100644 packages/manager/.changeset/pr-13127-upcoming-features-1763979546789.md

diff --git a/packages/api-v4/.changeset/pr-13127-upcoming-features-1763979506001.md b/packages/api-v4/.changeset/pr-13127-upcoming-features-1763979506001.md
new file mode 100644
index 00000000000..82561a7e436
--- /dev/null
+++ b/packages/api-v4/.changeset/pr-13127-upcoming-features-1763979506001.md
@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Upcoming Features
+---
+
+Add additional status types `enabling`, `disabling`, `provisioning` in CloudPulse alerts ([#13127](https://github.com/linode/manager/pull/13127))
diff --git a/packages/api-v4/src/cloudpulse/types.ts b/packages/api-v4/src/cloudpulse/types.ts
index 4ac6b19d7f8..87e1d9ed382 100644
--- a/packages/api-v4/src/cloudpulse/types.ts
+++ b/packages/api-v4/src/cloudpulse/types.ts
@@ -19,8 +19,15 @@ export type DimensionFilterOperatorType =
   | 'neq'
   | 'startswith';
 export type AlertDefinitionType = 'system' | 'user';
-export type AlertStatusType = 'disabled' | 'enabled' | 'failed' | 'in progress';
 export type AlertDefinitionScope = 'account' | 'entity' | 'region';
+export type AlertStatusType =
+  | 'disabled'
+  | 'disabling'
+  | 'enabled'
+  | 'enabling'
+  | 'failed'
+  | 'in progress'
+  | 'provisioning';
 export type CriteriaConditionType = 'ALL';
 export type MetricUnitType =
   | 'bit_per_second'
diff --git a/packages/manager/.changeset/pr-13127-upcoming-features-1763979546789.md b/packages/manager/.changeset/pr-13127-upcoming-features-1763979546789.md
new file mode 100644
index 00000000000..8ca707c6855
--- /dev/null
+++ b/packages/manager/.changeset/pr-13127-upcoming-features-1763979546789.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Add support for additional status types and handle action menu accordingly in CloudPulse alerts ([#13127](https://github.com/linode/manager/pull/13127))
diff --git a/packages/manager/cypress/e2e/core/cloudpulse/alerts-listing-page.spec.ts b/packages/manager/cypress/e2e/core/cloudpulse/alerts-listing-page.spec.ts
index 7c1a0643c1f..adb9afa816c 100644
--- a/packages/manager/cypress/e2e/core/cloudpulse/alerts-listing-page.spec.ts
+++ b/packages/manager/cypress/e2e/core/cloudpulse/alerts-listing-page.spec.ts
@@ -29,7 +29,8 @@ import {
 import {
   alertStatuses,
   DELETE_ALERT_SUCCESS_MESSAGE,
-  UPDATE_ALERT_SUCCESS_MESSAGE,
+  DISABLE_ALERT_SUCCESS_MESSAGE,
+  ENABLE_ALERT_SUCCESS_MESSAGE,
 } from 'src/features/CloudPulse/Alerts/constants';
 import { formatDate } from 'src/utilities/formatDate';
 
@@ -426,7 +427,10 @@ describe('Integration Tests for CloudPulse Alerts Listing Page', () => {
         alertName,
         alias,
         confirmationText: `Are you sure you want to ${action.toLowerCase()} this alert definition?`,
-        successMessage: UPDATE_ALERT_SUCCESS_MESSAGE,
+        successMessage:
+          action === 'Disable'
+            ? DISABLE_ALERT_SUCCESS_MESSAGE
+            : ENABLE_ALERT_SUCCESS_MESSAGE,
       });
     });
   });
diff --git a/packages/manager/cypress/support/constants/alert.ts b/packages/manager/cypress/support/constants/alert.ts
index c8e0f7a2f0e..c7f4641bd6e 100644
--- a/packages/manager/cypress/support/constants/alert.ts
+++ b/packages/manager/cypress/support/constants/alert.ts
@@ -44,4 +44,7 @@ export const statusMap: Record<AlertStatusType, string> = {
   enabled: 'Enabled',
   failed: 'Failed',
   'in progress': 'In Progress',
+  disabling: 'Disabling',
+  enabling: 'Enabling',
+  provisioning: 'Provisioning',
 };
diff --git a/packages/manager/src/factories/featureFlags.ts b/packages/manager/src/factories/featureFlags.ts
index d77be1679e6..9ff40bea222 100644
--- a/packages/manager/src/factories/featureFlags.ts
+++ b/packages/manager/src/factories/featureFlags.ts
@@ -24,6 +24,13 @@ export const flagsFactory = Factory.Sync.makeFactory<Partial<Flags>>({
     alertDefinitions: true,
     recentActivity: false,
     notificationChannels: false,
+    editDisabledStatuses: [
+      'in progress',
+      'failed',
+      'provisioning',
+      'enabling',
+      'disabling',
+    ],
   },
   aclpServices: {
     linode: {
diff --git a/packages/manager/src/features/CloudPulse/Alerts/AlertsListing/AlertListTable.test.tsx b/packages/manager/src/features/CloudPulse/Alerts/AlertsListing/AlertListTable.test.tsx
index eaa75096a69..fedb9e6f09b 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/AlertsListing/AlertListTable.test.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/AlertsListing/AlertListTable.test.tsx
@@ -8,7 +8,8 @@ import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import {
   DELETE_ALERT_SUCCESS_MESSAGE,
-  UPDATE_ALERT_SUCCESS_MESSAGE,
+  DISABLE_ALERT_SUCCESS_MESSAGE,
+  ENABLE_ALERT_SUCCESS_MESSAGE,
 } from '../constants';
 import { AlertsListTable } from './AlertListTable';
 
@@ -117,7 +118,7 @@ describe('Alert List Table test', () => {
 
     await userEvent.click(getByRole('button', { name: 'Enable' }));
 
-    expect(getByText(UPDATE_ALERT_SUCCESS_MESSAGE)).toBeInTheDocument(); // validate whether snackbar is displayed properly
+    expect(getByText(ENABLE_ALERT_SUCCESS_MESSAGE)).toBeVisible(); // validate whether snackbar is displayed properly
   });
 
   it('should show success snackbar when disabling alert succeeds', async () => {
@@ -140,7 +141,7 @@ describe('Alert List Table test', () => {
 
     await userEvent.click(getByRole('button', { name: 'Disable' }));
 
-    expect(getByText(UPDATE_ALERT_SUCCESS_MESSAGE)).toBeInTheDocument(); // validate whether snackbar is displayed properly
+    expect(getByText(DISABLE_ALERT_SUCCESS_MESSAGE)).toBeVisible(); // validate whether snackbar is displayed properly
   });
 
   it('should show error snackbar when enabling alert fails', async () => {
diff --git a/packages/manager/src/features/CloudPulse/Alerts/AlertsListing/AlertListTable.tsx b/packages/manager/src/features/CloudPulse/Alerts/AlertsListing/AlertListTable.tsx
index e74c02b4bbc..ab210d68564 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/AlertsListing/AlertListTable.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/AlertsListing/AlertListTable.tsx
@@ -23,7 +23,10 @@ import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
 import { AlertConfirmationDialog } from '../AlertsLanding/AlertConfirmationDialog';
 import {
   DELETE_ALERT_SUCCESS_MESSAGE,
-  UPDATE_ALERT_SUCCESS_MESSAGE,
+  DISABLE_ALERT_FAILED_MESSAGE,
+  DISABLE_ALERT_SUCCESS_MESSAGE,
+  ENABLE_ALERT_FAILED_MESSAGE,
+  ENABLE_ALERT_SUCCESS_MESSAGE,
 } from '../constants';
 import { AlertsTable } from './AlertsTable';
 import { AlertListingTableLabelMap } from './constants';
@@ -126,7 +129,6 @@ export const AlertsListTable = React.memo((props: AlertsListTableProps) => {
   const handleConfirm = React.useCallback(
     (alert: Alert, currentStatus: boolean) => {
       const toggleStatus = currentStatus ? 'disabled' : 'enabled';
-      const errorStatus = currentStatus ? 'Disabling' : 'Enabling';
       setIsUpdating(true);
       editAlertDefinition({
         alertId: alert.id,
@@ -135,15 +137,22 @@ export const AlertsListTable = React.memo((props: AlertsListTableProps) => {
       })
         .then(() => {
           // Handle success
-          enqueueSnackbar(UPDATE_ALERT_SUCCESS_MESSAGE, {
-            variant: 'success',
-          });
+          enqueueSnackbar(
+            currentStatus
+              ? DISABLE_ALERT_SUCCESS_MESSAGE
+              : ENABLE_ALERT_SUCCESS_MESSAGE,
+            {
+              variant: 'success',
+            }
+          );
         })
         .catch((updateError: APIError[]) => {
           // Handle error
           const errorResponse = getAPIErrorOrDefault(
             updateError,
-            `${errorStatus} alert failed`
+            currentStatus
+              ? DISABLE_ALERT_FAILED_MESSAGE
+              : ENABLE_ALERT_FAILED_MESSAGE
           );
           enqueueSnackbar(errorResponse[0].reason, {
             variant: 'error',
diff --git a/packages/manager/src/features/CloudPulse/Alerts/AlertsListing/constants.ts b/packages/manager/src/features/CloudPulse/Alerts/AlertsListing/constants.ts
index 2980370be85..f9e8fd7f37a 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/AlertsListing/constants.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/AlertsListing/constants.ts
@@ -35,6 +35,9 @@ export const statusToActionMap: Record<AlertStatusType, AlertStatusUpdateType> =
     enabled: 'Disable',
     failed: 'Disable',
     'in progress': 'Disable',
+    provisioning: 'Disable',
+    disabling: 'Enable',
+    enabling: 'Disable',
   };
 
 export const AlertContextualViewTableHeaderMap: TableColumnHeader[] = [
diff --git a/packages/manager/src/features/CloudPulse/Alerts/Utils/AlertsActionMenu.ts b/packages/manager/src/features/CloudPulse/Alerts/Utils/AlertsActionMenu.ts
index 124d297bfa9..3ff182a8769 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/Utils/AlertsActionMenu.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/Utils/AlertsActionMenu.ts
@@ -40,7 +40,12 @@ export const getAlertTypeToActionsList = (
       title: 'Edit',
     },
     {
-      disabled: alertStatus === 'in progress' || alertStatus === 'failed',
+      disabled:
+        alertStatus === 'in progress' ||
+        alertStatus === 'failed' ||
+        alertStatus === 'provisioning' ||
+        alertStatus === 'enabling' ||
+        alertStatus === 'disabling',
       onClick: handleStatusChange,
       title: getTitleForStatusChange(alertStatus),
     },
diff --git a/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.ts b/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.ts
index 167b7a684f8..91808118179 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.ts
@@ -274,7 +274,10 @@ export const filterAlerts = (props: FilterAlertsProps): Alert[] => {
   return (
     alerts?.filter(({ label, status, type, scope, regions }) => {
       return (
-        (status === 'enabled' || status === 'in progress') &&
+        (status === 'enabled' ||
+          status === 'in progress' ||
+          status === 'provisioning' ||
+          status === 'enabling') &&
         (!selectedType || type === selectedType) &&
         (!searchText ||
           label.toLowerCase().includes(searchText.toLowerCase())) &&
diff --git a/packages/manager/src/features/CloudPulse/Alerts/constants.ts b/packages/manager/src/features/CloudPulse/Alerts/constants.ts
index d796dad6c75..5414c10e684 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/constants.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/constants.ts
@@ -134,6 +134,9 @@ export const alertStatusToIconStatusMap: Record<AlertStatusType, Status> = {
   enabled: 'active',
   failed: 'error',
   'in progress': 'other',
+  provisioning: 'other',
+  disabling: 'other',
+  enabling: 'other',
 };
 
 export const channelTypeOptions: Item<string, ChannelType>[] = [
@@ -167,11 +170,15 @@ export const dimensionOperatorTypeMap: Record<
   startswith: 'starts with',
   in: 'in',
 };
+
 export const alertStatuses: Record<AlertStatusType, string> = {
   disabled: 'Disabled',
   enabled: 'Enabled',
   failed: 'Failed',
   'in progress': 'In Progress',
+  disabling: 'Disabling',
+  enabling: 'Enabling',
+  provisioning: 'Provisioning',
 };
 
 export const alertStatusOptions: Item<string, AlertStatusType>[] =
@@ -198,10 +205,20 @@ export const MULTILINE_ERROR_SEPARATOR = '|';
 export const SINGLELINE_ERROR_SEPARATOR = '\t';
 
 export const CREATE_ALERT_SUCCESS_MESSAGE =
-  'Alert successfully created. It may take a few minutes for your changes to take effect.';
+  'Alert created. It may take up to 5 minutes for your alert to be enabled.';
 
 export const UPDATE_ALERT_SUCCESS_MESSAGE =
-  'Alert successfully updated. It may take a few minutes for your changes to take effect.';
+  'Alert updated. It may take up to 5 minutes for changes to be applied.';
+
+export const DISABLE_ALERT_SUCCESS_MESSAGE =
+  'Alert disabled. It may take up to 5 minutes for your changes to take effect.';
+
+export const ENABLE_ALERT_SUCCESS_MESSAGE =
+  'Alert enabled. It may take up to 5 minutes for your changes to take effect.';
+
+export const DISABLE_ALERT_FAILED_MESSAGE = 'Failed to disable an Alert.';
+
+export const ENABLE_ALERT_FAILED_MESSAGE = 'Failed to enable an Alert.';
 
 export const ACCOUNT_GROUP_INFO_MESSAGE =
   'This alert applies to all entities associated with your account, and will be applied to any new entities that are added. The alert is triggered per entity rather than being based on the aggregated data for all entities.';
diff --git a/packages/manager/src/mocks/serverHandlers.ts b/packages/manager/src/mocks/serverHandlers.ts
index debc8849708..c5bc0413b1d 100644
--- a/packages/manager/src/mocks/serverHandlers.ts
+++ b/packages/manager/src/mocks/serverHandlers.ts
@@ -3223,6 +3223,10 @@ export const handlers = [
           rules: [firewallNodebalancerMetricCriteria.build()],
         },
       }),
+      ...alertFactory.buildList(3, { status: 'enabling', type: 'user' }),
+      ...alertFactory.buildList(3, { status: 'disabling', type: 'user' }),
+      ...alertFactory.buildList(3, { status: 'provisioning', type: 'user' }),
+      ...alertFactory.buildList(3, { status: 'in progress', type: 'user' }),
     ];
     return HttpResponse.json(makeResourcePage(alerts));
   }),
@@ -3305,6 +3309,14 @@ export const handlers = [
             service_type: params.serviceType === 'linode' ? 'linode' : 'dbaas',
             type: 'user',
             scope: pickRandom(['account', 'region', 'entity']),
+            status: pickRandom([
+              'enabled',
+              'disabled',
+              'in progress',
+              'enabling',
+              'disabling',
+              'provisioning',
+            ]),
           })
         );
       }
diff --git a/packages/validation/src/cloudpulse.schema.ts b/packages/validation/src/cloudpulse.schema.ts
index 32e68dd70ed..bc09c7b2b8d 100644
--- a/packages/validation/src/cloudpulse.schema.ts
+++ b/packages/validation/src/cloudpulse.schema.ts
@@ -120,7 +120,15 @@ export const editAlertDefinitionSchema = object({
   trigger_conditions: triggerConditionValidation.optional().default(undefined),
   severity: number().oneOf([0, 1, 2, 3]).optional(),
   status: string()
-    .oneOf(['enabled', 'disabled', 'in progress', 'failed'])
+    .oneOf([
+      'enabled',
+      'disabled',
+      'in progress',
+      'failed',
+      'provisioning',
+      'disabling',
+      'enabling',
+    ])
     .optional(),
   scope: string().oneOf(['entity', 'region', 'account']).nullable().optional(),
   regions: array().of(string().defined()).optional(),

From 2cde3bcc88362386116054e553059e476c19eda7 Mon Sep 17 00:00:00 2001
From: Ankita <ankitaan@akamai.com>
Date: Wed, 26 Nov 2025 11:39:36 +0530
Subject: [PATCH 40/91] upcoming: [DI-27569] - Integrate endpoints dashboard
 for object-storage service in CloudPulse Metrics (#13133)

* upcoming: [DI-27569] - Integrate endpoints dashboard for object-storage service

* upcoming: [DI-27569] - Update endpoints config for buckets dashboard

* upcoming: [DI-27569] - add util for dashboard type identification, simplify props

* upcoming: [DI-27569] - Add dimensionkey for endpoints filter in endpoints config

* upcoming: [DI-27569] - Cleanup

* upcoming: [DI-27569] - Simplify props

* upcoming: [DI-27569] - Move computations outside

* upcoming: [DI-27569] - Fix group_by bug

* upcoming: [DI-27569] - Update imports

* upcoming: [DI-27569] - Move test case

* upcoming: [DI-27569] - Add changesets

* upcoming: [DI-27569] - Simplify
---
 ...r-13133-upcoming-features-1764084018326.md |   5 +
 packages/api-v4/src/cloudpulse/types.ts       |   2 +-
 ...r-13133-upcoming-features-1764084041956.md |   5 +
 .../Dashboard/CloudPulseDashboard.tsx         |   2 +-
 .../features/CloudPulse/GroupBy/utils.test.ts |  20 ++-
 .../src/features/CloudPulse/GroupBy/utils.ts  |  15 +-
 .../Utils/CloudPulseWidgetUtils.test.ts       |   2 +-
 .../CloudPulse/Utils/CloudPulseWidgetUtils.ts |   4 +-
 .../CloudPulse/Utils/FilterBuilder.test.ts    |   5 +-
 .../CloudPulse/Utils/FilterBuilder.ts         |   7 +-
 .../CloudPulse/Utils/FilterConfig.test.ts     |  12 ++
 .../features/CloudPulse/Utils/FilterConfig.ts |  73 +++++++-
 .../ReusableDashboardFilterUtils.test.ts      |  12 ++
 .../Utils/ReusableDashboardFilterUtils.ts     |  18 +-
 .../src/features/CloudPulse/Utils/models.ts   |   9 +-
 .../features/CloudPulse/Utils/utils.test.ts   |  42 ++++-
 .../src/features/CloudPulse/Utils/utils.ts    |  25 +++
 .../Widget/CloudPulseWidgetRenderer.tsx       |   2 -
 .../shared/CloudPulseCustomSelect.tsx         |   1 +
 .../shared/CloudPulseEndpointsSelect.test.tsx | 168 +++++++++++++-----
 .../shared/CloudPulseEndpointsSelect.tsx      | 117 ++++++++----
 packages/manager/src/mocks/serverHandlers.ts  |  10 ++
 .../src/queries/cloudpulse/resources.ts       |   2 +-
 23 files changed, 450 insertions(+), 108 deletions(-)
 create mode 100644 packages/api-v4/.changeset/pr-13133-upcoming-features-1764084018326.md
 create mode 100644 packages/manager/.changeset/pr-13133-upcoming-features-1764084041956.md

diff --git a/packages/api-v4/.changeset/pr-13133-upcoming-features-1764084018326.md b/packages/api-v4/.changeset/pr-13133-upcoming-features-1764084018326.md
new file mode 100644
index 00000000000..3e22f0af003
--- /dev/null
+++ b/packages/api-v4/.changeset/pr-13133-upcoming-features-1764084018326.md
@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Upcoming Features
+---
+
+CloudPulse-Metrics: Update `entity_ids` type in `CloudPulseMetricsRequest` for metrics api in endpoints dahsboard ([#13133](https://github.com/linode/manager/pull/13133))
diff --git a/packages/api-v4/src/cloudpulse/types.ts b/packages/api-v4/src/cloudpulse/types.ts
index 87e1d9ed382..07dca57b539 100644
--- a/packages/api-v4/src/cloudpulse/types.ts
+++ b/packages/api-v4/src/cloudpulse/types.ts
@@ -159,7 +159,7 @@ export interface Metric {
 export interface CloudPulseMetricsRequest {
   absolute_time_duration: DateTimeWithPreset | undefined;
   associated_entity_region?: string;
-  entity_ids: number[] | string[];
+  entity_ids: number[] | string[] | undefined;
   entity_region?: string;
   filters?: Filters[];
   group_by?: string[];
diff --git a/packages/manager/.changeset/pr-13133-upcoming-features-1764084041956.md b/packages/manager/.changeset/pr-13133-upcoming-features-1764084041956.md
new file mode 100644
index 00000000000..3f2f8c5bc68
--- /dev/null
+++ b/packages/manager/.changeset/pr-13133-upcoming-features-1764084041956.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+CloudPulse-Metrics: Update `FilterConfig.ts` to handle integration of endpoints dashboard for object-storage service in metrics page([#13133](https://github.com/linode/manager/pull/13133))
diff --git a/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboard.tsx b/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboard.tsx
index 876b4cc17db..36974ed6071 100644
--- a/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboard.tsx
+++ b/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboard.tsx
@@ -150,7 +150,7 @@ export const CloudPulseDashboard = (props: DashboardProperties) => {
   } = useCloudPulseJWEtokenQuery(
     dashboard?.service_type,
     getJweTokenPayload(),
-    Boolean(resources) && !isDashboardLoading && !isDashboardApiError
+    !isDashboardLoading && !isDashboardApiError
   );
 
   if (isDashboardApiError) {
diff --git a/packages/manager/src/features/CloudPulse/GroupBy/utils.test.ts b/packages/manager/src/features/CloudPulse/GroupBy/utils.test.ts
index e880eaf6d17..adfee38ea85 100644
--- a/packages/manager/src/features/CloudPulse/GroupBy/utils.test.ts
+++ b/packages/manager/src/features/CloudPulse/GroupBy/utils.test.ts
@@ -87,7 +87,7 @@ describe('useGlobalDimensions method test', () => {
 
   it('should return non-empty options and defaultValue if no common dimensions', () => {
     queryMocks.useCloudPulseDashboardByIdQuery.mockReturnValue({
-      data: dashboardFactory.build(),
+      data: dashboardFactory.build({ id: 1 }),
       isLoading: false,
     });
     queryMocks.useGetCloudPulseMetricDefinitionsByServiceType.mockReturnValue({
@@ -106,7 +106,7 @@ describe('useGlobalDimensions method test', () => {
 
   it('should return non-empty options and defaultValue from preferences', () => {
     queryMocks.useCloudPulseDashboardByIdQuery.mockReturnValue({
-      data: dashboardFactory.build(),
+      data: dashboardFactory.build({ id: 1 }),
       isLoading: false,
     });
     queryMocks.useGetCloudPulseMetricDefinitionsByServiceType.mockReturnValue({
@@ -123,6 +123,22 @@ describe('useGlobalDimensions method test', () => {
       isLoading: false,
     });
   });
+
+  it('should not return default option in case of endpoints-only dashboard', () => {
+    queryMocks.useCloudPulseDashboardByIdQuery.mockReturnValue({
+      data: dashboardFactory.build({ id: 10 }),
+      isLoading: false,
+    });
+    queryMocks.useGetCloudPulseMetricDefinitionsByServiceType.mockReturnValue({
+      data: {
+        data: metricDefinitions,
+      },
+      isLoading: false,
+    });
+    const result = useGlobalDimensions(10, 'objectstorage');
+    // Verify if options contain the default option - 'entityId' or not
+    expect(result.options).toEqual([{ label: 'Dim 2', value: 'Dim 2' }]);
+  });
 });
 
 describe('useWidgetDimension method test', () => {
diff --git a/packages/manager/src/features/CloudPulse/GroupBy/utils.ts b/packages/manager/src/features/CloudPulse/GroupBy/utils.ts
index 7444f8bc916..6281b6a70ca 100644
--- a/packages/manager/src/features/CloudPulse/GroupBy/utils.ts
+++ b/packages/manager/src/features/CloudPulse/GroupBy/utils.ts
@@ -2,7 +2,10 @@ import { useCloudPulseDashboardByIdQuery } from 'src/queries/cloudpulse/dashboar
 import { useGetCloudPulseMetricDefinitionsByServiceType } from 'src/queries/cloudpulse/services';
 
 import { ASSOCIATED_ENTITY_METRIC_MAP } from '../Utils/constants';
-import { getAssociatedEntityType } from '../Utils/FilterConfig';
+import {
+  getAssociatedEntityType,
+  isEndpointsOnlyDashboard,
+} from '../Utils/FilterConfig';
 
 import type { GroupByOption } from './CloudPulseGroupByDrawer';
 import type {
@@ -62,10 +65,12 @@ export const useGlobalDimensions = (
     metricDefinition?.data ?? [],
     dashboard
   );
-  const commonDimensions = [
-    defaultOption,
-    ...getCommonDimensions(metricDimensions),
-  ];
+  const baseDimensions = getCommonDimensions(metricDimensions);
+  const shouldIncludeDefault = !isEndpointsOnlyDashboard(dashboardId ?? 0);
+
+  const commonDimensions = shouldIncludeDefault
+    ? [defaultOption, ...baseDimensions]
+    : baseDimensions;
 
   const commonGroups = getCommonGroups(
     preference ? preference : (dashboard?.group_by ?? []),
diff --git a/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.test.ts b/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.test.ts
index 7caed886877..c94d37f5d19 100644
--- a/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.test.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.test.ts
@@ -328,7 +328,7 @@ describe('getTimeDurationFromPreset method', () => {
       expect(result).toEqual([123]);
     });
 
-    it('should return entity ids for objectstorage service type', () => {
+    it('should return entity ids for objectstorage buckets dashboard', () => {
       const result = getEntityIds(
         [{ id: 'bucket-1', label: 'bucket-name-1' }],
         ['bucket-1'],
diff --git a/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.ts b/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.ts
index 786cc2906ea..fb0816b6c8d 100644
--- a/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.ts
@@ -354,7 +354,9 @@ export const getCloudPulseMetricRequest = (
       presetDuration === undefined
         ? { end: duration.end, start: duration.start }
         : undefined,
-    entity_ids: getEntityIds(resources, entityIds, widget, serviceType),
+    entity_ids: !entityIds.length
+      ? undefined
+      : getEntityIds(resources, entityIds, widget, serviceType),
     filters: undefined,
     group_by: !groupBy?.length ? undefined : groupBy,
     relative_time_duration: presetDuration,
diff --git a/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.test.ts b/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.test.ts
index 5cc58111f72..6a6ddece891 100644
--- a/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.test.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.test.ts
@@ -34,7 +34,6 @@ import { FILTER_CONFIG } from './FilterConfig';
 import { CloudPulseAvailableViews, CloudPulseSelectTypes } from './models';
 import { deepEqual } from './utils';
 
-import type { CloudPulseEndpoints } from '../shared/CloudPulseEndpointsSelect';
 import type { CloudPulseResources } from '../shared/CloudPulseResourcesSelect';
 import type { CloudPulseServiceTypeFilters } from './models';
 
@@ -686,13 +685,15 @@ describe('filterUsingDependentFilters', () => {
 });
 
 describe('filterEndpointsUsingRegion', () => {
-  const mockData: CloudPulseEndpoints[] = [
+  const mockData: CloudPulseResources[] = [
     {
       ...objectStorageEndpointsFactory.build({ region: 'us-east' }),
+      id: 'us-east-1.linodeobjects.com',
       label: 'us-east-1.linodeobjects.com',
     },
     {
       ...objectStorageEndpointsFactory.build({ region: 'us-west' }),
+      id: 'us-west-1.linodeobjects.com',
       label: 'us-west-1.linodeobjects.com',
     },
   ];
diff --git a/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.ts b/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.ts
index 97fed2e4b40..824c31a199a 100644
--- a/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.ts
@@ -15,7 +15,6 @@ import type {
 } from '../Dashboard/CloudPulseDashboardLanding';
 import type { CloudPulseCustomSelectProps } from '../shared/CloudPulseCustomSelect';
 import type { CloudPulseEndpointsSelectProps } from '../shared/CloudPulseEndpointsSelect';
-import type { CloudPulseEndpoints } from '../shared/CloudPulseEndpointsSelect';
 import type {
   CloudPulseFirewallNodebalancersSelectProps,
   CloudPulseNodebalancers,
@@ -404,12 +403,14 @@ export const getEndpointsProperties = (
         preferences
       ),
     handleEndpointsSelection: handleEndpointsChange,
+    dashboardId: dashboard.id,
     label,
     placeholder,
     serviceType: dashboard.service_type,
     region: dependentFilters?.[REGION],
     savePreferences: !isServiceAnalyticsIntegration,
     xFilter: filterBasedOnConfig(config, dependentFilters ?? {}),
+    hasRestrictedSelections: config.configuration.hasRestrictedSelections,
   };
 };
 
@@ -733,9 +734,9 @@ export const filterUsingDependentFilters = (
  * @returns The filtered endpoints
  */
 export const filterEndpointsUsingRegion = (
-  data?: CloudPulseEndpoints[],
+  data?: CloudPulseResources[],
   regionFilter?: CloudPulseMetricsFilter
-): CloudPulseEndpoints[] | undefined => {
+): CloudPulseResources[] | undefined => {
   if (!data) {
     return data;
   }
diff --git a/packages/manager/src/features/CloudPulse/Utils/FilterConfig.test.ts b/packages/manager/src/features/CloudPulse/Utils/FilterConfig.test.ts
index 1075a85fd5b..606d68011b4 100644
--- a/packages/manager/src/features/CloudPulse/Utils/FilterConfig.test.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/FilterConfig.test.ts
@@ -1,6 +1,7 @@
 import {
   getAssociatedEntityType,
   getResourcesFilterConfig,
+  isEndpointsOnlyDashboard,
 } from './FilterConfig';
 
 describe('getResourcesFilterConfig', () => {
@@ -34,3 +35,14 @@ describe('getAssociatedEntityType', () => {
     expect(getAssociatedEntityType(8)).toBe('nodebalancer');
   });
 });
+
+describe('isEndpointsOnlyDashboard', () => {
+  it('should return true when the dashboard is an endpoints only dashboard', () => {
+    // Dashboard ID 10 is an endpoints only dashboard
+    expect(isEndpointsOnlyDashboard(10)).toBe(true);
+  });
+  it('should return false when the dashboard is not an endpoints only dashboard', () => {
+    // Dashboard ID 6 is not an endpoints only dashboard, rather a buckets dashboard
+    expect(isEndpointsOnlyDashboard(6)).toBe(false);
+  });
+});
diff --git a/packages/manager/src/features/CloudPulse/Utils/FilterConfig.ts b/packages/manager/src/features/CloudPulse/Utils/FilterConfig.ts
index 1d4c19a56e0..0f6debbc6bb 100644
--- a/packages/manager/src/features/CloudPulse/Utils/FilterConfig.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/FilterConfig.ts
@@ -11,12 +11,12 @@ import {
   RESOURCE_ID,
 } from './constants';
 import { CloudPulseAvailableViews, CloudPulseSelectTypes } from './models';
-import { filterKubernetesClusters } from './utils';
+import { filterKubernetesClusters, getValidSortedEndpoints } from './utils';
 
 import type { AssociatedEntityType } from '../shared/types';
 import type { CloudPulseServiceTypeFiltersConfiguration } from './models';
 import type { CloudPulseServiceTypeFilterMap } from './models';
-import type { KubernetesCluster } from '@linode/api-v4';
+import type { KubernetesCluster, ObjectStorageBucket } from '@linode/api-v4';
 
 const TIME_DURATION = 'Time Range';
 
@@ -420,6 +420,8 @@ export const OBJECTSTORAGE_CONFIG_BUCKET: Readonly<CloudPulseServiceTypeFilterMa
           name: 'Endpoints',
           priority: 2,
           neededInViews: [CloudPulseAvailableViews.central],
+          filterFn: (resources: ObjectStorageBucket[]) =>
+            getValidSortedEndpoints(resources),
         },
         name: 'Endpoints',
       },
@@ -442,6 +444,45 @@ export const OBJECTSTORAGE_CONFIG_BUCKET: Readonly<CloudPulseServiceTypeFilterMa
     serviceType: 'objectstorage',
   };
 
+export const ENDPOINT_DASHBOARD_CONFIG: Readonly<CloudPulseServiceTypeFilterMap> =
+  {
+    capability: capabilityServiceTypeMapping['objectstorage'],
+    filters: [
+      {
+        configuration: {
+          filterKey: REGION,
+          children: [ENDPOINT],
+          filterType: 'string',
+          isFilterable: true,
+          isMetricsFilter: true,
+          name: 'Region',
+          priority: 1,
+          neededInViews: [CloudPulseAvailableViews.central],
+        },
+        name: 'Region',
+      },
+      {
+        configuration: {
+          dimensionKey: 'endpoint',
+          dependency: [REGION],
+          filterKey: ENDPOINT,
+          filterType: 'string',
+          isFilterable: true,
+          isMetricsFilter: false,
+          isMultiSelect: true,
+          hasRestrictedSelections: true,
+          name: 'Endpoints',
+          priority: 2,
+          neededInViews: [CloudPulseAvailableViews.central],
+          filterFn: (resources: ObjectStorageBucket[]) =>
+            getValidSortedEndpoints(resources),
+        },
+        name: 'Endpoints',
+      },
+    ],
+    serviceType: 'objectstorage',
+  };
+
 export const BLOCKSTORAGE_CONFIG: Readonly<CloudPulseServiceTypeFilterMap> = {
   capability: capabilityServiceTypeMapping['blockstorage'],
   filters: [
@@ -522,6 +563,7 @@ export const FILTER_CONFIG: Readonly<
   [7, BLOCKSTORAGE_CONFIG],
   [8, FIREWALL_NODEBALANCER_CONFIG],
   [9, LKE_CONFIG],
+  [10, ENDPOINT_DASHBOARD_CONFIG],
 ]);
 
 /**
@@ -534,8 +576,13 @@ export const getResourcesFilterConfig = (
   if (!dashboardId) {
     return undefined;
   }
-  // Get the associated entity type for the dashboard
+  // Get the resources filter configuration for the dashboard
   const filterConfig = FILTER_CONFIG.get(dashboardId);
+  if (isEndpointsOnlyDashboard(dashboardId)) {
+    return filterConfig?.filters.find(
+      (filter) => filter.configuration.filterKey === ENDPOINT
+    )?.configuration;
+  }
   return filterConfig?.filters.find(
     (filter) => filter.configuration.filterKey === RESOURCE_ID
   )?.configuration;
@@ -553,3 +600,23 @@ export const getAssociatedEntityType = (
   }
   return FILTER_CONFIG.get(dashboardId)?.associatedEntityType;
 };
+
+/**
+ * @param dashboardId id of the dashboard
+ * @returns whether dashboard is an endpoints only dashboard
+ */
+export const isEndpointsOnlyDashboard = (dashboardId: number): boolean => {
+  const filterConfig = FILTER_CONFIG.get(dashboardId);
+  if (!filterConfig) {
+    return false;
+  }
+  const endpointsFilter = filterConfig?.filters.find(
+    (filter) => filter.name === 'Endpoints'
+  );
+  if (endpointsFilter) {
+    // Verify if the dashboard has buckets filter, if not then it is an endpoints only dashboard
+    return !filterConfig.filters.some((filter) => filter.name === 'Buckets');
+  }
+
+  return false;
+};
diff --git a/packages/manager/src/features/CloudPulse/Utils/ReusableDashboardFilterUtils.test.ts b/packages/manager/src/features/CloudPulse/Utils/ReusableDashboardFilterUtils.test.ts
index 1f68344cf67..caff614be54 100644
--- a/packages/manager/src/features/CloudPulse/Utils/ReusableDashboardFilterUtils.test.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/ReusableDashboardFilterUtils.test.ts
@@ -133,6 +133,18 @@ it('test constructDimensionFilters method', () => {
   expect(result[0].filterValue).toEqual('primary');
 });
 
+it('test constructDimensionFilters method for endpoints only dashboard', () => {
+  const result = constructDimensionFilters({
+    dashboardObj: { ...mockDashboard, id: 10, service_type: 'objectstorage' },
+    filterValue: {},
+    resource: 'us-east-1.linodeobjects.com',
+    groupBy: [],
+  });
+  expect(result.length).toEqual(1);
+  expect(result[0].filterKey).toEqual('endpoint');
+  expect(result[0].filterValue).toEqual(['us-east-1.linodeobjects.com']);
+});
+
 it('test checkIfFilterNeededInMetricsCall method', () => {
   let result = checkIfFilterNeededInMetricsCall('region', 2);
   expect(result).toEqual(false);
diff --git a/packages/manager/src/features/CloudPulse/Utils/ReusableDashboardFilterUtils.ts b/packages/manager/src/features/CloudPulse/Utils/ReusableDashboardFilterUtils.ts
index edce614f656..b50354b1c52 100644
--- a/packages/manager/src/features/CloudPulse/Utils/ReusableDashboardFilterUtils.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/ReusableDashboardFilterUtils.ts
@@ -1,5 +1,6 @@
 import { defaultTimeDuration } from './CloudPulseDateTimePickerUtils';
-import { FILTER_CONFIG } from './FilterConfig';
+import { ENDPOINT } from './constants';
+import { FILTER_CONFIG, isEndpointsOnlyDashboard } from './FilterConfig';
 import { CloudPulseAvailableViews } from './models';
 
 import type { DashboardProperties } from '../Dashboard/CloudPulseDashboard';
@@ -55,7 +56,9 @@ export const getDashboardProperties = (
     }),
     dashboardId: dashboardObj.id,
     duration: timeDuration ?? defaultTimeDuration(),
-    resources: [String(resource)],
+    resources: isEndpointsOnlyDashboard(dashboardObj.id)
+      ? []
+      : [String(resource)],
     serviceType: dashboardObj.service_type,
     savePref: false,
     groupBy,
@@ -148,13 +151,20 @@ export const checkIfFilterNeededInMetricsCall = (
 export const constructDimensionFilters = (
   props: ReusableDashboardFilterUtilProps
 ): CloudPulseMetricsAdditionalFilters[] => {
-  const { dashboardObj, filterValue } = props;
-  return Object.keys(filterValue)
+  const { dashboardObj, filterValue, resource } = props;
+  const filters = Object.keys(filterValue)
     .filter((key) => checkIfFilterNeededInMetricsCall(key, dashboardObj.id))
     .map((key) => ({
       filterKey: key,
       filterValue: filterValue[key],
     }));
+  if (isEndpointsOnlyDashboard(dashboardObj.id)) {
+    filters.push({
+      filterKey: ENDPOINT,
+      filterValue: [String(resource)],
+    });
+  }
+  return filters;
 };
 
 /**
diff --git a/packages/manager/src/features/CloudPulse/Utils/models.ts b/packages/manager/src/features/CloudPulse/Utils/models.ts
index a4ef0497eb6..248210d1f9c 100644
--- a/packages/manager/src/features/CloudPulse/Utils/models.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/models.ts
@@ -1,3 +1,4 @@
+import type { CloudPulseResources } from '../shared/CloudPulseResourcesSelect';
 import type { AssociatedEntityType } from '../shared/types';
 import type {
   Capabilities,
@@ -56,6 +57,7 @@ export interface CloudPulseServiceTypeFilters {
  * As of now, the list of possible custom filters are engine, database type, this union type will be expanded if we start enhancing our custom select config
  */
 export type QueryFunctionType =
+  | CloudPulseResources[]
   | DatabaseEngine[]
   | DatabaseInstance[]
   | DatabaseType[]
@@ -144,6 +146,11 @@ export interface CloudPulseServiceTypeFiltersConfiguration {
    */
   filterType: string;
 
+  /**
+   * If this is true, we will only allow users to select a certain threshold
+   */
+  hasRestrictedSelections?: boolean;
+
   /**
    * If this is true, we will pass the filter in the metrics api otherwise, we don't
    */
@@ -157,7 +164,6 @@ export interface CloudPulseServiceTypeFiltersConfiguration {
    * If this is true, multiselect will be enabled for the filter, only applicable for static and dynamic, not for predefined ones
    */
   isMultiSelect?: boolean;
-
   /**
    * If this is true, we will pass filter as an optional filter
    */
@@ -167,6 +173,7 @@ export interface CloudPulseServiceTypeFiltersConfiguration {
    * If this is true, we will only allow users to select a certain threshold, only applicable for static and dynamic, not for predefined ones
    */
   maxSelections?: number;
+
   /**
    * The name of the filter
    */
diff --git a/packages/manager/src/features/CloudPulse/Utils/utils.test.ts b/packages/manager/src/features/CloudPulse/Utils/utils.test.ts
index dab6f0bea3f..c64562946a9 100644
--- a/packages/manager/src/features/CloudPulse/Utils/utils.test.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/utils.test.ts
@@ -1,7 +1,11 @@
 import { regionFactory } from '@linode/utilities';
 import { describe, expect, it } from 'vitest';
 
-import { kubernetesClusterFactory, serviceTypesFactory } from 'src/factories';
+import {
+  kubernetesClusterFactory,
+  objectStorageBucketFactoryGen2,
+  serviceTypesFactory,
+} from 'src/factories';
 import {
   firewallEntityfactory,
   firewallFactory,
@@ -29,6 +33,7 @@ import {
   filterKubernetesClusters,
   getEnabledServiceTypes,
   getFilteredDimensions,
+  getValidSortedEndpoints,
   isValidFilter,
   isValidPort,
   useIsAclpSupportedRegion,
@@ -709,3 +714,38 @@ describe('arraysEqual', () => {
     expect(arraysEqual([1, 2, 3], [3, 2, 1])).toBe(true);
   });
 });
+
+describe('getValidSortedEndpoints', () => {
+  it('should return an empty array when buckets are undefined', () => {
+    expect(getValidSortedEndpoints(undefined)).toEqual([]);
+  });
+  it('should return the valid and unique sorted endpoints', () => {
+    const buckets = [
+      objectStorageBucketFactoryGen2.build({
+        s3_endpoint: 'a',
+        region: 'us-east',
+      }),
+      objectStorageBucketFactoryGen2.build({
+        s3_endpoint: 'b',
+        region: undefined,
+      }),
+      objectStorageBucketFactoryGen2.build({
+        s3_endpoint: 'c',
+        region: 'us-east',
+      }),
+      objectStorageBucketFactoryGen2.build({
+        s3_endpoint: 'c',
+        region: 'us-east',
+      }),
+      objectStorageBucketFactoryGen2.build({
+        s3_endpoint: undefined,
+        region: 'us-east',
+      }),
+    ];
+    // Only a and c are valid, so they are sorted and returned
+    expect(getValidSortedEndpoints(buckets)).toEqual([
+      { id: 'a', label: 'a', region: 'us-east' },
+      { id: 'c', label: 'c', region: 'us-east' },
+    ]);
+  });
+});
diff --git a/packages/manager/src/features/CloudPulse/Utils/utils.ts b/packages/manager/src/features/CloudPulse/Utils/utils.ts
index 5978318658b..974a59bc158 100644
--- a/packages/manager/src/features/CloudPulse/Utils/utils.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/utils.ts
@@ -23,6 +23,7 @@ import {
 } from './constants';
 
 import type { FetchOptions } from '../Alerts/CreateAlert/Criteria/DimensionFilterValue/constants';
+import type { CloudPulseResources } from '../shared/CloudPulseResourcesSelect';
 import type { AssociatedEntityType } from '../shared/types';
 import type { MetricsDimensionFilter } from '../Widget/components/DimensionFilters/types';
 import type {
@@ -37,6 +38,7 @@ import type {
   FirewallDeviceEntity,
   KubernetesCluster,
   MonitoringCapabilities,
+  ObjectStorageBucket,
   ResourcePage,
   Service,
   ServiceTypesList,
@@ -567,6 +569,29 @@ export const filterKubernetesClusters = (
     .sort((a, b) => a.label.localeCompare(b.label));
 };
 
+/**
+ * @param buckets The list of buckets
+ * @returns The valid sorted endpoints
+ */
+export const getValidSortedEndpoints = (
+  buckets: ObjectStorageBucket[] | undefined
+): CloudPulseResources[] => {
+  if (!buckets) return [];
+
+  const visitedEndpoints = new Set<string>();
+  const uniqueEndpoints: CloudPulseResources[] = [];
+
+  buckets.forEach(({ s3_endpoint: s3Endpoint, region }) => {
+    if (s3Endpoint && region && !visitedEndpoints.has(s3Endpoint)) {
+      visitedEndpoints.add(s3Endpoint);
+      uniqueEndpoints.push({ id: s3Endpoint, label: s3Endpoint, region });
+    }
+  });
+
+  uniqueEndpoints.sort((a, b) => a.label.localeCompare(b.label));
+  return uniqueEndpoints;
+};
+
 /**
  * @param obj1 The first object to be compared
  * @param obj2 The second object to be compared
diff --git a/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidgetRenderer.tsx b/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidgetRenderer.tsx
index 1941420d04b..0a3d1d7725a 100644
--- a/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidgetRenderer.tsx
+++ b/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidgetRenderer.tsx
@@ -142,8 +142,6 @@ export const RenderWidgets = React.memo(
 
     if (
       !dashboard.service_type ||
-      // eslint-disable-next-line sonarjs/no-inverted-boolean-check
-      !(resources.length > 0) ||
       (!isJweTokenFetching && !jweToken?.token) ||
       !resourceList?.length
     ) {
diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseCustomSelect.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseCustomSelect.tsx
index 556f1c5ad1a..f1b391996b1 100644
--- a/packages/manager/src/features/CloudPulse/shared/CloudPulseCustomSelect.tsx
+++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseCustomSelect.tsx
@@ -254,6 +254,7 @@ export const CloudPulseCustomSelect = React.memo(
         errorText={staticErrorText}
         isOptionEqualToValue={(option, value) => option.label === value.label}
         label={label || 'Select a Value'}
+        loading={isLoading}
         multiple={isMultiSelect}
         noMarginTop
         onChange={handleChange}
diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseEndpointsSelect.test.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseEndpointsSelect.test.tsx
index e38acc948bd..238f2c3c0f5 100644
--- a/packages/manager/src/features/CloudPulse/shared/CloudPulseEndpointsSelect.test.tsx
+++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseEndpointsSelect.test.tsx
@@ -2,7 +2,6 @@ import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import * as React from 'react';
 
-import { objectStorageBucketFactory } from 'src/factories';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { CloudPulseEndpointsSelect } from './CloudPulseEndpointsSelect';
@@ -24,37 +23,53 @@ vi.mock('src/queries/cloudpulse/resources', async () => {
 const mockEndpointHandler = vi.fn();
 const SELECT_ALL = 'Select All';
 const ARIA_SELECTED = 'aria-selected';
+const ARIA_DISABLED = 'aria-disabled';
 
-const mockBuckets: CloudPulseResources[] = [
+const mockEndpoints: CloudPulseResources[] = [
   {
-    id: 'obj-bucket-1.us-east-1.linodeobjects.com',
-    label: 'obj-bucket-1.us-east-1.linodeobjects.com',
+    id: 'us-east-1.linodeobjects.com',
+    label: 'us-east-1.linodeobjects.com',
     region: 'us-east',
-    endpoint: 'us-east-1.linodeobjects.com',
   },
   {
-    id: 'obj-bucket-2.us-east-2.linodeobjects.com',
-    label: 'obj-bucket-2.us-east-2.linodeobjects.com',
+    id: 'us-east-2.linodeobjects.com',
+    label: 'us-east-2.linodeobjects.com',
     region: 'us-east',
-    endpoint: 'us-east-2.linodeobjects.com',
   },
   {
-    id: 'obj-bucket-1.br-gru-1.linodeobjects.com',
-    label: 'obj-bucket-1.br-gru-1.linodeobjects.com',
+    id: 'br-gru-1.linodeobjects.com',
+    label: 'br-gru-1.linodeobjects.com',
     region: 'us-east',
-    endpoint: 'br-gru-1.linodeobjects.com',
   },
 ];
 
+const exceedingmockEndpoints: CloudPulseResources[] = Array.from(
+  { length: 8 },
+  (_, i) => {
+    const idx = i + 1;
+    return {
+      id: `us-east-bucket-${idx}.com`,
+      label: `us-east-bucket-${idx}.com`,
+      region: 'us-east',
+    };
+  }
+);
+
 describe('CloudPulseEndpointsSelect component tests', () => {
   beforeEach(() => {
     vi.clearAllMocks();
-    objectStorageBucketFactory.resetSequenceNumber();
+    queryMocks.useResourcesQuery.mockReturnValue({
+      data: mockEndpoints,
+      isError: false,
+      isLoading: false,
+      status: 'success',
+    });
   });
 
   it('renders with the correct label and placeholder', () => {
     renderWithTheme(
       <CloudPulseEndpointsSelect
+        dashboardId={10}
         handleEndpointsSelection={mockEndpointHandler}
         label="Endpoints"
         region={'us-east'}
@@ -69,6 +84,7 @@ describe('CloudPulseEndpointsSelect component tests', () => {
   it('should render disabled component if the props are undefined', () => {
     renderWithTheme(
       <CloudPulseEndpointsSelect
+        dashboardId={10}
         disabled
         handleEndpointsSelection={mockEndpointHandler}
         label="Endpoints"
@@ -81,15 +97,9 @@ describe('CloudPulseEndpointsSelect component tests', () => {
   });
 
   it('should render endpoints', async () => {
-    queryMocks.useResourcesQuery.mockReturnValue({
-      data: mockBuckets,
-      isError: false,
-      isLoading: false,
-      status: 'success',
-    });
-
     renderWithTheme(
       <CloudPulseEndpointsSelect
+        dashboardId={10}
         handleEndpointsSelection={mockEndpointHandler}
         label="Endpoints"
         region={'us-east'}
@@ -102,27 +112,21 @@ describe('CloudPulseEndpointsSelect component tests', () => {
 
     expect(
       await screen.findByRole('option', {
-        name: mockBuckets[0].endpoint,
+        name: mockEndpoints[0].id,
       })
     ).toBeVisible();
 
     expect(
       await screen.findByRole('option', {
-        name: mockBuckets[1].endpoint,
+        name: mockEndpoints[1].id,
       })
     ).toBeVisible();
   });
 
   it('should be able to deselect the selected endpoints', async () => {
-    queryMocks.useResourcesQuery.mockReturnValue({
-      data: mockBuckets,
-      isError: false,
-      isLoading: false,
-      status: 'success',
-    });
-
     renderWithTheme(
       <CloudPulseEndpointsSelect
+        dashboardId={10}
         handleEndpointsSelection={mockEndpointHandler}
         label="Endpoints"
         region={'us-east'}
@@ -142,26 +146,20 @@ describe('CloudPulseEndpointsSelect component tests', () => {
     // Check that both endpoints are deselected
     expect(
       await screen.findByRole('option', {
-        name: mockBuckets[0].endpoint,
+        name: mockEndpoints[0].id,
       })
     ).toHaveAttribute(ARIA_SELECTED, 'false');
     expect(
       await screen.findByRole('option', {
-        name: mockBuckets[1].endpoint,
+        name: mockEndpoints[1].id,
       })
     ).toHaveAttribute(ARIA_SELECTED, 'false');
   });
 
   it('should select multiple endpoints', async () => {
-    queryMocks.useResourcesQuery.mockReturnValue({
-      data: mockBuckets,
-      isError: false,
-      isLoading: false,
-      status: 'success',
-    });
-
     renderWithTheme(
       <CloudPulseEndpointsSelect
+        dashboardId={10}
         handleEndpointsSelection={mockEndpointHandler}
         label="Endpoints"
         region={'us-east'}
@@ -173,29 +171,29 @@ describe('CloudPulseEndpointsSelect component tests', () => {
     await userEvent.click(await screen.findByRole('button', { name: 'Open' }));
     await userEvent.click(
       await screen.findByRole('option', {
-        name: mockBuckets[0].endpoint,
+        name: mockEndpoints[0].id,
       })
     );
     await userEvent.click(
       await screen.findByRole('option', {
-        name: mockBuckets[1].endpoint,
+        name: mockEndpoints[1].id,
       })
     );
 
     // Check that the correct endpoints are selected/not selected
     expect(
       await screen.findByRole('option', {
-        name: mockBuckets[0].endpoint,
+        name: mockEndpoints[0].id,
       })
     ).toHaveAttribute(ARIA_SELECTED, 'true');
     expect(
       await screen.findByRole('option', {
-        name: mockBuckets[1].endpoint,
+        name: mockEndpoints[1].id,
       })
     ).toHaveAttribute(ARIA_SELECTED, 'true');
     expect(
       await screen.findByRole('option', {
-        name: mockBuckets[2].endpoint,
+        name: mockEndpoints[2].id,
       })
     ).toHaveAttribute(ARIA_SELECTED, 'false');
     expect(
@@ -213,6 +211,7 @@ describe('CloudPulseEndpointsSelect component tests', () => {
 
     renderWithTheme(
       <CloudPulseEndpointsSelect
+        dashboardId={10}
         handleEndpointsSelection={mockEndpointHandler}
         label="Endpoints"
         region={'us-east'}
@@ -225,4 +224,89 @@ describe('CloudPulseEndpointsSelect component tests', () => {
       })
     ).toBeVisible();
   });
+
+  it('should handle endpoints selection limits correctly', async () => {
+    const user = userEvent.setup();
+
+    const allmockEndpoints = [...mockEndpoints, ...exceedingmockEndpoints];
+
+    queryMocks.useResourcesQuery.mockReturnValue({
+      data: allmockEndpoints,
+      isError: false,
+      isLoading: false,
+      status: 'success',
+    });
+
+    const { queryByRole } = renderWithTheme(
+      <CloudPulseEndpointsSelect
+        dashboardId={10}
+        handleEndpointsSelection={mockEndpointHandler}
+        hasRestrictedSelections={true}
+        label="Endpoints"
+        region="us-east"
+        serviceType="objectstorage"
+        xFilter={{ region: 'us-east' }}
+      />
+    );
+
+    await user.click(screen.getByRole('button', { name: 'Open' }));
+    expect(screen.getByText('Select up to 10 Endpoints')).toBeVisible();
+
+    // Select the first 10 endpoints
+    for (let i = 0; i < 10; i++) {
+      const option = await screen.findByRole('option', {
+        name: allmockEndpoints[i].id,
+      });
+      await user.click(option);
+    }
+
+    // Check if we have 10 selected endpoints
+    const selectedOptions = screen
+      .getAllByRole('option')
+      .filter((option) => option.getAttribute(ARIA_SELECTED) === 'true');
+    expect(selectedOptions.length).toBe(10);
+
+    // Check that the 11th endpoint is disabled
+    expect(
+      screen.getByRole('option', { name: allmockEndpoints[10].id })
+    ).toHaveAttribute(ARIA_DISABLED, 'true');
+
+    // Check "Select All" is not available when there are more endpoints than the limit
+    expect(queryByRole('option', { name: SELECT_ALL })).not.toBeInTheDocument();
+  });
+
+  it('should handle "Select All" when resource count equals limit', async () => {
+    const user = userEvent.setup();
+
+    queryMocks.useResourcesQuery.mockReturnValue({
+      data: [...mockEndpoints, ...exceedingmockEndpoints.slice(0, 7)],
+      isError: false,
+      isLoading: false,
+      status: 'success',
+    });
+
+    renderWithTheme(
+      <CloudPulseEndpointsSelect
+        dashboardId={10}
+        handleEndpointsSelection={mockEndpointHandler}
+        hasRestrictedSelections={true}
+        label="Endpoints"
+        region={'us-east'}
+        serviceType={'objectstorage'}
+        xFilter={{ region: 'us-east' }}
+      />
+    );
+
+    await user.click(screen.getByRole('button', { name: 'Open' }));
+    await user.click(screen.getByRole('option', { name: SELECT_ALL }));
+    await user.click(screen.getByRole('option', { name: 'Deselect All' }));
+
+    // Check all endpoints are deselected
+    mockEndpoints.forEach((endpoint) => {
+      expect(screen.getByRole('option', { name: endpoint.id })).toHaveAttribute(
+        ARIA_SELECTED,
+        'false'
+      );
+    });
+  });
 });
diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseEndpointsSelect.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseEndpointsSelect.tsx
index 382ed64eb92..a2837c587da 100644
--- a/packages/manager/src/features/CloudPulse/shared/CloudPulseEndpointsSelect.tsx
+++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseEndpointsSelect.tsx
@@ -1,11 +1,13 @@
 import { Autocomplete, SelectedIcon, StyledListItem } from '@linode/ui';
 import { Box } from '@mui/material';
-import React, { useMemo } from 'react';
+import React from 'react';
 
+import { useFlags } from 'src/hooks/useFlags';
 import { useResourcesQuery } from 'src/queries/cloudpulse/resources';
 
-import { RESOURCE_FILTER_MAP } from '../Utils/constants';
+import { ENDPOINT, RESOURCE_FILTER_MAP } from '../Utils/constants';
 import { filterEndpointsUsingRegion } from '../Utils/FilterBuilder';
+import { FILTER_CONFIG } from '../Utils/FilterConfig';
 import { deepEqual } from '../Utils/utils';
 import { CLOUD_PULSE_TEXT_FIELD_PROPS } from './styles';
 
@@ -13,20 +15,15 @@ import type {
   CloudPulseMetricsFilter,
   FilterValueType,
 } from '../Dashboard/CloudPulseDashboardLanding';
+import type { CloudPulseResources } from './CloudPulseResourcesSelect';
 import type { CloudPulseServiceType, FilterValue } from '@linode/api-v4';
+import type { CloudPulseResourceTypeMapFlag } from 'src/featureFlags';
 
-export interface CloudPulseEndpoints {
-  /**
-   * The label of the endpoint which is 's3_endpoint' in the response from the API
-   */
-  label: string;
+export interface CloudPulseEndpointsSelectProps {
   /**
-   * The region of the endpoint
+   * The dashboard id for the endpoints filter
    */
-  region: string;
-}
-
-export interface CloudPulseEndpointsSelectProps {
+  dashboardId: number;
   /**
    * The default value of the endpoints filter
    */
@@ -39,6 +36,10 @@ export interface CloudPulseEndpointsSelectProps {
    * The function to handle the endpoints selection
    */
   handleEndpointsSelection: (endpoints: string[], savePref?: boolean) => void;
+  /**
+   * Whether to restrict the selections
+   */
+  hasRestrictedSelections?: boolean;
   /**
    * The label of the endpoints filter
    */
@@ -70,6 +71,7 @@ export const CloudPulseEndpointsSelect = React.memo(
     const {
       defaultValue,
       disabled,
+      dashboardId,
       handleEndpointsSelection,
       label,
       placeholder,
@@ -77,39 +79,32 @@ export const CloudPulseEndpointsSelect = React.memo(
       serviceType,
       savePreferences,
       xFilter,
+      hasRestrictedSelections,
     } = props;
 
+    const flags = useFlags();
+
+    // Get the endpoints filter configuration for the dashboard
+    const endpointsFilterConfig = FILTER_CONFIG.get(dashboardId)?.filters.find(
+      (filter) => filter.configuration.filterKey === ENDPOINT
+    );
+    const filterFn = endpointsFilterConfig?.configuration.filterFn;
+
     const {
-      data: buckets,
+      data: validSortedEndpoints,
       isError,
       isLoading,
     } = useResourcesQuery(
       disabled !== undefined ? !disabled : Boolean(region && serviceType),
       serviceType,
       {},
-
-      RESOURCE_FILTER_MAP[serviceType ?? ''] ?? {}
+      RESOURCE_FILTER_MAP[serviceType ?? ''] ?? {},
+      undefined,
+      filterFn
     );
 
-    const validSortedEndpoints = useMemo(() => {
-      if (!buckets) return [];
-
-      const visitedEndpoints = new Set<string>();
-      const uniqueEndpoints: CloudPulseEndpoints[] = [];
-
-      buckets.forEach(({ endpoint, region }) => {
-        if (endpoint && region && !visitedEndpoints.has(endpoint)) {
-          visitedEndpoints.add(endpoint);
-          uniqueEndpoints.push({ label: endpoint, region });
-        }
-      });
-
-      uniqueEndpoints.sort((a, b) => a.label.localeCompare(b.label));
-      return uniqueEndpoints;
-    }, [buckets]);
-
     const [selectedEndpoints, setSelectedEndpoints] =
-      React.useState<CloudPulseEndpoints[]>();
+      React.useState<CloudPulseResources[]>();
 
     /**
      * This is used to track the open state of the autocomplete and useRef optimizes the re-renders that this component goes through and it is used for below
@@ -118,17 +113,49 @@ export const CloudPulseEndpointsSelect = React.memo(
      */
     const isAutocompleteOpen = React.useRef(false); // Ref to track the open state of Autocomplete
 
-    const getEndpointsList = React.useMemo<CloudPulseEndpoints[]>(() => {
+    const getEndpointsList = React.useMemo<CloudPulseResources[]>(() => {
       return filterEndpointsUsingRegion(validSortedEndpoints, xFilter) ?? [];
     }, [validSortedEndpoints, xFilter]);
 
+    // Maximum endpoints selection limit is fetched from launchdarkly
+    const maxEndpointsSelectionLimit = React.useMemo(() => {
+      const obj = flags.aclpResourceTypeMap?.find(
+        (item: CloudPulseResourceTypeMapFlag) =>
+          item.serviceType === serviceType
+      );
+      return obj?.maxResourceSelections || 10;
+    }, [serviceType, flags.aclpResourceTypeMap]);
+
+    const endpointsLimitReached = React.useMemo(() => {
+      return getEndpointsList.length > maxEndpointsSelectionLimit;
+    }, [getEndpointsList.length, maxEndpointsSelectionLimit]);
+
+    // Disable Select All option if the number of available endpoints are greater than the limit
+    const disableSelectAll = hasRestrictedSelections
+      ? endpointsLimitReached
+      : false;
+
+    const errorText = isError ? `Failed to fetch ${label || 'Endpoints'}.` : '';
+    const helperText =
+      !isError && hasRestrictedSelections
+        ? `Select up to ${maxEndpointsSelectionLimit} ${label}`
+        : '';
+
+    // Check if the number of selected endpoints are greater than or equal to the limit
+    const maxSelectionsReached = React.useMemo(() => {
+      return (
+        selectedEndpoints &&
+        selectedEndpoints.length >= maxEndpointsSelectionLimit
+      );
+    }, [selectedEndpoints, maxEndpointsSelectionLimit]);
+
     // Once the data is loaded, set the state variable with value stored in preferences
     React.useEffect(() => {
       if (disabled && !selectedEndpoints) {
         return;
       }
       // To save default values, go through side effects if disabled is false
-      if (!buckets || !savePreferences || selectedEndpoints) {
+      if (!validSortedEndpoints || !savePreferences || selectedEndpoints) {
         if (selectedEndpoints) {
           setSelectedEndpoints([]);
           handleEndpointsSelection([]);
@@ -146,7 +173,7 @@ export const CloudPulseEndpointsSelect = React.memo(
         setSelectedEndpoints(endpoints);
       }
       // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [buckets, region, xFilter, serviceType]);
+    }, [validSortedEndpoints, region, xFilter, serviceType]);
 
     return (
       <Autocomplete
@@ -154,7 +181,9 @@ export const CloudPulseEndpointsSelect = React.memo(
         clearOnBlur
         data-testid="endpoint-select"
         disabled={disabled}
-        errorText={isError ? `Failed to fetch ${label || 'Endpoints'}.` : ''}
+        disableSelectAll={disableSelectAll}
+        errorText={errorText}
+        helperText={helperText}
         isOptionEqualToValue={(option, value) => option.label === value.label}
         label={label || 'Endpoints'}
         limitTags={1}
@@ -198,8 +227,20 @@ export const CloudPulseEndpointsSelect = React.memo(
             ? StyledListItem
             : 'li';
 
+          const isMaxSelectionsReached =
+            maxSelectionsReached &&
+            !isEndpointSelected &&
+            !isSelectAllORDeslectAllOption;
+
           return (
-            <ListItem {...rest} data-qa-option key={key}>
+            <ListItem
+              {...rest}
+              aria-disabled={
+                hasRestrictedSelections ? isMaxSelectionsReached : false
+              }
+              data-qa-option
+              key={key}
+            >
               <>
                 <Box sx={{ flexGrow: 1 }}>{option.label}</Box>
                 <SelectedIcon visible={isEndpointSelected || false} />
diff --git a/packages/manager/src/mocks/serverHandlers.ts b/packages/manager/src/mocks/serverHandlers.ts
index c5bc0413b1d..d0eb07d5767 100644
--- a/packages/manager/src/mocks/serverHandlers.ts
+++ b/packages/manager/src/mocks/serverHandlers.ts
@@ -3563,6 +3563,13 @@ export const handlers = [
           service_type: 'objectstorage',
         })
       );
+      response.data.push(
+        dashboardFactory.build({
+          id: 10,
+          label: 'Endpoint Dashboard',
+          service_type: 'objectstorage',
+        })
+      );
     }
 
     if (params.serviceType === 'blockstorage') {
@@ -3983,6 +3990,9 @@ export const handlers = [
     } else if (id === '9') {
       serviceType = 'lke';
       dashboardLabel = 'Kubernetes Enterprise Dashboard';
+    } else if (id === '10') {
+      serviceType = 'objectstorage';
+      dashboardLabel = 'Endpoint Dashboard';
     } else {
       serviceType = 'linode';
       dashboardLabel = 'Linode Service I/O Statistics';
diff --git a/packages/manager/src/queries/cloudpulse/resources.ts b/packages/manager/src/queries/cloudpulse/resources.ts
index 1dfbe72d55d..9b4fd8a535a 100644
--- a/packages/manager/src/queries/cloudpulse/resources.ts
+++ b/packages/manager/src/queries/cloudpulse/resources.ts
@@ -45,7 +45,7 @@ export const useResourcesQuery = (
         }
         const id =
           resourceType === 'objectstorage'
-            ? resource.hostname
+            ? resource.hostname || resource.id
             : String(resource.id);
         return {
           engineType: resource.engine,

From a5e1f488ae777cac0cd51a2a954c182559c97fad Mon Sep 17 00:00:00 2001
From: venkatmano-akamai <vmangalr@akamai.com>
Date: Wed, 26 Nov 2025 12:53:21 +0530
Subject: [PATCH 41/91] upcoming: [DI-28222] : Integration for widget Level
 dimension filters in cloudpulse metrics  (#13116)

* upcoming: [DI-28222] - Integration changes for dimension filters

* upcoming: [DI-28222] - Integration changes for dimension filters

* upcoming: [DI-28222] - Fix key issue

* upcoming: [DI-28222] - Code refactoring and issue fixes

* upcoming: [DI-28222] - Code refactoring

* upcoming: [DI-28222] - Add UT for renderers

* upcoming: [DI-28222] - Code refactoring to continue support widget filters, incase of widget dimension filters not supported

* upcoming: [DI-28222] - UT fix

---------

Co-authored-by: agorthi-akamai <agorthi@akamai.com>
---
 ...r-13116-upcoming-features-1763642170773.md |   5 +
 .../dbaas-widgets-verification.spec.ts        |   8 +-
 .../FirewallDimensionFilterAutocomplete.tsx   |   5 +-
 .../ValueFieldRenderer.tsx                    |   1 +
 .../features/CloudPulse/Utils/FilterConfig.ts |   8 +
 .../src/features/CloudPulse/Utils/utils.ts    |  11 +-
 .../CloudPulse/Widget/CloudPulseWidget.tsx    | 161 +++++++++++-
 .../Widget/CloudPulseWidgetRenderer.tsx       |   7 +
 .../CloudPulseDimensionFilterDrawer.test.tsx  |   7 +
 .../CloudPulseDimensionFilterDrawer.tsx       |   8 +
 .../CloudPulseDimensionFilterFields.test.tsx  |  92 +++++++
 .../CloudPulseDimensionFilterFields.tsx       | 236 ++++++++++++++++++
 ...CloudPulseDimensionFilterRenderer.test.tsx | 188 ++++++++++++++
 .../CloudPulseDimensionFilterRenderer.tsx     |  50 +++-
 .../CloudPulseDimensionFiltersSelect.test.tsx |   1 +
 .../CloudPulseDimensionFiltersSelect.tsx      |   8 +
 .../CloudPulse/shared/DimensionTransform.ts   |   1 +
 packages/manager/src/mocks/serverHandlers.ts  |  24 ++
 .../manager/src/queries/cloudpulse/metrics.ts |   3 +-
 .../utilities/src/__data__/regionsData.ts     |   5 +-
 20 files changed, 799 insertions(+), 30 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13116-upcoming-features-1763642170773.md
 create mode 100644 packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterFields.test.tsx
 create mode 100644 packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterFields.tsx
 create mode 100644 packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterRenderer.test.tsx

diff --git a/packages/manager/.changeset/pr-13116-upcoming-features-1763642170773.md b/packages/manager/.changeset/pr-13116-upcoming-features-1763642170773.md
new file mode 100644
index 00000000000..a3617688321
--- /dev/null
+++ b/packages/manager/.changeset/pr-13116-upcoming-features-1763642170773.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Add integration changes with `CloudPulseWidget` for widget level dimension support in CloudPulse metrics ([#13116](https://github.com/linode/manager/pull/13116))
diff --git a/packages/manager/cypress/e2e/core/cloudpulse/dbaas-widgets-verification.spec.ts b/packages/manager/cypress/e2e/core/cloudpulse/dbaas-widgets-verification.spec.ts
index c4968097b77..4f3d43a6bb1 100644
--- a/packages/manager/cypress/e2e/core/cloudpulse/dbaas-widgets-verification.spec.ts
+++ b/packages/manager/cypress/e2e/core/cloudpulse/dbaas-widgets-verification.spec.ts
@@ -104,7 +104,7 @@ const dashboard = dashboardFactory.build({
   widgets: metrics.map(({ name, title, unit, yLabel }) =>
     widgetFactory.build({
       entity_ids: [String(id)],
-      filters: [...dimensions],
+      filters: [],
       label: title,
       metric: name,
       unit,
@@ -367,7 +367,7 @@ describe('Integration Tests for DBaaS Dashboard ', () => {
             (filter: DimensionFilter) => filter.dimension_label === 'node_type'
           );
 
-          expect(nodeTypeFilter).to.have.length(2);
+          expect(nodeTypeFilter).to.have.length(1);
           expect(nodeTypeFilter[0].operator).to.equal('eq');
           expect(nodeTypeFilter[0].value).to.equal('secondary');
         });
@@ -462,7 +462,7 @@ describe('Integration Tests for DBaaS Dashboard ', () => {
         const nodeTypeFilter = filters.filter(
           (filter: DimensionFilter) => filter.dimension_label === 'node_type'
         );
-        expect(nodeTypeFilter).to.have.length(2);
+        expect(nodeTypeFilter).to.have.length(1);
         expect(nodeTypeFilter[0].operator).to.equal('eq');
         expect(nodeTypeFilter[0].value).to.equal('secondary');
 
@@ -537,7 +537,7 @@ describe('Integration Tests for DBaaS Dashboard ', () => {
         const nodeTypeFilter = filters.filter(
           (filter: DimensionFilter) => filter.dimension_label === 'node_type'
         );
-        expect(nodeTypeFilter).to.have.length(2);
+        expect(nodeTypeFilter).to.have.length(1);
         expect(nodeTypeFilter[0].operator).to.equal('eq');
         expect(nodeTypeFilter[0].value).to.equal('secondary');
       });
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/FirewallDimensionFilterAutocomplete.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/FirewallDimensionFilterAutocomplete.tsx
index 09b482f646d..6d5d2715c0f 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/FirewallDimensionFilterAutocomplete.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/FirewallDimensionFilterAutocomplete.tsx
@@ -30,6 +30,7 @@ export const FirewallDimensionFilterAutocomplete = (
     scope,
     serviceType,
     type,
+    selectedRegions,
   } = props;
 
   const { data: regions } = useRegionsQuery();
@@ -37,8 +38,10 @@ export const FirewallDimensionFilterAutocomplete = (
   const { values, isLoading, isError } = useFirewallFetchOptions({
     associatedEntityType: entityType,
     dimensionLabel,
+    regions: selectedRegions
+      ? regions?.filter(({ id }) => selectedRegions.includes(id))
+      : regions,
     entities,
-    regions,
     scope,
     serviceType,
     type,
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/ValueFieldRenderer.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/ValueFieldRenderer.tsx
index 40a5e2ef8ed..bb85115f0fd 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/ValueFieldRenderer.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/ValueFieldRenderer.tsx
@@ -194,6 +194,7 @@ export const ValueFieldRenderer = (props: ValueFieldRendererProps) => {
             entityType={entityType}
             placeholderText={config.placeholder ?? autocompletePlaceholder}
             scope={scope}
+            selectedRegions={selectedRegions}
           />
         );
       case 'objectstorage':
diff --git a/packages/manager/src/features/CloudPulse/Utils/FilterConfig.ts b/packages/manager/src/features/CloudPulse/Utils/FilterConfig.ts
index 0f6debbc6bb..9ab7b01b533 100644
--- a/packages/manager/src/features/CloudPulse/Utils/FilterConfig.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/FilterConfig.ts
@@ -151,6 +151,7 @@ export const DBAAS_CONFIG: Readonly<CloudPulseServiceTypeFilterMap> = {
         isMetricsFilter: false, // if it is false, it will go as a part of filter params, else global filter
         isMultiSelect: false,
         name: 'Node Type',
+        dimensionKey: 'node_type',
         neededInViews: [
           CloudPulseAvailableViews.service,
           CloudPulseAvailableViews.central,
@@ -203,6 +204,7 @@ export const NODEBALANCER_CONFIG: Readonly<CloudPulseServiceTypeFilterMap> = {
         isMetricsFilter: false,
         isOptional: true,
         name: 'Ports',
+        dimensionKey: 'port',
         neededInViews: [
           CloudPulseAvailableViews.central,
           CloudPulseAvailableViews.service,
@@ -256,6 +258,7 @@ export const FIREWALL_CONFIG: Readonly<CloudPulseServiceTypeFilterMap> = {
         isMetricsFilter: true,
         isMultiSelect: false,
         name: 'Linode Region',
+        dimensionKey: 'region_id',
         neededInViews: [
           CloudPulseAvailableViews.central,
           CloudPulseAvailableViews.service,
@@ -274,6 +277,7 @@ export const FIREWALL_CONFIG: Readonly<CloudPulseServiceTypeFilterMap> = {
         isMultiSelect: true,
         name: 'Interface Types',
         isOptional: true,
+        dimensionKey: 'interface_type',
         neededInViews: [
           CloudPulseAvailableViews.central,
           CloudPulseAvailableViews.service,
@@ -302,6 +306,7 @@ export const FIREWALL_CONFIG: Readonly<CloudPulseServiceTypeFilterMap> = {
         isMetricsFilter: false,
         isOptional: true,
         name: 'Interface IDs',
+        dimensionKey: 'interface_id',
         neededInViews: [
           CloudPulseAvailableViews.central,
           CloudPulseAvailableViews.service,
@@ -359,6 +364,7 @@ export const FIREWALL_NODEBALANCER_CONFIG: Readonly<CloudPulseServiceTypeFilterM
           isMetricsFilter: true,
           name: 'NodeBalancer Region',
           priority: 2,
+          dimensionKey: 'region_id',
           neededInViews: [
             CloudPulseAvailableViews.central,
             CloudPulseAvailableViews.service,
@@ -377,6 +383,7 @@ export const FIREWALL_NODEBALANCER_CONFIG: Readonly<CloudPulseServiceTypeFilterM
           isMultiSelect: true,
           isOptional: true,
           name: 'NodeBalancers',
+          dimensionKey: 'nodebalancer_id',
           neededInViews: [
             CloudPulseAvailableViews.central,
             CloudPulseAvailableViews.service,
@@ -419,6 +426,7 @@ export const OBJECTSTORAGE_CONFIG_BUCKET: Readonly<CloudPulseServiceTypeFilterMa
           isMultiSelect: true,
           name: 'Endpoints',
           priority: 2,
+          dimensionKey: 'endpoint',
           neededInViews: [CloudPulseAvailableViews.central],
           filterFn: (resources: ObjectStorageBucket[]) =>
             getValidSortedEndpoints(resources),
diff --git a/packages/manager/src/features/CloudPulse/Utils/utils.ts b/packages/manager/src/features/CloudPulse/Utils/utils.ts
index 974a59bc158..b6173898d61 100644
--- a/packages/manager/src/features/CloudPulse/Utils/utils.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/utils.ts
@@ -481,7 +481,10 @@ export const isValidFilter = (
   if (!dimension) return false;
 
   const dimensionConfig =
-    valueFieldConfig[filter.dimension_label] ?? valueFieldConfig['*'];
+    valueFieldConfig[filter.dimension_label] ??
+    valueFieldConfig[
+      !dimension.values || dimension.values.length === 0 ? 'emptyValue' : '*'
+    ];
 
   const dimensionFieldConfig = dimensionConfig[operatorGroup];
 
@@ -493,11 +496,7 @@ export const isValidFilter = (
       String(filter.value ?? ''),
       dimensionFieldConfig
     );
-  } else if (
-    dimensionFieldConfig.type === 'textfield' ||
-    !dimension.values ||
-    !dimension.values.length
-  ) {
+  } else if (dimensionFieldConfig.type === 'textfield') {
     return true;
   }
 
diff --git a/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidget.tsx b/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidget.tsx
index e401c2876cc..bba0b004af4 100644
--- a/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidget.tsx
+++ b/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidget.tsx
@@ -1,4 +1,4 @@
-import { useProfile } from '@linode/queries';
+import { useProfile, useRegionsQuery } from '@linode/queries';
 import { Box, Paper, Typography } from '@linode/ui';
 import { GridLegacy, Stack, useTheme } from '@mui/material';
 import { DateTime } from 'luxon';
@@ -7,6 +7,8 @@ import React from 'react';
 import { useFlags } from 'src/hooks/useFlags';
 import { useCloudPulseMetricsQuery } from 'src/queries/cloudpulse/metrics';
 
+import { useBlockStorageFetchOptions } from '../Alerts/CreateAlert/Criteria/DimensionFilterValue/useBlockStorageFetchOptions';
+import { useFirewallFetchOptions } from '../Alerts/CreateAlert/Criteria/DimensionFilterValue/useFirewallFetchOptions';
 import { WidgetFilterGroupByRenderer } from '../GroupBy/WidgetFilterGroupByRenderer';
 import {
   generateGraphData,
@@ -18,10 +20,17 @@ import {
   SIZE,
   TIME_GRANULARITY,
 } from '../Utils/constants';
-import { constructAdditionalRequestFilters } from '../Utils/FilterBuilder';
+import {
+  constructAdditionalRequestFilters,
+  constructWidgetDimensionFilters,
+} from '../Utils/FilterBuilder';
+import { FILTER_CONFIG } from '../Utils/FilterConfig';
 import { generateCurrentUnit } from '../Utils/unitConversion';
 import { useAclpPreference } from '../Utils/UserPreference';
-import { convertStringToCamelCasesWithSpaces } from '../Utils/utils';
+import {
+  convertStringToCamelCasesWithSpaces,
+  getFilteredDimensions,
+} from '../Utils/utils';
 import { CloudPulseAggregateFunction } from './components/CloudPulseAggregateFunction';
 import { CloudPulseIntervalSelect } from './components/CloudPulseIntervalSelect';
 import { CloudPulseLineGraph } from './components/CloudPulseLineGraph';
@@ -30,6 +39,7 @@ import { ZoomIcon } from './components/Zoomer';
 
 import type { FilterValueType } from '../Dashboard/CloudPulseDashboardLanding';
 import type { CloudPulseResources } from '../shared/CloudPulseResourcesSelect';
+import type { MetricsDimensionFilter } from './components/DimensionFilters/types';
 import type {
   CloudPulseServiceType,
   DateTimeWithPreset,
@@ -183,6 +193,9 @@ export const CloudPulseWidget = (props: CloudPulseWidgetProperties) => {
     dashboardId,
     region,
   } = props;
+  const [dimensionFilters, setDimensionFilters] = React.useState<
+    MetricsDimensionFilter[] | undefined
+  >(widget.filters);
 
   const timezone =
     duration.timeZone ?? profile?.timezone ?? DateTime.local().zoneName;
@@ -191,13 +204,93 @@ export const CloudPulseWidget = (props: CloudPulseWidgetProperties) => {
   const scaledWidgetUnit = React.useRef(generateCurrentUnit(unit));
 
   const jweTokenExpiryError = 'Token expired';
-  const filters: Filters[] | undefined =
-    additionalFilters?.length || widget?.filters?.length
+  const { data: regions } = useRegionsQuery();
+  const linodesFetch = useFirewallFetchOptions({
+    dimensionLabel: 'linode_id',
+    type: 'metrics',
+    entities: entityIds,
+    regions: regions?.filter((region) => region.id === linodeRegion) ?? [],
+    scope: 'entity',
+    serviceType,
+    associatedEntityType: FILTER_CONFIG.get(dashboardId)?.associatedEntityType,
+  });
+  const vpcFetch = useFirewallFetchOptions({
+    dimensionLabel: 'vpc_subnet_id',
+    type: 'metrics',
+    entities: entityIds,
+    regions: regions?.filter((region) => region.id === linodeRegion) ?? [],
+    scope: 'entity',
+    serviceType,
+    associatedEntityType: FILTER_CONFIG.get(dashboardId)?.associatedEntityType,
+  });
+  const linodeFromVolumes = useBlockStorageFetchOptions({
+    entities: entityIds,
+    dimensionLabel: 'linode_id',
+    regions: regions?.filter(({ id }) => id === region) ?? [],
+    type: 'metrics',
+    scope: 'entity',
+    serviceType,
+  });
+  // Determine which fetch object is relevant for linodes
+  const activeLinodeFetch =
+    serviceType === 'blockstorage' ? linodeFromVolumes : linodesFetch;
+
+  // Combine loading states
+  const isLoadingFilters = activeLinodeFetch.isLoading || vpcFetch.isLoading;
+
+  const excludeDimensionFilters = React.useMemo(() => {
+    return (
+      FILTER_CONFIG.get(dashboardId)
+        ?.filters.filter(
+          ({ configuration }) => configuration.dimensionKey !== undefined
+        )
+        .map(({ configuration }) => configuration.dimensionKey) ?? []
+    );
+  }, [dashboardId]);
+  const filteredDimensions = React.useMemo(() => {
+    return excludeDimensionFilters && excludeDimensionFilters.length > 0
+      ? availableMetrics?.dimensions.filter(
+          ({ dimension_label: dimensionLabel }) =>
+            !excludeDimensionFilters.includes(dimensionLabel)
+        )
+      : availableMetrics?.dimensions;
+  }, [availableMetrics?.dimensions, excludeDimensionFilters]);
+
+  const filteredSelections = React.useMemo(() => {
+    if (isLoadingFilters || !flags.aclp?.showWidgetDimensionFilters) {
+      return dimensionFilters ?? [];
+    }
+
+    return getFilteredDimensions({
+      dimensions: filteredDimensions ?? [],
+      linodes: activeLinodeFetch,
+      vpcs: vpcFetch,
+      dimensionFilters,
+    });
+  }, [
+    activeLinodeFetch,
+    dimensionFilters,
+    filteredDimensions,
+    flags.aclp?.showWidgetDimensionFilters,
+    isLoadingFilters,
+    vpcFetch,
+  ]);
+
+  const filters: Filters[] | undefined = React.useMemo(() => {
+    return additionalFilters?.length ||
+      widget?.filters?.length ||
+      dimensionFilters?.length
       ? [
           ...constructAdditionalRequestFilters(additionalFilters ?? []),
-          ...(widget.filters ?? []),
+          ...[...(constructWidgetDimensionFilters(filteredSelections) ?? [])], // dashboard level filters followed by widget filters
         ]
       : undefined;
+  }, [
+    additionalFilters,
+    widget?.filters?.length,
+    dimensionFilters?.length,
+    filteredSelections,
+  ]);
 
   /**
    *
@@ -274,6 +367,34 @@ export const CloudPulseWidget = (props: CloudPulseWidgetProperties) => {
     },
     []
   );
+
+  const handleDimensionFiltersChange = React.useCallback(
+    (selectedFilters: MetricsDimensionFilter[]) => {
+      if (savePref) {
+        updatePreferences(widget.label, {
+          filters: selectedFilters
+            .map((filter) => {
+              if (
+                filter.value !== null &&
+                filter.dimension_label !== null &&
+                filter.operator !== null
+              ) {
+                return {
+                  dimension_label: filter.dimension_label,
+                  operator: filter.operator,
+                  value: filter.value,
+                };
+              } else {
+                return undefined;
+              }
+            })
+            .filter((filter) => filter !== undefined),
+        });
+      }
+      setDimensionFilters(selectedFilters);
+    },
+    [savePref, updatePreferences, widget.label]
+  );
   const {
     data: metricsList,
     error,
@@ -295,6 +416,7 @@ export const CloudPulseWidget = (props: CloudPulseWidgetProperties) => {
       filters, // any additional dimension filters will be constructed and passed here
     },
     {
+      isFiltersLoading: isLoadingFilters,
       authToken,
       isFlags: Boolean(flags && !isJweTokenFetching),
       label: widget.label,
@@ -332,6 +454,24 @@ export const CloudPulseWidget = (props: CloudPulseWidgetProperties) => {
   const end = DateTime.fromISO(duration.end, { zone: 'GMT' });
   const hours = end.diff(start, 'hours').hours;
   const tickFormat = hours <= 24 ? 'hh:mm a' : 'LLL dd';
+
+  React.useEffect(() => {
+    if (
+      filteredSelections.length !== (dimensionFilters?.length ?? 0) &&
+      !linodesFetch.isLoading &&
+      !vpcFetch.isLoading &&
+      !linodeFromVolumes.isLoading
+    ) {
+      handleDimensionFiltersChange(filteredSelections);
+    }
+  }, [
+    filteredSelections,
+    dimensionFilters,
+    handleDimensionFiltersChange,
+    linodesFetch.isLoading,
+    vpcFetch.isLoading,
+    linodeFromVolumes.isLoading,
+  ]);
   return (
     <GridLegacy container item lg={widget.size} xs={12}>
       <Stack
@@ -394,11 +534,12 @@ export const CloudPulseWidget = (props: CloudPulseWidgetProperties) => {
               )}
               <Box sx={{ display: 'flex', gap: 2 }}>
                 {flags.aclp?.showWidgetDimensionFilters && (
-                  <CloudPulseDimensionFiltersSelect // upcoming: Need to pass selected dimensions from widget in upcoming PR
-                    dimensionOptions={availableMetrics?.dimensions ?? []}
+                  <CloudPulseDimensionFiltersSelect
+                    dashboardId={dashboardId}
+                    dimensionOptions={filteredDimensions ?? []}
                     drawerLabel={availableMetrics?.label ?? ''}
-                    handleSelectionChange={() => {}}
-                    selectedDimensions={[]}
+                    handleSelectionChange={handleDimensionFiltersChange}
+                    selectedDimensions={filteredSelections}
                     selectedEntities={entityIds}
                     selectedRegions={linodeRegion ? [linodeRegion] : undefined}
                     serviceType={serviceType}
diff --git a/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidgetRenderer.tsx b/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidgetRenderer.tsx
index 0a3d1d7725a..d3917306c03 100644
--- a/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidgetRenderer.tsx
+++ b/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidgetRenderer.tsx
@@ -1,6 +1,8 @@
 import { GridLegacy, Paper } from '@mui/material';
 import React from 'react';
 
+import { useFlags } from 'src/hooks/useFlags';
+
 import { CloudPulseErrorPlaceholder } from '../shared/CloudPulseErrorPlaceholder';
 import { createObjectCopy } from '../Utils/utils';
 import { CloudPulseWidget } from './CloudPulseWidget';
@@ -75,6 +77,8 @@ export const RenderWidgets = React.memo(
       region,
     } = props;
 
+    const flags = useFlags();
+
     const getCloudPulseGraphProperties = (
       widget: Widgets
     ): CloudPulseWidgetProperties => {
@@ -124,6 +128,9 @@ export const RenderWidgets = React.memo(
             ...(pref.timeGranularity ?? autoIntervalOption),
           },
           group_by: pref.groupBy,
+          filters: flags.aclp?.showWidgetDimensionFilters
+            ? (pref.filters ?? widgetObj.filters)
+            : widgetObj.filters,
         };
       } else {
         return {
diff --git a/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterDrawer.test.tsx b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterDrawer.test.tsx
index 0ccf393455a..a25ada18719 100644
--- a/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterDrawer.test.tsx
+++ b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterDrawer.test.tsx
@@ -26,6 +26,13 @@ describe('CloudPulse dimension filter drawer tests', () => {
     const selectText = screen.getByText('Select up to 5 filters.');
     expect(selectText).toBeInTheDocument();
     await userEvent.click(screen.getByText('Add Filter'));
+    // validate for form fields to be present
+    const dataFieldContainer = screen.queryByTestId('dimension-field');
+    expect(dataFieldContainer).toBeInTheDocument();
+    const operatorContainer = screen.getByTestId('operator');
+    expect(operatorContainer).toBeInTheDocument();
+    const valueContainer = screen.getByTestId('value');
+    expect(valueContainer).toBeInTheDocument();
     const applyButton = screen.getByText('Apply');
     expect(applyButton).toBeInTheDocument();
     const cancelButton = screen.getByText('Cancel');
diff --git a/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterDrawer.tsx b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterDrawer.tsx
index 0db4f2d7921..98314058003 100644
--- a/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterDrawer.tsx
+++ b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterDrawer.tsx
@@ -8,8 +8,13 @@ import type {
   MetricsDimensionFilterForm,
 } from './types';
 import type { CloudPulseServiceType, Dimension } from '@linode/api-v4';
+import type { AssociatedEntityType } from 'src/features/CloudPulse/shared/types';
 
 interface CloudPulseDimensionFilterDrawerProps {
+  /**
+   * The entity type associated with the serviceType
+   */
+  associatedEntityType?: AssociatedEntityType;
   /**
    * The list of dimensions associated with the selected metric
    */
@@ -34,6 +39,7 @@ interface CloudPulseDimensionFilterDrawerProps {
    * The boolean value to control the drawer open state
    */
   open: boolean;
+
   /**
    * The selected dimension filters for the metric
    */
@@ -67,6 +73,7 @@ export const CloudPulseDimensionFilterDrawer = React.memo(
       selectedEntities,
       serviceType,
       selectedRegions,
+      associatedEntityType,
     } = props;
 
     const [clearAllTrigger, setClearAllTrigger] = React.useState(0);
@@ -135,6 +142,7 @@ export const CloudPulseDimensionFilterDrawer = React.memo(
             </Button>
           </Stack>
           <CloudPulseDimensionFilterRenderer
+            associatedEntityType={associatedEntityType}
             clearAllTrigger={clearAllTrigger}
             dimensionOptions={dimensionOptions}
             onClose={handleClose}
diff --git a/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterFields.test.tsx b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterFields.test.tsx
new file mode 100644
index 00000000000..0564530f0f6
--- /dev/null
+++ b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterFields.test.tsx
@@ -0,0 +1,92 @@
+import { screen, within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { renderWithThemeAndHookFormContext } from 'src/utilities/testHelpers';
+
+import { CloudPulseDimensionFilterFields } from './CloudPulseDimensionFilterFields';
+
+import type { MetricsDimensionFilterForm } from './types';
+import type { Dimension } from '@linode/api-v4';
+
+const dimensionOptions: Dimension[] = [
+  {
+    dimension_label: 'test',
+    values: ['XYZ', 'ZYX', 'YZX'],
+    label: 'Test',
+  },
+  {
+    dimension_label: 'sample',
+    values: ['value1', 'value2', 'value3'],
+    label: 'Sample',
+  },
+];
+
+describe('CloudPulse dimension filter field tests', () => {
+  it('renders the filter fields based on the dimension options', async () => {
+    const handleDelete = vi.fn();
+    renderWithThemeAndHookFormContext<MetricsDimensionFilterForm>({
+      component: (
+        <CloudPulseDimensionFilterFields
+          dimensionOptions={dimensionOptions}
+          name={`dimension_filters.${1}`}
+          onFilterDelete={handleDelete}
+          serviceType="linode"
+        />
+      ),
+      useFormOptions: {
+        defaultValues: {
+          dimension_filters: [
+            {
+              dimension_label: null,
+              operator: null,
+              value: null,
+            },
+          ],
+        },
+      },
+    });
+    const dataFieldContainer = screen.getByTestId('dimension-field');
+    const dataFieldInput = within(dataFieldContainer).getByRole('button', {
+      name: 'Open',
+    });
+    await userEvent.click(dataFieldInput);
+    dimensionOptions.forEach(({ label }) => {
+      screen.getByRole('option', {
+        name: label,
+      }); // implicit assertion
+    });
+    await userEvent.click(
+      screen.getByRole('option', { name: dimensionOptions[0].label })
+    );
+    const operatorContainer = screen.getByTestId('operator');
+    const operatorFieldInput = within(operatorContainer).getByRole('button', {
+      name: 'Open',
+    });
+    await userEvent.click(operatorFieldInput);
+    screen.getByRole('option', {
+      name: 'In',
+    }); // implicit assertion
+    screen.getByRole('option', {
+      name: 'Equal',
+    });
+    await userEvent.click(screen.getByRole('option', { name: 'Equal' }));
+    const valueContainer = screen.getByTestId('value');
+    const valueFieldInput = within(valueContainer).getByRole('button', {
+      name: 'Open',
+    });
+    await userEvent.click(valueFieldInput);
+    dimensionOptions[0].values.forEach((value) => {
+      screen.getByRole('option', {
+        name: value,
+      }); // implicit assertion
+    });
+    await userEvent.click(
+      screen.getByRole('option', { name: dimensionOptions[0].values[2] })
+    );
+
+    // click on delete and see if handle delete is called
+    await userEvent.click(screen.getByTestId('clear-icon'));
+    expect(handleDelete).toBeCalledTimes(1);
+  });
+});
diff --git a/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterFields.tsx b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterFields.tsx
new file mode 100644
index 00000000000..262336d9d1e
--- /dev/null
+++ b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterFields.tsx
@@ -0,0 +1,236 @@
+import { Autocomplete, Box } from '@linode/ui';
+import { GridLegacy } from '@mui/material';
+import React from 'react';
+import { Controller, useFormContext, useWatch } from 'react-hook-form';
+import type { FieldPathByValue } from 'react-hook-form';
+
+import { dimensionOperatorOptions } from 'src/features/CloudPulse/Alerts/constants';
+import { ClearIconButton } from 'src/features/CloudPulse/Alerts/CreateAlert/Criteria/ClearIconButton';
+import { ValueFieldRenderer } from 'src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilterValue/ValueFieldRenderer';
+
+import type {
+  MetricsDimensionFilter,
+  MetricsDimensionFilterForm,
+} from './types';
+import type {
+  CloudPulseServiceType,
+  Dimension,
+  DimensionFilterOperatorType,
+} from '@linode/api-v4';
+import type { AssociatedEntityType } from 'src/features/CloudPulse/shared/types';
+
+interface CloudPulseDimensionFilterFieldsProps {
+  /**
+   * The entity type associated with the service type
+   */
+  associatedEntityType?: AssociatedEntityType;
+  /**
+   * The dimension filter data options to list in the Autocomplete component
+   */
+  dimensionOptions: Dimension[];
+
+  /**
+   * The name (with the index) used for the component to set in form
+   */
+  name: FieldPathByValue<MetricsDimensionFilterForm, MetricsDimensionFilter>;
+
+  /**
+   * Callback function to delete the DimensionFilter component
+   */
+  onFilterDelete: () => void;
+
+  /**
+   * The selected entities for the dimension filter
+   */
+  selectedEntities?: string[];
+
+  /**
+   * The selected regions of the associated entities
+   */
+  selectedRegions?: string[];
+
+  /**
+   * The service type of the associated metric
+   */
+  serviceType: CloudPulseServiceType;
+}
+
+export const CloudPulseDimensionFilterFields = React.memo(
+  (props: CloudPulseDimensionFilterFieldsProps) => {
+    const {
+      dimensionOptions,
+      name,
+      onFilterDelete,
+      selectedEntities,
+      serviceType,
+      selectedRegions,
+      associatedEntityType,
+    } = props;
+
+    const { control, setValue } = useFormContext<MetricsDimensionFilterForm>();
+
+    const dataFieldOptions = React.useMemo(
+      () =>
+        dimensionOptions.map(({ label, dimension_label: dimensionLabel }) => ({
+          label,
+          value: dimensionLabel,
+        })) ?? [],
+      [dimensionOptions]
+    );
+
+    const handleDataFieldChange = React.useCallback(
+      (selected: { label: string; value: string }, operation: string) => {
+        const fieldValue = {
+          dimension_label: null,
+          operator: null,
+          value: null,
+        };
+        if (operation === 'selectOption') {
+          setValue(`${name}.dimension_label`, selected.value, {
+            shouldValidate: true,
+            shouldDirty: true,
+          });
+          setValue(`${name}.operator`, fieldValue.operator);
+          setValue(`${name}.value`, fieldValue.value);
+        } else {
+          setValue(name, fieldValue);
+        }
+      },
+      [name, setValue]
+    );
+
+    const dimensionFieldWatcher = useWatch({
+      control,
+      name: `${name}.dimension_label`,
+    });
+
+    const dimensionOperatorWatcher = useWatch({
+      control,
+      name: `${name}.operator`,
+    });
+
+    const selectedDimension = React.useMemo(
+      () =>
+        dimensionOptions && dimensionFieldWatcher
+          ? (dimensionOptions.find(
+              ({ dimension_label: dimensionLabel }) =>
+                dimensionLabel === dimensionFieldWatcher
+            ) ?? null)
+          : null,
+      [dimensionFieldWatcher, dimensionOptions]
+    );
+
+    return (
+      <GridLegacy
+        container
+        data-testid={`${name}-id`}
+        flexWrap="wrap"
+        spacing={2}
+      >
+        <GridLegacy item md={3.8} xs={12}>
+          <Controller
+            control={control}
+            name={`${name}.dimension_label`}
+            render={({ field, fieldState }) => (
+              <Autocomplete
+                data-qa-dimension-filter={`${name}-dimension-field`}
+                data-testid="dimension-field"
+                errorText={fieldState.error?.message}
+                label="Dimension"
+                onBlur={field.onBlur}
+                onChange={(
+                  _,
+                  newValue: { label: string; value: string },
+                  operation
+                ) => {
+                  handleDataFieldChange(newValue, operation);
+                }}
+                options={dataFieldOptions}
+                placeholder="Select a Dimension"
+                value={
+                  dataFieldOptions.find(
+                    (option) => option.value === field.value
+                  ) ?? null
+                }
+              />
+            )}
+          />
+        </GridLegacy>
+        <GridLegacy item md={3.8} xs={12}>
+          <Controller
+            control={control}
+            name={`${name}.operator`}
+            render={({ field, fieldState }) => (
+              <Autocomplete
+                data-qa-dimension-filter={`${name}-operator`}
+                data-testid="operator"
+                disabled={!dimensionFieldWatcher}
+                errorText={fieldState.error?.message}
+                label="Operator"
+                onBlur={field.onBlur}
+                onChange={(
+                  _,
+                  newValue: {
+                    label: string;
+                    value: DimensionFilterOperatorType;
+                  },
+                  operation
+                ) => {
+                  field.onChange(
+                    operation === 'selectOption' ? newValue.value : null
+                  );
+                  setValue(`${name}.value`, null);
+                }}
+                options={dimensionOperatorOptions}
+                placeholder="Select an Operator"
+                value={
+                  dimensionOperatorOptions.find(
+                    (option) => option.value === field.value
+                  ) ?? null
+                }
+              />
+            )}
+          />
+        </GridLegacy>
+        <GridLegacy item md={3.8} xs={12}>
+          <Controller
+            control={control}
+            name={`${name}.value`}
+            render={({ field, fieldState }) => (
+              <ValueFieldRenderer
+                dimensionLabel={dimensionFieldWatcher}
+                disabled={!dimensionFieldWatcher}
+                entities={selectedEntities}
+                entityType={associatedEntityType}
+                errorText={fieldState.error?.message}
+                name={name}
+                onBlur={field.onBlur}
+                onChange={field.onChange}
+                operator={dimensionOperatorWatcher}
+                scope="entity"
+                selectedRegions={selectedRegions ?? []}
+                serviceType={serviceType}
+                type="metrics"
+                value={field.value}
+                values={selectedDimension?.values ?? []}
+              />
+            )}
+          />
+        </GridLegacy>
+        <GridLegacy item marginLeft={-0.5} md={0.5} xs={12}>
+          <Box
+            alignContent="flex-start"
+            sx={(theme) => ({
+              marginTop: 6,
+              [theme.breakpoints.down('md')]: {
+                marginTop: 3,
+              },
+            })}
+          >
+            <ClearIconButton handleClick={onFilterDelete} />
+          </Box>
+        </GridLegacy>
+      </GridLegacy>
+    );
+  }
+);
diff --git a/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterRenderer.test.tsx b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterRenderer.test.tsx
new file mode 100644
index 00000000000..9a17bc814af
--- /dev/null
+++ b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterRenderer.test.tsx
@@ -0,0 +1,188 @@
+import { screen, within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import { CloudPulseDimensionFilterRenderer } from './CloudPulseDimensionFilterRenderer';
+
+import type { Dimension } from '@linode/api-v4';
+
+const dimensionOptions: Dimension[] = [
+  {
+    dimension_label: 'test',
+    values: ['XYZ', 'ZYX', 'YZX'],
+    label: 'Test',
+  },
+  {
+    dimension_label: 'sample',
+    values: ['VALUE1', 'VALUE2', 'VALUE3'],
+    label: 'Sample',
+  },
+];
+const dimensionFilterForZerothIndex = 'dimension_filters.0-id';
+const addFilter = 'Add Filter';
+
+describe('CloudPulse dimension filter field tests', () => {
+  it('renders the filter fields based on the dimension options', async () => {
+    const handleClose = vi.fn();
+    const handleSubmit = vi.fn();
+    const handleDimensionChange = vi.fn();
+    renderWithTheme(
+      <CloudPulseDimensionFilterRenderer
+        clearAllTrigger={0}
+        dimensionOptions={dimensionOptions}
+        onClose={handleClose}
+        onDimensionChange={handleDimensionChange}
+        onSubmit={handleSubmit}
+        serviceType="linode"
+      />
+    );
+    await userEvent.click(screen.getByTestId(addFilter));
+    await selectADimensionAndValue(
+      screen.getByTestId(dimensionFilterForZerothIndex),
+      0,
+      'Equal',
+      2
+    );
+    await userEvent.click(screen.getByTestId(addFilter));
+    await selectADimensionAndValue(
+      screen.getByTestId('dimension_filters.1-id'),
+      1,
+      'Not Equal',
+      0
+    );
+    await userEvent.click(screen.getByText('Apply'));
+    expect(handleClose).not.toHaveBeenCalled();
+    expect(handleSubmit).toHaveBeenCalledTimes(1);
+    expect(handleDimensionChange).toHaveBeenCalledTimes(3);
+    expect(handleSubmit).toHaveBeenLastCalledWith({
+      dimension_filters: [
+        {
+          dimension_label: 'test',
+          operator: 'eq',
+          value: 'YZX',
+        },
+        {
+          dimension_label: 'sample',
+          operator: 'neq',
+          value: 'VALUE1',
+        },
+      ],
+    });
+  });
+  it('handles the cancel button correctly', async () => {
+    const handleClose = vi.fn();
+    const handleSubmit = vi.fn();
+    renderWithTheme(
+      <CloudPulseDimensionFilterRenderer
+        clearAllTrigger={0}
+        dimensionOptions={dimensionOptions}
+        onClose={handleClose}
+        onDimensionChange={vi.fn()}
+        onSubmit={handleSubmit}
+        selectedDimensions={[]}
+        serviceType="linode"
+      />
+    );
+    await userEvent.click(screen.getByTestId(addFilter));
+    await selectADimensionAndValue(
+      screen.getByTestId(dimensionFilterForZerothIndex),
+      0,
+      'Equal',
+      2
+    );
+    await userEvent.click(screen.getByText('Cancel'));
+    expect(handleClose).toHaveBeenCalledTimes(1);
+    expect(handleSubmit).not.toHaveBeenCalled();
+  });
+  it('handles the case when a proper already selected dimension is passed', async () => {
+    const handleClose = vi.fn();
+    const handleSubmit = vi.fn();
+    const handleDimensionChange = vi.fn();
+    renderWithTheme(
+      <CloudPulseDimensionFilterRenderer
+        clearAllTrigger={0}
+        dimensionOptions={dimensionOptions}
+        onClose={handleClose}
+        onDimensionChange={handleDimensionChange}
+        onSubmit={handleSubmit}
+        selectedDimensions={[
+          {
+            dimension_label: 'test',
+            operator: 'startswith',
+            value: 'ZYX',
+          },
+        ]}
+        serviceType="linode"
+      />
+    );
+    const dimensionContainer = screen.getByTestId(
+      dimensionFilterForZerothIndex
+    );
+    const dimension =
+      within(dimensionContainer).getByPlaceholderText('Select a Dimension');
+    expect(dimension).toHaveValue('Test');
+    const operator =
+      within(dimensionContainer).getByPlaceholderText('Select an Operator');
+    expect(operator).toHaveValue('Starts with');
+    const value =
+      within(dimensionContainer).getByPlaceholderText('Enter a Value');
+    expect(value).toHaveValue('ZYX');
+    expect(screen.getByText('Apply')).toHaveAttribute('aria-disabled', 'true'); // form is not changed, so the apply button is disabled in this case
+  });
+});
+
+const selectADimensionAndValue = async (
+  dimensionFilterContainer: HTMLElement,
+  dimensionOptionIndex: number,
+  operator: string,
+  valueOptionIndex: number
+) => {
+  const dataFieldContainer = within(dimensionFilterContainer).getByTestId(
+    'dimension-field'
+  );
+  const dataFieldInput = within(dataFieldContainer).getByRole('button', {
+    name: 'Open',
+  });
+  await userEvent.click(dataFieldInput);
+  dimensionOptions.forEach(({ label }) => {
+    screen.getByRole('option', {
+      name: label,
+    }); // implicit assertion
+  });
+  await userEvent.click(
+    screen.getByRole('option', {
+      name: dimensionOptions[dimensionOptionIndex].label,
+    })
+  );
+  const operatorContainer = within(dimensionFilterContainer).getByTestId(
+    'operator'
+  );
+  const operatorFieldInput = within(operatorContainer).getByRole('button', {
+    name: 'Open',
+  });
+  await userEvent.click(operatorFieldInput);
+  screen.getByRole('option', {
+    name: 'In',
+  }); // implicit assertion
+  screen.getByRole('option', {
+    name: 'Equal',
+  });
+  await userEvent.click(screen.getByRole('option', { name: operator }));
+  const valueContainer = within(dimensionFilterContainer).getByTestId('value');
+  const valueFieldInput = within(valueContainer).getByRole('button', {
+    name: 'Open',
+  });
+  await userEvent.click(valueFieldInput);
+  dimensionOptions[dimensionOptionIndex].values.forEach((value) => {
+    screen.getByRole('option', {
+      name: value,
+    }); // implicit assertion
+  });
+  await userEvent.click(
+    screen.getByRole('option', {
+      name: dimensionOptions[dimensionOptionIndex].values[valueOptionIndex],
+    })
+  );
+};
diff --git a/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterRenderer.tsx b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterRenderer.tsx
index f4cbc390ce6..42d7d6d13d3 100644
--- a/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterRenderer.tsx
+++ b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFilterRenderer.tsx
@@ -1,5 +1,5 @@
 import { yupResolver } from '@hookform/resolvers/yup';
-import { ActionsPanel, Box, Button } from '@linode/ui';
+import { ActionsPanel, Box, Button, Divider, Stack } from '@linode/ui';
 import React from 'react';
 import {
   FormProvider,
@@ -8,6 +8,7 @@ import {
   useWatch,
 } from 'react-hook-form';
 
+import { CloudPulseDimensionFilterFields } from './CloudPulseDimensionFilterFields';
 import { metricDimensionFiltersSchema } from './schema';
 
 import type {
@@ -15,37 +16,43 @@ import type {
   MetricsDimensionFilterForm,
 } from './types';
 import type { CloudPulseServiceType, Dimension } from '@linode/api-v4';
+import type { AssociatedEntityType } from 'src/features/CloudPulse/shared/types';
 
 interface CloudPulseDimensionFilterRendererProps {
+  /**
+   * The entity type associated with the service type
+   */
+  associatedEntityType?: AssociatedEntityType;
+
   /**
    * The clear all trigger to reset the form
    */
   clearAllTrigger: number;
-
   /**
    * The list of dimensions associated with the selected metric
    */
   dimensionOptions: Dimension[];
+
   /**
    * Callback triggered to close the drawer
    */
   onClose: () => void;
-
   /**
    * Callback to publish any change in form
    * @param isDirty indicated the changes
    */
   onDimensionChange: (isDirty: boolean) => void;
+
   /**
    * Callback triggered on form submission
    * @param data The form data on submission
    */
   onSubmit: (data: MetricsDimensionFilterForm) => void;
-
   /**
    * The selected dimension filters for the metric
    */
   selectedDimensions?: MetricsDimensionFilter[];
+
   /**
    * The selected entities for the dimension filter
    */
@@ -69,6 +76,11 @@ export const CloudPulseDimensionFilterRenderer = React.memo(
       clearAllTrigger,
       onClose,
       onDimensionChange,
+      dimensionOptions,
+      selectedEntities = [],
+      serviceType,
+      selectedRegions,
+      associatedEntityType,
     } = props;
 
     const formMethods = useForm<MetricsDimensionFilterForm>({
@@ -93,7 +105,7 @@ export const CloudPulseDimensionFilterRenderer = React.memo(
       });
     });
 
-    const { append, fields } = useFieldArray({
+    const { append, fields, remove } = useFieldArray({
       control,
       name: 'dimension_filters',
     });
@@ -126,7 +138,33 @@ export const CloudPulseDimensionFilterRenderer = React.memo(
       <FormProvider {...formMethods}>
         <form onSubmit={handleFormSubmit} ref={formRef}>
           <Box display="flex" flexDirection="column" gap={1}>
-            {/* upcoming: Integrate with dimension filter row component */}
+            <Stack gap={1.25}>
+              {fields?.length > 0 &&
+                fields.map((field, index) => (
+                  <React.Fragment key={field.id}>
+                    <CloudPulseDimensionFilterFields
+                      associatedEntityType={associatedEntityType}
+                      dimensionOptions={dimensionOptions}
+                      key={field.id}
+                      name={`dimension_filters.${index}`}
+                      onFilterDelete={() => remove(index)}
+                      selectedEntities={selectedEntities}
+                      selectedRegions={selectedRegions}
+                      serviceType={serviceType}
+                    />
+                    <Divider
+                      sx={(theme) => ({
+                        display: 'none',
+                        [theme.breakpoints.down('md')]: {
+                          // only show the divider for smaller screens
+                          display:
+                            index === fields.length - 1 ? 'none' : 'flex',
+                        },
+                      })}
+                    />
+                  </React.Fragment>
+                ))}
+            </Stack>
             <Button
               compactX
               data-qa-buttons="true"
diff --git a/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFiltersSelect.test.tsx b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFiltersSelect.test.tsx
index 60c7f25d0f8..e2926846052 100644
--- a/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFiltersSelect.test.tsx
+++ b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFiltersSelect.test.tsx
@@ -26,6 +26,7 @@ describe('Tests for CloudPulse Dimension Filters Select', () => {
     const handleSubmit = vi.fn();
     renderWithTheme(
       <CloudPulseDimensionFiltersSelect
+        dashboardId={1}
         dimensionOptions={dimensionOptions}
         drawerLabel="Test Metric"
         handleSelectionChange={handleSubmit}
diff --git a/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFiltersSelect.tsx b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFiltersSelect.tsx
index e96bd0abea7..f20c6da73fa 100644
--- a/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFiltersSelect.tsx
+++ b/packages/manager/src/features/CloudPulse/Widget/components/DimensionFilters/CloudPulseDimensionFiltersSelect.tsx
@@ -2,6 +2,7 @@ import { IconButton } from '@linode/ui';
 import React from 'react';
 
 import { CloudPulseTooltip } from 'src/features/CloudPulse/shared/CloudPulseTooltip';
+import { getAssociatedEntityType } from 'src/features/CloudPulse/Utils/FilterConfig';
 
 import { CloudPulseDimensionFilterDrawer } from './CloudPulseDimensionFilterDrawer';
 import { CloudPulseDimensionFilterIconWithBadge } from './CloudPulseFilterIconWithBadge';
@@ -10,6 +11,10 @@ import type { MetricsDimensionFilter } from './types';
 import type { CloudPulseServiceType, Dimension } from '@linode/api-v4';
 
 interface CloudPulseDimensionFiltersSelectProps {
+  /**
+   * The dashboardId for which the widget and dimension filters are being rendered
+   */
+  dashboardId: number;
   /**
    * The list of available dimensions for the selected metric
    */
@@ -22,6 +27,7 @@ interface CloudPulseDimensionFiltersSelectProps {
    * @param selectedDimensions The list of selected dimension filters
    */
   handleSelectionChange: (selectedDimensions: MetricsDimensionFilter[]) => void;
+
   /**
    * The selected dimension filters for the metric
    */
@@ -53,6 +59,7 @@ export const CloudPulseDimensionFiltersSelect = React.memo(
       selectedEntities,
       serviceType,
       selectedRegions,
+      dashboardId,
     } = props;
     const [open, setOpen] = React.useState(false);
 
@@ -91,6 +98,7 @@ export const CloudPulseDimensionFiltersSelect = React.memo(
           </IconButton>
         </CloudPulseTooltip>
         <CloudPulseDimensionFilterDrawer
+          associatedEntityType={getAssociatedEntityType(dashboardId)}
           dimensionOptions={dimensionOptions}
           drawerLabel={drawerLabel}
           handleSelectionChange={handleChangeInSelection}
diff --git a/packages/manager/src/features/CloudPulse/shared/DimensionTransform.ts b/packages/manager/src/features/CloudPulse/shared/DimensionTransform.ts
index 6546b576342..c84ccfdf8bf 100644
--- a/packages/manager/src/features/CloudPulse/shared/DimensionTransform.ts
+++ b/packages/manager/src/features/CloudPulse/shared/DimensionTransform.ts
@@ -31,6 +31,7 @@ export const DIMENSION_TRANSFORM_CONFIG: Partial<
     interface_type: TRANSFORMS.uppercase,
     linode_id: TRANSFORMS.original,
     nodebalancer_id: TRANSFORMS.original,
+    protocol: TRANSFORMS.uppercase,
     ip_version: TRANSFORMS.original,
     region_id: TRANSFORMS.original,
   },
diff --git a/packages/manager/src/mocks/serverHandlers.ts b/packages/manager/src/mocks/serverHandlers.ts
index d0eb07d5767..461ba32685f 100644
--- a/packages/manager/src/mocks/serverHandlers.ts
+++ b/packages/manager/src/mocks/serverHandlers.ts
@@ -3987,6 +3987,30 @@ export const handlers = [
     } else if (id === '8') {
       serviceType = 'firewall';
       dashboardLabel = 'Firewall Nodebalancer Dashboard';
+      widgets = [
+        {
+          metric: 'nb_ingress_bytes_accepted',
+          unit: 'Count',
+          label: 'Current Connections',
+          color: 'default',
+          size: 12,
+          chart_type: 'line',
+          y_label: 'nb_ingress_bytes_accepted',
+          group_by: ['entity_id'],
+          aggregate_function: 'avg',
+        },
+        {
+          metric: 'nb_ingress_bytes_dropped',
+          unit: 'Count',
+          label: 'Available Connections',
+          color: 'default',
+          size: 12,
+          chart_type: 'line',
+          y_label: 'nb_ingress_bytes_dropped',
+          group_by: ['entity_id'],
+          aggregate_function: 'avg',
+        },
+      ];
     } else if (id === '9') {
       serviceType = 'lke';
       dashboardLabel = 'Kubernetes Enterprise Dashboard';
diff --git a/packages/manager/src/queries/cloudpulse/metrics.ts b/packages/manager/src/queries/cloudpulse/metrics.ts
index d70a13e924d..34be5845397 100644
--- a/packages/manager/src/queries/cloudpulse/metrics.ts
+++ b/packages/manager/src/queries/cloudpulse/metrics.ts
@@ -19,6 +19,7 @@ export const useCloudPulseMetricsQuery = (
   request: CloudPulseMetricsRequest,
   obj: {
     authToken?: string;
+    isFiltersLoading?: boolean;
     isFlags: boolean;
     label: string;
     timeStamp: number | undefined;
@@ -37,7 +38,7 @@ export const useCloudPulseMetricsQuery = (
       obj.label
     ),
 
-    enabled: !!obj.isFlags,
+    enabled: !!obj.isFlags && !obj.isFiltersLoading,
     refetchInterval: 120000,
     refetchOnWindowFocus: false,
     retry: 0,
diff --git a/packages/utilities/src/__data__/regionsData.ts b/packages/utilities/src/__data__/regionsData.ts
index 1a73d8320fc..506e562df12 100644
--- a/packages/utilities/src/__data__/regionsData.ts
+++ b/packages/utilities/src/__data__/regionsData.ts
@@ -37,6 +37,7 @@ export const regions: Region[] = [
         'Managed Databases',
         'Block Storage',
         'Kubernetes',
+        'NodeBalancers',
       ],
     },
   },
@@ -93,7 +94,7 @@ export const regions: Region[] = [
     },
     site_type: 'core',
     status: 'ok',
-    monitors: { alerts: [], metrics: [] },
+    monitors: { alerts: [], metrics: ['NodeBalancers'] },
   },
   {
     capabilities: [
@@ -666,7 +667,7 @@ export const regions: Region[] = [
     status: 'ok',
     monitors: {
       alerts: ['Linodes', 'Block Storage'],
-      metrics: ['NodeBalancers'],
+      metrics: ['NodeBalancers', 'Cloud Firewall'],
     },
   },
   {

From 3fd12151b9f9990588aa796d5bc966e31690bcbf Mon Sep 17 00:00:00 2001
From: aaleksee-akamai <aaleksee@akamai.com>
Date: Wed, 26 Nov 2025 09:46:17 +0100
Subject: [PATCH 42/91] feat: [UIE-9686] - IAM: fix filtering by entity's type
 (#13129)

* feat: [UIE-9686] - IAM: fix filtering by entity's type

* Added changeset: IAM: filtering by entity type at the Roles table
---
 packages/manager/.changeset/pr-13129-fixed-1763987727502.md  | 5 +++++
 .../manager/src/features/IAM/Roles/RolesTable/RolesTable.tsx | 4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13129-fixed-1763987727502.md

diff --git a/packages/manager/.changeset/pr-13129-fixed-1763987727502.md b/packages/manager/.changeset/pr-13129-fixed-1763987727502.md
new file mode 100644
index 00000000000..91597d4e0b1
--- /dev/null
+++ b/packages/manager/.changeset/pr-13129-fixed-1763987727502.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+IAM: filtering by entity type at the Roles table ([#13129](https://github.com/linode/manager/pull/13129))
diff --git a/packages/manager/src/features/IAM/Roles/RolesTable/RolesTable.tsx b/packages/manager/src/features/IAM/Roles/RolesTable/RolesTable.tsx
index c5698da5077..b924f7ed18b 100644
--- a/packages/manager/src/features/IAM/Roles/RolesTable/RolesTable.tsx
+++ b/packages/manager/src/features/IAM/Roles/RolesTable/RolesTable.tsx
@@ -100,9 +100,7 @@ export const RolesTable = ({ roles = [] }: Props) => {
   };
 
   const filteredRows = React.useMemo(() => {
-    if (!query) return roles;
-
-    return getFilteredRows(query, filterableEntityType?.value);
+    return getFilteredRows(query ?? '', filterableEntityType?.value);
   }, [roles, query, filterableEntityType]);
 
   // Get just the list of entity types from this list of roles, to be used in the selection filter

From aa0658225b72a00b40c3764a9f120b8c5048d4f7 Mon Sep 17 00:00:00 2001
From: Dajahi Wiley <114682940+dwiley-akamai@users.noreply.github.com>
Date: Wed, 26 Nov 2025 04:08:35 -0500
Subject: [PATCH 43/91] =?UTF-8?q?upcoming:=20[M3-10713]=20=E2=80=93=20Crea?=
 =?UTF-8?q?te=20&=20use=20new=20JSON-based=20Firewall=20RuleSets=20&=20Pre?=
 =?UTF-8?q?fix=20Lists=20feature=20flag=20(#13125)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add JSON-based feature flag for Firewall RuleSets and Prefix Lists feature; update useIsFirewallRulesetsPrefixlistsEnabled() to use new feature flag accordingly

* Remove old feature flag that is now obsolete

* Added changeset: Use new JSON-based fwRulesetsPrefixLists feature flag for Firewall RuleSets and Prefix Lists feature

---------

Co-authored-by: Dajahi Wiley <dwiley@linode.com>
Co-authored-by: pmakode-akamai <pmakode@akamai.com>
---
 ...r-13125-upcoming-features-1763760083439.md |  5 ++++
 .../manager/src/dev-tools/FeatureFlagTool.tsx |  4 +--
 packages/manager/src/featureFlags.ts          |  7 ++++-
 .../Rules/FirewallRuleDrawer.test.tsx         | 21 +++++++++++--
 .../Rules/FirewallRuleDrawer.tsx              | 12 ++++----
 .../Rules/FirewallRuleSetDetailsView.tsx      |  4 +--
 .../Rules/FirewallRuleSetForm.tsx             |  4 +--
 .../Rules/FirewallRuleTable.tsx               |  4 +--
 .../FirewallLanding/FirewallLanding.tsx       |  4 +--
 .../src/features/Firewalls/shared.test.ts     | 30 ++++++++++++++++---
 .../manager/src/features/Firewalls/shared.ts  | 18 +++++++----
 11 files changed, 83 insertions(+), 30 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13125-upcoming-features-1763760083439.md

diff --git a/packages/manager/.changeset/pr-13125-upcoming-features-1763760083439.md b/packages/manager/.changeset/pr-13125-upcoming-features-1763760083439.md
new file mode 100644
index 00000000000..aab9ee71357
--- /dev/null
+++ b/packages/manager/.changeset/pr-13125-upcoming-features-1763760083439.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Use new JSON-based fwRulesetsPrefixLists feature flag for Firewall RuleSets and Prefix Lists feature ([#13125](https://github.com/linode/manager/pull/13125))
diff --git a/packages/manager/src/dev-tools/FeatureFlagTool.tsx b/packages/manager/src/dev-tools/FeatureFlagTool.tsx
index 51a36260c38..ce9d38cc1ed 100644
--- a/packages/manager/src/dev-tools/FeatureFlagTool.tsx
+++ b/packages/manager/src/dev-tools/FeatureFlagTool.tsx
@@ -31,8 +31,8 @@ const options: { flag: keyof Flags; label: string }[] = [
   { flag: 'cloudNat', label: 'Cloud NAT' },
   { flag: 'disableLargestGbPlans', label: 'Disable Largest GB Plans' },
   {
-    flag: 'firewallRulesetsPrefixlists',
-    label: 'Firewall Rulesets & Prefixlists',
+    flag: 'fwRulesetsPrefixLists',
+    label: 'Firewall RuleSets and Prefix Lists (JSON-based)',
   },
   { flag: 'gecko2', label: 'Gecko' },
   { flag: 'generationalPlansv2', label: 'Generational compute plans' },
diff --git a/packages/manager/src/featureFlags.ts b/packages/manager/src/featureFlags.ts
index 097fbcaf01b..f1b74bdf9e0 100644
--- a/packages/manager/src/featureFlags.ts
+++ b/packages/manager/src/featureFlags.ts
@@ -171,6 +171,11 @@ interface MTC {
   supportedRegions: Region['id'][];
 }
 
+interface FirewallRulesetsAndPrefixLists extends BetaFeatureFlag {
+  ga: boolean;
+  la: boolean;
+}
+
 export interface Flags {
   acceleratedPlans: AcceleratedPlansFlag;
   aclp: AclpFlag;
@@ -200,7 +205,7 @@ export interface Flags {
   dbaasV2: BetaFeatureFlag;
   dbaasV2MonitorMetrics: BetaFeatureFlag;
   disableLargestGbPlans: boolean;
-  firewallRulesetsPrefixlists: boolean;
+  fwRulesetsPrefixLists: FirewallRulesetsAndPrefixLists;
   gecko2: GeckoFeatureFlag;
   generationalPlansv2: GenerationalPlansFlag;
   gpuv2: GpuV2;
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
index f9c1ab27b22..09719c261a7 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
@@ -67,7 +67,12 @@ const spy = vi.spyOn(shared, 'useIsFirewallRulesetsPrefixlistsEnabled');
 
 describe('AddRuleDrawer', () => {
   it('renders the title', () => {
-    spy.mockReturnValue({ isFirewallRulesetsPrefixlistsEnabled: false });
+    spy.mockReturnValue({
+      isFirewallRulesetsPrefixlistsFeatureEnabled: false,
+      isFirewallRulesetsPrefixListsBetaEnabled: false,
+      isFirewallRulesetsPrefixListsLAEnabled: false,
+      isFirewallRulesetsPrefixListsGAEnabled: false,
+    });
 
     const { getByText } = renderWithTheme(
       <FirewallRuleDrawer {...props} category="inbound" mode="create" />
@@ -98,7 +103,12 @@ describe('AddRuleDrawer', () => {
 
 describe('AddRuleSetDrawer', () => {
   beforeEach(() => {
-    spy.mockReturnValue({ isFirewallRulesetsPrefixlistsEnabled: true });
+    spy.mockReturnValue({
+      isFirewallRulesetsPrefixlistsFeatureEnabled: true,
+      isFirewallRulesetsPrefixListsBetaEnabled: false,
+      isFirewallRulesetsPrefixListsLAEnabled: false,
+      isFirewallRulesetsPrefixListsGAEnabled: false,
+    });
   });
 
   it('renders the drawer title', () => {
@@ -171,7 +181,12 @@ describe('AddRuleSetDrawer', () => {
 
 describe('ViewRuleSetDetailsDrawer', () => {
   beforeEach(() => {
-    spy.mockReturnValue({ isFirewallRulesetsPrefixlistsEnabled: true });
+    spy.mockReturnValue({
+      isFirewallRulesetsPrefixlistsFeatureEnabled: true,
+      isFirewallRulesetsPrefixListsBetaEnabled: false,
+      isFirewallRulesetsPrefixListsLAEnabled: false,
+      isFirewallRulesetsPrefixListsGAEnabled: false,
+    });
   });
 
   const activeRuleSet = firewallRuleSetFactory.build({ id: 123 });
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
index 5000f6c192f..10c16eef62a 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
@@ -41,7 +41,7 @@ export const FirewallRuleDrawer = React.memo(
   (props: FirewallRuleDrawerProps) => {
     const { category, isOpen, mode, onClose, ruleToModifyOrView } = props;
 
-    const { isFirewallRulesetsPrefixlistsEnabled } =
+    const { isFirewallRulesetsPrefixlistsFeatureEnabled } =
       useIsFirewallRulesetsPrefixlistsEnabled();
 
     /**
@@ -82,7 +82,7 @@ export const FirewallRuleDrawer = React.memo(
       // 2. The drawer is closed - ensures the next time it opens, it starts with the default 'rule' selection.
       if (
         mode === 'create' &&
-        (!isFirewallRulesetsPrefixlistsEnabled || !isOpen)
+        (!isFirewallRulesetsPrefixlistsFeatureEnabled || !isOpen)
       ) {
         setCreateEntityType('rule');
       }
@@ -90,13 +90,13 @@ export const FirewallRuleDrawer = React.memo(
       mode,
       isOpen,
       ruleToModifyOrView,
-      isFirewallRulesetsPrefixlistsEnabled,
+      isFirewallRulesetsPrefixlistsFeatureEnabled,
     ]);
 
     const title =
       mode === 'create'
         ? `Add an ${capitalize(category)} Rule${
-            isFirewallRulesetsPrefixlistsEnabled ? ' or Rule Set' : ''
+            isFirewallRulesetsPrefixlistsFeatureEnabled ? ' or Rule Set' : ''
           }`
         : mode === 'edit'
           ? 'Edit Rule'
@@ -160,7 +160,7 @@ export const FirewallRuleDrawer = React.memo(
 
     return (
       <Drawer onClose={onClose} open={isOpen} title={title}>
-        {mode === 'create' && isFirewallRulesetsPrefixlistsEnabled && (
+        {mode === 'create' && isFirewallRulesetsPrefixlistsFeatureEnabled && (
           <Grid container spacing={2}>
             {firewallRuleCreateOptions.map((option) => (
               <SelectionCard
@@ -229,7 +229,7 @@ export const FirewallRuleDrawer = React.memo(
 
         {mode === 'create' &&
           createEntityType === 'ruleset' &&
-          isFirewallRulesetsPrefixlistsEnabled && (
+          isFirewallRulesetsPrefixlistsFeatureEnabled && (
             <Formik<FormRuleSetState>
               initialValues={{ ruleset: -1 }}
               onSubmit={(values) => {
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetDetailsView.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetDetailsView.tsx
index 167163726ae..0411ad72b0c 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetDetailsView.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetDetailsView.tsx
@@ -41,7 +41,7 @@ export const FirewallRuleSetDetailsView = (
 ) => {
   const { category, closeDrawer, ruleset } = props;
 
-  const { isFirewallRulesetsPrefixlistsEnabled } =
+  const { isFirewallRulesetsPrefixlistsFeatureEnabled } =
     useIsFirewallRulesetsPrefixlistsEnabled();
   const { classes } = useStyles();
 
@@ -54,7 +54,7 @@ export const FirewallRuleSetDetailsView = (
     error,
   } = useFirewallRuleSetQuery(
     ruleset ?? -1,
-    isValidRuleSetId && isFirewallRulesetsPrefixlistsEnabled
+    isValidRuleSetId && isFirewallRulesetsPrefixlistsFeatureEnabled
   );
 
   if (!isValidRuleSetId) {
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx
index 0b1283ba3a0..a739297f596 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx
@@ -38,11 +38,11 @@ export const FirewallRuleSetForm = React.memo(
 
     const { classes } = useStyles();
 
-    const { isFirewallRulesetsPrefixlistsEnabled } =
+    const { isFirewallRulesetsPrefixlistsFeatureEnabled } =
       useIsFirewallRulesetsPrefixlistsEnabled();
 
     const { data, error, isLoading } = useAllFirewallRuleSetsQuery(
-      isFirewallRulesetsPrefixlistsEnabled
+      isFirewallRulesetsPrefixlistsFeatureEnabled
     );
 
     const ruleSets = data ?? [];
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
index 9f24a04580f..ccc4c856c23 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
@@ -310,12 +310,12 @@ const FirewallRuleTableRow = React.memo((props: FirewallRuleTableRowProps) => {
     ruleset,
   } = props;
 
-  const { isFirewallRulesetsPrefixlistsEnabled } =
+  const { isFirewallRulesetsPrefixlistsFeatureEnabled } =
     useIsFirewallRulesetsPrefixlistsEnabled();
 
   const isRuleSetRow = Boolean(ruleset);
   const isRuleSetRowEnabled =
-    isRuleSetRow && isFirewallRulesetsPrefixlistsEnabled;
+    isRuleSetRow && isFirewallRulesetsPrefixlistsFeatureEnabled;
 
   const isValidRuleSetId = ruleset !== undefined && ruleset !== null;
 
diff --git a/packages/manager/src/features/Firewalls/FirewallLanding/FirewallLanding.tsx b/packages/manager/src/features/Firewalls/FirewallLanding/FirewallLanding.tsx
index b32df9a0adf..d25b54889da 100644
--- a/packages/manager/src/features/Firewalls/FirewallLanding/FirewallLanding.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallLanding/FirewallLanding.tsx
@@ -75,7 +75,7 @@ const FirewallLanding = () => {
   const [isModalOpen, setIsModalOpen] = React.useState<boolean>(false);
   const [dialogMode, setDialogMode] = React.useState<Mode>('enable');
   const [isGenerateDialogOpen, setIsGenerateDialogOpen] = React.useState(false);
-  const { isFirewallRulesetsPrefixlistsEnabled } =
+  const { isFirewallRulesetsPrefixlistsFeatureEnabled } =
     useIsFirewallRulesetsPrefixlistsEnabled();
 
   const rulesColumnTooltipText =
@@ -208,7 +208,7 @@ const FirewallLanding = () => {
             <Hidden smDown>
               <TableCell sx={{ width: '15%' }}>
                 Rules
-                {isFirewallRulesetsPrefixlistsEnabled && (
+                {isFirewallRulesetsPrefixlistsFeatureEnabled && (
                   <TooltipIcon
                     status="info"
                     sxTooltipIcon={{
diff --git a/packages/manager/src/features/Firewalls/shared.test.ts b/packages/manager/src/features/Firewalls/shared.test.ts
index 6597c23d93b..6346bdb9d4f 100644
--- a/packages/manager/src/features/Firewalls/shared.test.ts
+++ b/packages/manager/src/features/Firewalls/shared.test.ts
@@ -152,7 +152,16 @@ describe('generateAddressLabel', () => {
 
 describe('useIsFirewallRulesetsPrefixlistsEnabled', () => {
   it('returns true if the feature is enabled', async () => {
-    const options = { flags: { firewallRulesetsPrefixlists: true } };
+    const options = {
+      flags: {
+        fwRulesetsPrefixLists: {
+          enabled: true,
+          beta: false,
+          la: false,
+          ga: false,
+        },
+      },
+    };
 
     const { result } = renderHook(
       () => useIsFirewallRulesetsPrefixlistsEnabled(),
@@ -162,12 +171,23 @@ describe('useIsFirewallRulesetsPrefixlistsEnabled', () => {
     );
 
     await waitFor(() => {
-      expect(result.current.isFirewallRulesetsPrefixlistsEnabled).toBe(true);
+      expect(result.current.isFirewallRulesetsPrefixlistsFeatureEnabled).toBe(
+        true
+      );
     });
   });
 
   it('returns false if the feature is NOT enabled', async () => {
-    const options = { flags: { firewallRulesetsPrefixlists: false } };
+    const options = {
+      flags: {
+        fwRulesetsPrefixLists: {
+          enabled: false,
+          beta: false,
+          la: false,
+          ga: false,
+        },
+      },
+    };
 
     const { result } = renderHook(
       () => useIsFirewallRulesetsPrefixlistsEnabled(),
@@ -177,7 +197,9 @@ describe('useIsFirewallRulesetsPrefixlistsEnabled', () => {
     );
 
     await waitFor(() => {
-      expect(result.current.isFirewallRulesetsPrefixlistsEnabled).toBe(false);
+      expect(result.current.isFirewallRulesetsPrefixlistsFeatureEnabled).toBe(
+        false
+      );
     });
   });
 });
diff --git a/packages/manager/src/features/Firewalls/shared.ts b/packages/manager/src/features/Firewalls/shared.ts
index 8e9199827b7..64ab820b8c9 100644
--- a/packages/manager/src/features/Firewalls/shared.ts
+++ b/packages/manager/src/features/Firewalls/shared.ts
@@ -259,18 +259,24 @@ export const getFirewallDescription = (firewall: Firewall) => {
 };
 
 /**
- * Returns whether or not features related to the Firewall Rulesets & Prefixlists project
- * should be enabled.
+ * Returns whether or not features related to the Firewall Rulesets & Prefix Lists project
+ * should be enabled, and whether they are in beta, LA, or GA.
  *
- * Note: Currently, this just uses the `firewallRulesetsPrefixlists` feature flag as a source of truth,
+ * Note: Currently, this just uses the `fwRulesetsPrefixlists` feature flag as a source of truth,
  * but will eventually also look at account capabilities if available.
  */
 export const useIsFirewallRulesetsPrefixlistsEnabled = () => {
   const flags = useFlags();
 
-  // @TODO: Firewall Rulesets & Prefixlists - check for customer tag/account capability when it exists
+  // @TODO: Firewall Rulesets & Prefix Lists - check for customer tag/account capability when it exists
   return {
-    isFirewallRulesetsPrefixlistsEnabled:
-      flags.firewallRulesetsPrefixlists ?? false,
+    isFirewallRulesetsPrefixlistsFeatureEnabled:
+      flags.fwRulesetsPrefixLists?.enabled ?? false,
+    isFirewallRulesetsPrefixListsBetaEnabled:
+      flags.fwRulesetsPrefixLists?.beta ?? false,
+    isFirewallRulesetsPrefixListsLAEnabled:
+      flags.fwRulesetsPrefixLists?.la ?? false,
+    isFirewallRulesetsPrefixListsGAEnabled:
+      flags.fwRulesetsPrefixLists?.ga ?? false,
   };
 };

From 5826210365ac98020c3e9fb615fa62e4885aef74 Mon Sep 17 00:00:00 2001
From: kagora-akamai <kagora@akamai.com>
Date: Wed, 26 Nov 2025 11:11:51 +0100
Subject: [PATCH 44/91] change: [DPS-35671] - Logs Stream - Add gov legal sign
 off section (#13131)

* change: [DPS-35671] - Logs Stream - Add gov legal sign off section
---
 .../pr-13131-changed-1763990723303.md         |  5 ++++
 .../Shared/FormSubmitBar/FormSubmitBar.tsx    | 25 ++++++++++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13131-changed-1763990723303.md

diff --git a/packages/manager/.changeset/pr-13131-changed-1763990723303.md b/packages/manager/.changeset/pr-13131-changed-1763990723303.md
new file mode 100644
index 00000000000..50ac5d0e771
--- /dev/null
+++ b/packages/manager/.changeset/pr-13131-changed-1763990723303.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Changed
+---
+
+Legal sign off in Logs Streams Create Checkout bar ([#13131](https://github.com/linode/manager/pull/13131))
diff --git a/packages/manager/src/features/Delivery/Shared/FormSubmitBar/FormSubmitBar.tsx b/packages/manager/src/features/Delivery/Shared/FormSubmitBar/FormSubmitBar.tsx
index 4ca05df6df1..ffe50588f9a 100644
--- a/packages/manager/src/features/Delivery/Shared/FormSubmitBar/FormSubmitBar.tsx
+++ b/packages/manager/src/features/Delivery/Shared/FormSubmitBar/FormSubmitBar.tsx
@@ -1,5 +1,6 @@
 import { Box, Button, Divider, Paper, Stack, Typography } from '@linode/ui';
 import { capitalize } from '@linode/utilities';
+import { Link } from '@mui/material';
 import * as React from 'react';
 import { useMemo } from 'react';
 
@@ -64,9 +65,11 @@ export const FormSubmitBar = (props: StreamFormSubmitBarProps) => {
           </>
         )}
         <Divider dark spacingBottom={0} spacingTop={16} />
-        <Typography mb={1}>
-          Stream provisioning may take up to 45 minutes.
-        </Typography>
+        {formType === 'stream' && (
+          <Typography mb={1}>
+            Stream provisioning may take up to 45 minutes.
+          </Typography>
+        )}
         <Button
           buttonType="outlined"
           data-pendo-id={`${pagePendoId}-Test Connection`}
@@ -96,6 +99,22 @@ export const FormSubmitBar = (props: StreamFormSubmitBarProps) => {
         >
           {buttonLabel}
         </Button>
+        {formType === 'stream' && (
+          <Typography mb={1}>
+            By using this service, you acknowledge your obligations under the
+            United States Department of Justice Bulk Sensitive Data Transaction
+            Rule (&#34;BSD Rule&#34;). You also agree that you will not use the
+            service to transfer, onward transfer, or otherwise make accessible
+            any United States government-related data or bulk United States
+            sensitive personal data to countries of concern or a covered person,
+            as each of those terms and concepts are defined in the{' '}
+            <Link href="https://www.federalregister.gov/documents/2024/03/01/2024-04573/preventing-access-to-americans-bulk-sensitive-personal-data-and-united-states-government-related">
+              BSD Rule
+            </Link>
+            . Anyone using the service is solely responsible for compliance with
+            the BSD Rule.
+          </Typography>
+        )}
       </Stack>
     </Paper>
   );

From dcf82abd25d626ac409df925bdd068d0d66d9bd7 Mon Sep 17 00:00:00 2001
From: Purvesh Makode <pmakode@akamai.com>
Date: Wed, 26 Nov 2025 16:45:36 +0530
Subject: [PATCH 45/91] upcoming: [UIE-9684, UIE-9699] - Add
 `generateAddressesLabelV2` utility to support PrefixLists (#13122)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Save progress

* Update tests

* Few more changes

* Add more changes

* Clean up tests

* Few changes

* Layout updates

* Update tests

* Add ruleset loading state

* Clean up mocks

* Fix mocks

* Add comments to the type

* Added changeset: Update FirewallRuleType to support ruleset

* Added changeset: Update FirewallRuleTypeSchema to support ruleset

* Added changeset: Add new Firewall RuleSet row layout

* Update ruleset action text - Delete to Remove

* Save progress...

* Update comment

* Exclude 'addresses' from rulesets reference payloads

* Some fixes

* Add more details to the drawer for rulset

* More changes...

* Move Action column and improve table responsiveness for long labels

* Update Cypress component test

* Add more changes to the drawer for rulesets

* Update gap & fontsize of firwall add rules selection card

* Fix Chip shrink issue

* Revert Action column movement since its not yet confirmed

* More Refactoring + better formstate typesaftey

* Add renderOptions for Add ruleset Autocomplete

* Fix typos

* Few updates

* Few fixes

* Update cypress component tests

* More changes

* Update Add rulesets button copy

* More Updates

* Feature flag create entity selection for ruleset

* More refactoring - separating form states

* Add ruleset details drawer

* Some clean up...

* Save progress

* Add more changes

* Show only rulsets in dropdown applicable to the given catergory

* Update Date format and some minor changes

* Update mark for deletion date format

* Update date format

* Update badge color tokens

* Capitalize action label in chip

* Update Chip width

* Added changeset: Update Firewall Rule Drawer to support referencing Rule Set

* Use right color tokens for badge

* Update placeholder for Select Rule Set

* Some clean up

* Few updates and clean up

* Make cy test work

* Clean up: remove duplicate validation

* Add cancel btn for rules form + some design tokens for dropdown options

* Add cancel btn and some styling fixes

* Add mocks for Marked for deletion status

* Add generateAddressesLabelV2 utility to support prefixlists

* Add unit tests for Add Rule Set Drawer

* Update test title

* Mock useIsFirewallRulesetsPrefixlistsEnabled instead of feature flag

* Save progress

* Fix styling and a bit of clean up

* Add more mocks

* Add more mock Ips & PLs

* Clean up and refactor

* Minor styling fixes

* Add unit tests

* Add omitted props for StyledListItem

* Added changeset: New Rule Set Details drawer with Marked for Deletion status

* Update MaskableText to support JSX and Move Action col as a global change

* Consolidate imports

* Added changeset: Move Action column to the 2nd position in the Firewall Rules Table

* Added changeset: Add `generateAddressesLabelV2` utility to support PrefixLists

* Some clean up

* Update unit tests

* Fix typo

* More changes and add tests

* Make Rule Drawer accessible via routes

* Improve tests

* Add error state

* Mock getUserTimezone

* Some Clean up and allow route-based access only for view and create modes

* Few changes

* Update naming convention

* Update Cancel button type to secondary

* Add code comment for clarity

* Update tooltip styling

* Add MaskableText tests for JSX input
---
 .../pr-13122-changed-1763759617340.md         |   5 +
 ...r-13122-upcoming-features-1763759704504.md |   5 +
 .../MaskableText/MaskableText.test.tsx        |  62 ++
 .../components/MaskableText/MaskableText.tsx  |  21 +-
 .../Rules/FirewallRuleSetDetailsView.tsx      |   9 +-
 .../Rules/FirewallRuleSetForm.tsx             |   7 +-
 .../Rules/FirewallRuleTable.tsx               |  32 +-
 .../src/features/Firewalls/shared.test.ts     | 205 -------
 .../src/features/Firewalls/shared.test.tsx    | 405 +++++++++++++
 .../manager/src/features/Firewalls/shared.ts  | 282 ---------
 .../manager/src/features/Firewalls/shared.tsx | 562 ++++++++++++++++++
 packages/manager/src/mocks/serverHandlers.ts  |  56 +-
 .../manager/src/utilities/createMaskedText.ts |   9 +-
 13 files changed, 1143 insertions(+), 517 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13122-changed-1763759617340.md
 create mode 100644 packages/manager/.changeset/pr-13122-upcoming-features-1763759704504.md
 delete mode 100644 packages/manager/src/features/Firewalls/shared.test.ts
 create mode 100644 packages/manager/src/features/Firewalls/shared.test.tsx
 delete mode 100644 packages/manager/src/features/Firewalls/shared.ts
 create mode 100644 packages/manager/src/features/Firewalls/shared.tsx

diff --git a/packages/manager/.changeset/pr-13122-changed-1763759617340.md b/packages/manager/.changeset/pr-13122-changed-1763759617340.md
new file mode 100644
index 00000000000..06175a04a56
--- /dev/null
+++ b/packages/manager/.changeset/pr-13122-changed-1763759617340.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Changed
+---
+
+Move Action column to the 2nd position in the Firewall Rules Table ([#13122](https://github.com/linode/manager/pull/13122))
diff --git a/packages/manager/.changeset/pr-13122-upcoming-features-1763759704504.md b/packages/manager/.changeset/pr-13122-upcoming-features-1763759704504.md
new file mode 100644
index 00000000000..e05470547d8
--- /dev/null
+++ b/packages/manager/.changeset/pr-13122-upcoming-features-1763759704504.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Add `generateAddressesLabelV2` utility to support PrefixLists ([#13122](https://github.com/linode/manager/pull/13122))
diff --git a/packages/manager/src/components/MaskableText/MaskableText.test.tsx b/packages/manager/src/components/MaskableText/MaskableText.test.tsx
index 6bd0d5c999b..de4e2bfcb53 100644
--- a/packages/manager/src/components/MaskableText/MaskableText.test.tsx
+++ b/packages/manager/src/components/MaskableText/MaskableText.test.tsx
@@ -98,4 +98,66 @@ describe('MaskableText', () => {
     // Original text should be unmasked
     expect(getByText(plainText)).toBeVisible();
   });
+
+  it.each<[MaskableTextProps['length'], number]>([
+    // length prop     expected masked length
+    [undefined, 12], // default fallback
+    ['plaintext', 12], // DEFAULT_MASKED_TEXT_LENGTH for JSX
+    ['ipv4', 15], // from MASKABLE_TEXT_LENGTH_MAP
+    ['ipv6', 30], // from MASKABLE_TEXT_LENGTH_MAP
+    [8, 8], // custom numeric value
+  ])(
+    'should mask JSX list correctly when masking is enabled (length=%s)',
+    (lengthProp, expectedLength) => {
+      queryMocks.usePreferences.mockReturnValue({ data: preference });
+
+      const jsxList = (
+        <ul>
+          <li>item1</li>
+          <li>item2</li>
+          <li>secret-value</li>
+        </ul>
+      );
+
+      const expectedMasked = '•'.repeat(expectedLength);
+
+      const { getByText, queryByText } = renderWithTheme(
+        <MaskableText length={lengthProp} text={jsxList} />
+      );
+
+      // Masking works
+      expect(getByText(expectedMasked)).toBeVisible();
+
+      // The JSX list content must NOT show
+      expect(queryByText('item1')).not.toBeInTheDocument();
+      expect(queryByText('item2')).not.toBeInTheDocument();
+      expect(queryByText('secret-value')).not.toBeInTheDocument();
+    }
+  );
+
+  it('should render JSX list unmasked when masking preference is disabled', () => {
+    queryMocks.usePreferences.mockReturnValue({ data: false });
+
+    const jsxList = (
+      <ul>
+        <li>item1</li>
+        <li>item2</li>
+        <li>secret-value</li>
+      </ul>
+    );
+
+    const { getByText, queryByText } = renderWithTheme(
+      <MaskableText length={8} text={jsxList} />
+    );
+
+    const maskedText = '•'.repeat(8);
+
+    // Original JSX content should be visible
+    expect(getByText('item1')).toBeVisible();
+    expect(getByText('item2')).toBeVisible();
+    expect(getByText('secret-value')).toBeVisible();
+
+    // Masked text should NOT appear
+    expect(queryByText(maskedText)).not.toBeInTheDocument();
+  });
 });
diff --git a/packages/manager/src/components/MaskableText/MaskableText.tsx b/packages/manager/src/components/MaskableText/MaskableText.tsx
index 537f5fdf4cd..fd266fd5a8f 100644
--- a/packages/manager/src/components/MaskableText/MaskableText.tsx
+++ b/packages/manager/src/components/MaskableText/MaskableText.tsx
@@ -37,9 +37,10 @@ export interface MaskableTextProps {
    */
   sxVisibilityTooltip?: SxProps<Theme>;
   /**
-   * The original, maskable text; if the text is not masked, render this text or the styled text via children.
+   * The original, maskable content; can be a string or any JSX/ReactNode.
+   * If the text is not masked, render this text or the styled text via children.
    */
-  text: string | undefined;
+  text: React.ReactNode | string | undefined;
 }
 
 export const MaskableText = (props: MaskableTextProps) => {
@@ -59,11 +60,13 @@ export const MaskableText = (props: MaskableTextProps) => {
 
   const [isMasked, setIsMasked] = React.useState(maskedPreferenceSetting);
 
-  const unmaskedText = children ? (
-    children
-  ) : (
-    <Typography sx={sxTypography}>{text}</Typography>
-  );
+  const unmaskedText =
+    children ??
+    (typeof text === 'string' ? (
+      <Typography sx={sxTypography}>{text}</Typography>
+    ) : (
+      text // JSX (ReactNode)
+    ));
 
   // Return early based on the preference setting and the original text.
 
@@ -75,6 +78,8 @@ export const MaskableText = (props: MaskableTextProps) => {
     return unmaskedText;
   }
 
+  const maskedText = createMaskedText(text, length);
+
   return (
     <Stack
       alignItems="center"
@@ -95,7 +100,7 @@ export const MaskableText = (props: MaskableTextProps) => {
       )}
       {isMasked ? (
         <Typography sx={{ overflowWrap: 'anywhere', ...sxTypography }}>
-          {createMaskedText(text, length)}
+          {maskedText}
         </Typography>
       ) : (
         unmaskedText
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetDetailsView.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetDetailsView.tsx
index 0411ad72b0c..8efe636bb6b 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetDetailsView.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetDetailsView.tsx
@@ -15,7 +15,7 @@ import { CopyTooltip } from 'src/components/CopyTooltip/CopyTooltip';
 import { DateTimeDisplay } from 'src/components/DateTimeDisplay';
 
 import {
-  generateAddressesLabel,
+  generateAddressesLabelV2,
   useIsFirewallRulesetsPrefixlistsEnabled,
 } from '../../shared';
 import { RULESET_MARKED_FOR_DELETION_TEXT } from './shared';
@@ -179,14 +179,17 @@ export const FirewallRuleSetDetailsView = (
             />
             <Box>
               {rule.protocol};&nbsp;{rule.ports};&nbsp;
-              {generateAddressesLabel(rule.addresses)}
+              {generateAddressesLabelV2({
+                addresses: rule.addresses,
+                showTruncateChip: false,
+              })}
             </Box>
           </StyledListItem>
         ))}
       </Paper>
 
       <ActionsPanel
-        primaryButtonProps={{
+        secondaryButtonProps={{
           label: 'Cancel',
           onClick: closeDrawer,
         }}
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx
index a739297f596..f49756695c3 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx
@@ -16,7 +16,7 @@ import { CopyTooltip } from 'src/components/CopyTooltip/CopyTooltip';
 import { DateTimeDisplay } from 'src/components/DateTimeDisplay';
 
 import {
-  generateAddressesLabel,
+  generateAddressesLabelV2,
   useIsFirewallRulesetsPrefixlistsEnabled,
 } from '../../shared';
 import { StyledLabel, StyledListItem, useStyles } from './shared.styles';
@@ -211,7 +211,10 @@ export const FirewallRuleSetForm = React.memo(
                     />
                     <Box>
                       {rule.protocol};&nbsp;{rule.ports};&nbsp;
-                      {generateAddressesLabel(rule.addresses)}
+                      {generateAddressesLabelV2({
+                        addresses: rule.addresses,
+                        showTruncateChip: false,
+                      })}
                     </Box>
                   </StyledListItem>
                 ))}
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
index ccc4c856c23..c4c55f4ada1 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
@@ -37,6 +37,7 @@ import { TableRowEmpty } from 'src/components/TableRowEmpty/TableRowEmpty';
 import { TableRowLoading } from 'src/components/TableRowLoading/TableRowLoading';
 import {
   generateAddressesLabel,
+  generateAddressesLabelV2,
   generateRuleLabel,
   predefinedFirewallFromRule as ruleToPredefinedFirewall,
   useIsFirewallRulesetsPrefixlistsEnabled,
@@ -65,7 +66,7 @@ import type { FirewallOptionItem } from 'src/features/Firewalls/shared';
 
 interface RuleRow {
   action?: null | string;
-  addresses?: null | string;
+  addresses?: null | React.ReactNode | string;
   description?: null | string;
   errors?: FirewallRuleError[];
   id: number;
@@ -124,10 +125,16 @@ export const FirewallRuleTable = (props: FirewallRuleTableProps) => {
   const smDown = useMediaQuery(theme.breakpoints.down('sm'));
   const lgDown = useMediaQuery(theme.breakpoints.down('lg'));
 
+  const { isFirewallRulesetsPrefixlistsFeatureEnabled } =
+    useIsFirewallRulesetsPrefixlistsEnabled();
+
   const addressColumnLabel =
     category === 'inbound' ? 'sources' : 'destinations';
 
-  const rowData = firewallRuleToRowData(rulesWithStatus);
+  const rowData = firewallRuleToRowData(
+    rulesWithStatus,
+    isFirewallRulesetsPrefixlistsFeatureEnabled
+  );
 
   const openDrawerForCreating = React.useCallback(() => {
     openRuleDrawer(category, 'create');
@@ -209,16 +216,14 @@ export const FirewallRuleTable = (props: FirewallRuleTableProps) => {
                 >
                   Label
                 </TableCell>
+                <TableCell sx={{ width: '10%' }}>Action</TableCell>
                 <Hidden lgDown>
                   <TableCell sx={{ width: '10%' }}>Protocol</TableCell>
                 </Hidden>
                 <Hidden smDown>
                   <TableCell sx={{ width: '15%' }}>Port Range</TableCell>
-                  <TableCell sx={{ width: '15%' }}>
-                    {capitalize(addressColumnLabel)}
-                  </TableCell>
+                  <TableCell>{capitalize(addressColumnLabel)}</TableCell>
                 </Hidden>
-                <TableCell sx={{ width: '10%' }}>Action</TableCell>
                 <TableCell />
               </TableRow>
             </TableHead>
@@ -402,6 +407,9 @@ const FirewallRuleTableRow = React.memo((props: FirewallRuleTableRowProps) => {
               </LinkButton>
             )}
           </TableCell>
+          <TableCell aria-label={`Action: ${action}`}>
+            {capitalize(action?.toLocaleLowerCase() ?? '')}
+          </TableCell>
           <Hidden lgDown>
             <TableCell aria-label={`Protocol: ${protocol}`}>
               {protocol}
@@ -414,13 +422,10 @@ const FirewallRuleTableRow = React.memo((props: FirewallRuleTableRowProps) => {
               <ConditionalError errors={errors} formField="ports" />
             </TableCell>
             <TableCell aria-label={`Addresses: ${addresses}`}>
-              <MaskableText text={addresses ?? ''} />
+              <MaskableText length="ipv6" text={addresses} />
               <ConditionalError errors={errors} formField="addresses" />
             </TableCell>
           </Hidden>
-          <TableCell aria-label={`Action: ${action}`}>
-            {capitalize(action?.toLocaleLowerCase() ?? '')}
-          </TableCell>
         </>
       )}
 
@@ -632,14 +637,17 @@ export const ConditionalError = React.memo((props: ConditionalErrorProps) => {
  * of data. This also allows us to sort each column of the RuleTable.
  */
 export const firewallRuleToRowData = (
-  firewallRules: ExtendedFirewallRule[]
+  firewallRules: ExtendedFirewallRule[],
+  isFirewallRulesetsPrefixlistsEnabled?: boolean
 ): RuleRow[] => {
   return firewallRules.map((thisRule, idx) => {
     const ruleType = ruleToPredefinedFirewall(thisRule);
 
     return {
       ...thisRule,
-      addresses: generateAddressesLabel(thisRule.addresses),
+      addresses: isFirewallRulesetsPrefixlistsEnabled
+        ? generateAddressesLabelV2({ addresses: thisRule.addresses })
+        : generateAddressesLabel(thisRule.addresses),
       id: idx + 1, // ids are 1-indexed, as id given to the useSortable hook cannot be 0
       index: idx,
       ports: sortPortString(thisRule.ports || ''),
diff --git a/packages/manager/src/features/Firewalls/shared.test.ts b/packages/manager/src/features/Firewalls/shared.test.ts
deleted file mode 100644
index 6346bdb9d4f..00000000000
--- a/packages/manager/src/features/Firewalls/shared.test.ts
+++ /dev/null
@@ -1,205 +0,0 @@
-import { renderHook, waitFor } from '@testing-library/react';
-
-import { wrapWithTheme } from 'src/utilities/testHelpers';
-
-import {
-  allIPv4,
-  allIPv6,
-  generateAddressesLabel,
-  predefinedFirewallFromRule,
-  useIsFirewallRulesetsPrefixlistsEnabled,
-} from './shared';
-
-import type { FirewallRuleType } from '@linode/api-v4/lib/firewalls/types';
-
-const addresses = {
-  ipv4: [allIPv4],
-  ipv6: [allIPv6],
-};
-
-const limitedAddresses = {
-  ipv4: ['1.1.1.1'],
-  ipv6: ['::'],
-};
-
-describe('predefinedFirewallFromRule', () => {
-  const rule: FirewallRuleType = {
-    action: 'ACCEPT',
-    addresses,
-    ports: '',
-    protocol: 'TCP',
-  };
-
-  it('handles SSH', () => {
-    rule.ports = '22';
-    expect(predefinedFirewallFromRule(rule)).toBe('ssh');
-  });
-  it('handles HTTP', () => {
-    rule.ports = '80';
-    expect(predefinedFirewallFromRule(rule)).toBe('http');
-  });
-  it('handles HTTPS', () => {
-    rule.ports = '443';
-    expect(predefinedFirewallFromRule(rule)).toBe('https');
-  });
-  it('handles MySQL', () => {
-    rule.ports = '3306';
-    expect(predefinedFirewallFromRule(rule)).toBe('mysql');
-  });
-  it('handles DNS', () => {
-    rule.ports = '53';
-    expect(predefinedFirewallFromRule(rule)).toBe('dns');
-  });
-
-  it('returns `undefined` when given an unrecognizable rule', () => {
-    expect(
-      predefinedFirewallFromRule({
-        action: 'ACCEPT',
-        addresses,
-        // Test another port
-        ports: '22-24',
-        protocol: 'TCP',
-      })
-    ).toBeUndefined();
-
-    expect(
-      predefinedFirewallFromRule({
-        action: 'ACCEPT',
-        addresses,
-        ports: '22',
-        // Test another protocol
-        protocol: 'UDP',
-      })
-    ).toBeUndefined();
-
-    expect(
-      predefinedFirewallFromRule({
-        action: 'ACCEPT',
-        // Test other addresses
-        addresses: limitedAddresses,
-        ports: '22',
-        protocol: 'TCP',
-      })
-    ).toBeUndefined();
-  });
-});
-
-describe('generateAddressLabel', () => {
-  it('includes the All IPv4 label if appropriate', () => {
-    expect(generateAddressesLabel(addresses).includes('All IPv4')).toBe(true);
-    expect(generateAddressesLabel(limitedAddresses).includes('All IPv4')).toBe(
-      false
-    );
-  });
-
-  it("doesn't include other IPv4 addresses if ALL are also specified", () => {
-    const result = generateAddressesLabel({
-      ...addresses,
-      ipv4: [allIPv4, '1.1.1.1'],
-    });
-    expect(result.includes('All IPv4')).toBe(true);
-    expect(result.includes('1.1.1.1')).toBe(false);
-  });
-
-  it('includes the All IPv6 label if appropriate', () => {
-    expect(generateAddressesLabel(addresses).includes('All IPv6')).toBe(true);
-  });
-
-  it("doesn't include other IPv6 addresses if ALL are also specified", () => {
-    const result = generateAddressesLabel({
-      ...addresses,
-      ipv6: [allIPv6, '::1'],
-    });
-    expect(result.includes('All IPv6')).toBe(true);
-    expect(result.includes('::1')).toBe(false);
-  });
-
-  it('includes all appropriate addresses', () => {
-    expect(generateAddressesLabel(addresses)).toBe('All IPv4, All IPv6');
-    expect(generateAddressesLabel({ ipv4: ['1.1.1.1'] })).toBe('1.1.1.1');
-    expect(generateAddressesLabel({ ipv6: ['::1'] })).toBe('::1');
-    expect(
-      generateAddressesLabel({ ipv4: ['1.1.1.1, 2.2.2.2'], ipv6: ['::1'] })
-    ).toBe('1.1.1.1, 2.2.2.2, ::1');
-    expect(
-      generateAddressesLabel({ ipv4: ['1.1.1.1, 2.2.2.2'], ipv6: [allIPv6] })
-    ).toBe('All IPv6, 1.1.1.1, 2.2.2.2');
-  });
-
-  it('truncates large lists', () => {
-    expect(
-      generateAddressesLabel({
-        ipv4: ['1.1.1.1', '2.2.2.2', '3.3.3.3', '4.4.4.4', '5.5.5.5'],
-      })
-    ).toBe('1.1.1.1, 2.2.2.2, 3.3.3.3, plus 2 more');
-  });
-
-  it('should always display "All IPv4" and "All IPv6", even if the label is truncated', () => {
-    expect(
-      generateAddressesLabel({
-        ipv4: ['1.1.1.1', '2.2.2.2', '3.3.3.3', '4.4.4.4', '5.5.5.5'],
-        ipv6: ['::/0'],
-      })
-    ).toBe('All IPv6, 1.1.1.1, 2.2.2.2, plus 3 more');
-  });
-
-  it('returns "None" if necessary', () => {
-    expect(generateAddressesLabel({ ipv4: undefined, ipv6: undefined })).toBe(
-      'None'
-    );
-  });
-});
-
-describe('useIsFirewallRulesetsPrefixlistsEnabled', () => {
-  it('returns true if the feature is enabled', async () => {
-    const options = {
-      flags: {
-        fwRulesetsPrefixLists: {
-          enabled: true,
-          beta: false,
-          la: false,
-          ga: false,
-        },
-      },
-    };
-
-    const { result } = renderHook(
-      () => useIsFirewallRulesetsPrefixlistsEnabled(),
-      {
-        wrapper: (ui) => wrapWithTheme(ui, options),
-      }
-    );
-
-    await waitFor(() => {
-      expect(result.current.isFirewallRulesetsPrefixlistsFeatureEnabled).toBe(
-        true
-      );
-    });
-  });
-
-  it('returns false if the feature is NOT enabled', async () => {
-    const options = {
-      flags: {
-        fwRulesetsPrefixLists: {
-          enabled: false,
-          beta: false,
-          la: false,
-          ga: false,
-        },
-      },
-    };
-
-    const { result } = renderHook(
-      () => useIsFirewallRulesetsPrefixlistsEnabled(),
-      {
-        wrapper: (ui) => wrapWithTheme(ui, options),
-      }
-    );
-
-    await waitFor(() => {
-      expect(result.current.isFirewallRulesetsPrefixlistsFeatureEnabled).toBe(
-        false
-      );
-    });
-  });
-});
diff --git a/packages/manager/src/features/Firewalls/shared.test.tsx b/packages/manager/src/features/Firewalls/shared.test.tsx
new file mode 100644
index 00000000000..ca1ef1befb6
--- /dev/null
+++ b/packages/manager/src/features/Firewalls/shared.test.tsx
@@ -0,0 +1,405 @@
+/* eslint-disable react/jsx-no-useless-fragment */
+import { renderHook, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { renderWithTheme, wrapWithTheme } from 'src/utilities/testHelpers';
+
+import {
+  allIPv4,
+  allIPv6,
+  buildPrefixListReferenceMap,
+  generateAddressesLabel,
+  generateAddressesLabelV2,
+  predefinedFirewallFromRule,
+  useIsFirewallRulesetsPrefixlistsEnabled,
+} from './shared';
+
+import type { PrefixListReferenceMap } from './shared';
+import type { FirewallRuleType } from '@linode/api-v4/lib/firewalls/types';
+
+const addresses = {
+  ipv4: [allIPv4],
+  ipv6: [allIPv6],
+};
+
+const limitedAddresses = {
+  ipv4: ['1.1.1.1'],
+  ipv6: ['::'],
+};
+
+describe('predefinedFirewallFromRule', () => {
+  const rule: FirewallRuleType = {
+    action: 'ACCEPT',
+    addresses,
+    ports: '',
+    protocol: 'TCP',
+  };
+
+  it('handles SSH', () => {
+    rule.ports = '22';
+    expect(predefinedFirewallFromRule(rule)).toBe('ssh');
+  });
+  it('handles HTTP', () => {
+    rule.ports = '80';
+    expect(predefinedFirewallFromRule(rule)).toBe('http');
+  });
+  it('handles HTTPS', () => {
+    rule.ports = '443';
+    expect(predefinedFirewallFromRule(rule)).toBe('https');
+  });
+  it('handles MySQL', () => {
+    rule.ports = '3306';
+    expect(predefinedFirewallFromRule(rule)).toBe('mysql');
+  });
+  it('handles DNS', () => {
+    rule.ports = '53';
+    expect(predefinedFirewallFromRule(rule)).toBe('dns');
+  });
+
+  it('returns `undefined` when given an unrecognizable rule', () => {
+    expect(
+      predefinedFirewallFromRule({
+        action: 'ACCEPT',
+        addresses,
+        // Test another port
+        ports: '22-24',
+        protocol: 'TCP',
+      })
+    ).toBeUndefined();
+
+    expect(
+      predefinedFirewallFromRule({
+        action: 'ACCEPT',
+        addresses,
+        ports: '22',
+        // Test another protocol
+        protocol: 'UDP',
+      })
+    ).toBeUndefined();
+
+    expect(
+      predefinedFirewallFromRule({
+        action: 'ACCEPT',
+        // Test other addresses
+        addresses: limitedAddresses,
+        ports: '22',
+        protocol: 'TCP',
+      })
+    ).toBeUndefined();
+  });
+});
+
+describe('generateAddressLabel', () => {
+  it('includes the All IPv4 label if appropriate', () => {
+    expect(generateAddressesLabel(addresses).includes('All IPv4')).toBe(true);
+    expect(generateAddressesLabel(limitedAddresses).includes('All IPv4')).toBe(
+      false
+    );
+  });
+
+  it("doesn't include other IPv4 addresses if ALL are also specified", () => {
+    const result = generateAddressesLabel({
+      ...addresses,
+      ipv4: [allIPv4, '1.1.1.1'],
+    });
+    expect(result.includes('All IPv4')).toBe(true);
+    expect(result.includes('1.1.1.1')).toBe(false);
+  });
+
+  it('includes the All IPv6 label if appropriate', () => {
+    expect(generateAddressesLabel(addresses).includes('All IPv6')).toBe(true);
+  });
+
+  it("doesn't include other IPv6 addresses if ALL are also specified", () => {
+    const result = generateAddressesLabel({
+      ...addresses,
+      ipv6: [allIPv6, '::1'],
+    });
+    expect(result.includes('All IPv6')).toBe(true);
+    expect(result.includes('::1')).toBe(false);
+  });
+
+  it('includes all appropriate addresses', () => {
+    expect(generateAddressesLabel(addresses)).toBe('All IPv4, All IPv6');
+    expect(generateAddressesLabel({ ipv4: ['1.1.1.1'] })).toBe('1.1.1.1');
+    expect(generateAddressesLabel({ ipv6: ['::1'] })).toBe('::1');
+    expect(
+      generateAddressesLabel({ ipv4: ['1.1.1.1, 2.2.2.2'], ipv6: ['::1'] })
+    ).toBe('1.1.1.1, 2.2.2.2, ::1');
+    expect(
+      generateAddressesLabel({ ipv4: ['1.1.1.1, 2.2.2.2'], ipv6: [allIPv6] })
+    ).toBe('All IPv6, 1.1.1.1, 2.2.2.2');
+  });
+
+  it('truncates large lists', () => {
+    expect(
+      generateAddressesLabel({
+        ipv4: ['1.1.1.1', '2.2.2.2', '3.3.3.3', '4.4.4.4', '5.5.5.5'],
+      })
+    ).toBe('1.1.1.1, 2.2.2.2, 3.3.3.3, plus 2 more');
+  });
+
+  it('should always display "All IPv4" and "All IPv6", even if the label is truncated', () => {
+    expect(
+      generateAddressesLabel({
+        ipv4: ['1.1.1.1', '2.2.2.2', '3.3.3.3', '4.4.4.4', '5.5.5.5'],
+        ipv6: ['::/0'],
+      })
+    ).toBe('All IPv6, 1.1.1.1, 2.2.2.2, plus 3 more');
+  });
+
+  it('returns "None" if necessary', () => {
+    expect(generateAddressesLabel({ ipv4: undefined, ipv6: undefined })).toBe(
+      'None'
+    );
+  });
+});
+
+describe('buildPrefixListMap', () => {
+  it('returns empty map if no input', () => {
+    const result = buildPrefixListReferenceMap({});
+    expect(result).toEqual({});
+  });
+
+  it('maps IPv4 prefix lists correctly', () => {
+    const ipv4 = ['pl:example1', '192.168.0.1', 'pl:example2'];
+    const result: PrefixListReferenceMap = buildPrefixListReferenceMap({
+      ipv4,
+    });
+
+    expect(result).toEqual({
+      'pl:example1': { inIPv4Rule: true, inIPv6Rule: false },
+      'pl:example2': { inIPv4Rule: true, inIPv6Rule: false },
+    });
+  });
+
+  it('maps IPv6 prefix lists correctly', () => {
+    const ipv6 = ['pl:example1', 'fe80::1', 'pl:example2'];
+    const result: PrefixListReferenceMap = buildPrefixListReferenceMap({
+      ipv6,
+    });
+
+    expect(result).toEqual({
+      'pl:example1': { inIPv4Rule: false, inIPv6Rule: true },
+      'pl:example2': { inIPv4Rule: false, inIPv6Rule: true },
+    });
+  });
+
+  it('maps both IPv4 and IPv6 for the same prefix list', () => {
+    const ipv4 = ['pl:example1'];
+    const ipv6 = ['pl:example1'];
+    const result: PrefixListReferenceMap = buildPrefixListReferenceMap({
+      ipv4,
+      ipv6,
+    });
+
+    expect(result).toEqual({
+      'pl:example1': { inIPv4Rule: true, inIPv6Rule: true },
+    });
+  });
+
+  it('ignores non-prefix list IPs', () => {
+    const ipv4 = ['192.168.0.1'];
+    const ipv6 = ['fe80::1'];
+    const result: PrefixListReferenceMap = buildPrefixListReferenceMap({
+      ipv4,
+      ipv6,
+    });
+
+    expect(result).toEqual({});
+  });
+
+  it('handles duplicates correctly', () => {
+    const ipv4 = ['pl:duplicate-example', 'pl:duplicate-example'];
+    const ipv6 = ['pl:duplicate-example'];
+    const result: PrefixListReferenceMap = buildPrefixListReferenceMap({
+      ipv4,
+      ipv6,
+    });
+
+    expect(result).toEqual({
+      'pl:duplicate-example': { inIPv4Rule: true, inIPv6Rule: true },
+    });
+  });
+});
+
+describe('generateAddressesLabelV2', () => {
+  const onPrefixListClick = vi.fn();
+
+  const addresses: FirewallRuleType['addresses'] = {
+    ipv4: [
+      'pl:system:test-1', // PL attached to both IPv4/IPv6
+      'pl::test-2', // PL attached to IPv4 only
+      '192.168.1.1', // individual IP
+    ],
+    ipv6: [
+      'pl:system:test-1', // same system PL
+      'pl::test-3', // PL attached to IPv6 only
+      '2001:db8:85a3::8a2e:370:7334/128', // individual IP
+    ],
+  };
+
+  it('renders PLs with correct Firewall IP reference labels', () => {
+    const result = generateAddressesLabelV2({
+      addresses,
+      onPrefixListClick,
+      showTruncateChip: false,
+    });
+    const { getByText } = renderWithTheme(<>{result}</>);
+
+    // Check PLs with proper suffixes
+    expect(getByText(/pl:system:test-1 \(IPv4, IPv6\)/)).toBeVisible();
+    expect(getByText(/pl::test-2 \(IPv4\)/)).toBeVisible();
+    expect(getByText(/pl::test-3 \(IPv6\)/)).toBeVisible();
+  });
+
+  it('renders individual IP addresses correctly', () => {
+    const result = generateAddressesLabelV2({
+      addresses,
+      showTruncateChip: false,
+    });
+    const { getByText } = renderWithTheme(<>{result}</>);
+
+    expect(getByText('192.168.1.1')).toBeVisible();
+    expect(getByText('2001:db8:85a3::8a2e:370:7334/128')).toBeVisible();
+  });
+
+  it('triggers onPrefixListClick when PL is clicked', async () => {
+    const result = generateAddressesLabelV2({
+      addresses,
+      onPrefixListClick,
+      showTruncateChip: false,
+    });
+    const { getByText } = renderWithTheme(<>{result}</>);
+
+    await userEvent.click(getByText(/pl:system:test-1/));
+    expect(onPrefixListClick).toHaveBeenCalledWith(
+      'pl:system:test-1',
+      '(IPv4, IPv6)'
+    );
+
+    await userEvent.click(getByText(/pl::test-2/));
+    expect(onPrefixListClick).toHaveBeenCalledWith('pl::test-2', '(IPv4)');
+
+    await userEvent.click(getByText(/pl::test-3/));
+    expect(onPrefixListClick).toHaveBeenCalledWith('pl::test-3', '(IPv6)');
+  });
+
+  it('renders None if no addresses are provided', () => {
+    const result = generateAddressesLabelV2({
+      addresses: { ipv4: [], ipv6: [] },
+    });
+    const { getByText } = renderWithTheme(<>{result}</>);
+    expect(getByText('None')).toBeVisible();
+  });
+
+  it('renders "All IPv4, All IPv6" when allowAll type is present in addresses', () => {
+    const addressesAll = { ipv4: ['0.0.0.0/0'], ipv6: ['::/0'] };
+    const result = generateAddressesLabelV2({ addresses: addressesAll });
+    const { getByText } = renderWithTheme(<>{result}</>);
+    expect(getByText('All IPv4, All IPv6')).toBeVisible();
+  });
+
+  it('handles truncation and shows Chip for hidden items', () => {
+    const addressesMany = {
+      ipv4: ['1.1.1.1', '2.2.2.2', '3.3.3.3'],
+      ipv6: ['::1', '::2'],
+    };
+    const result = generateAddressesLabelV2({
+      addresses: addressesMany,
+      showTruncateChip: true,
+      truncateAt: 2,
+    });
+    const { container } = renderWithTheme(<>{result}</>);
+    expect(container.textContent).toContain('+3'); // 5 total items (2 visible and 3 hidden)
+  });
+
+  it('renders only 1 visible item and shows Chip when showTruncateChip is true and truncateAt is 1', () => {
+    const result = generateAddressesLabelV2({
+      addresses,
+      showTruncateChip: true,
+      truncateAt: 1,
+    });
+    const { getByText, queryByText } = renderWithTheme(<>{result}</>);
+
+    expect(getByText(/pl:system:test-1 \(IPv4, IPv6\)/)).toBeVisible();
+
+    expect(getByText('+4')).toBeVisible(); // 5 total elements (1 shown + 4 hidden)
+
+    // Hidden items are not rendered outside tooltip
+    expect(queryByText(/pl::test-2 \(IPv4\)/)).toBeNull();
+    expect(queryByText(/pl::test-3 \(IPv6\)/)).toBeNull();
+    expect(queryByText('192.168.1.1')).toBeNull();
+    expect(queryByText('2001:db8:85a3::8a2e:370:7334/128')).toBeNull();
+  });
+
+  it('renders all items if showTruncateChip is false', () => {
+    const result = generateAddressesLabelV2({
+      addresses,
+      showTruncateChip: false,
+      truncateAt: 1, // should be ignored
+    });
+    const { getByText } = renderWithTheme(<>{result}</>);
+
+    expect(getByText(/pl:system:test-1 \(IPv4, IPv6\)/)).toBeVisible();
+    expect(getByText(/pl::test-2 \(IPv4\)/)).toBeVisible();
+    expect(getByText(/pl::test-3 \(IPv6\)/)).toBeVisible();
+    expect(getByText('192.168.1.1')).toBeVisible();
+    expect(getByText('2001:db8:85a3::8a2e:370:7334/128')).toBeVisible();
+  });
+});
+
+describe('useIsFirewallRulesetsPrefixlistsEnabled', () => {
+  it('returns true if the feature is enabled', async () => {
+    const options = {
+      flags: {
+        fwRulesetsPrefixLists: {
+          enabled: true,
+          beta: false,
+          la: false,
+          ga: false,
+        },
+      },
+    };
+
+    const { result } = renderHook(
+      () => useIsFirewallRulesetsPrefixlistsEnabled(),
+      {
+        wrapper: (ui) => wrapWithTheme(ui, options),
+      }
+    );
+
+    await waitFor(() => {
+      expect(result.current.isFirewallRulesetsPrefixlistsFeatureEnabled).toBe(
+        true
+      );
+    });
+  });
+
+  it('returns false if the feature is NOT enabled', async () => {
+    const options = {
+      flags: {
+        fwRulesetsPrefixLists: {
+          enabled: false,
+          beta: false,
+          la: false,
+          ga: false,
+        },
+      },
+    };
+
+    const { result } = renderHook(
+      () => useIsFirewallRulesetsPrefixlistsEnabled(),
+      {
+        wrapper: (ui) => wrapWithTheme(ui, options),
+      }
+    );
+
+    await waitFor(() => {
+      expect(result.current.isFirewallRulesetsPrefixlistsFeatureEnabled).toBe(
+        false
+      );
+    });
+  });
+});
diff --git a/packages/manager/src/features/Firewalls/shared.ts b/packages/manager/src/features/Firewalls/shared.ts
deleted file mode 100644
index 64ab820b8c9..00000000000
--- a/packages/manager/src/features/Firewalls/shared.ts
+++ /dev/null
@@ -1,282 +0,0 @@
-import { truncateAndJoinList } from '@linode/utilities';
-import { capitalize } from '@linode/utilities';
-
-import { useFlags } from 'src/hooks/useFlags';
-
-import type { PORT_PRESETS } from './FirewallDetail/Rules/shared';
-import type {
-  Firewall,
-  FirewallRuleProtocol,
-  FirewallRuleType,
-} from '@linode/api-v4/lib/firewalls/types';
-
-export type FirewallPreset = 'dns' | 'http' | 'https' | 'mysql' | 'ssh';
-
-export interface FirewallOptionItem<T = number | string, L = string> {
-  label: L;
-  value: T;
-}
-// Predefined Firewall options for Select components (long-form).
-export const firewallOptionItemsLong = [
-  {
-    label: 'SSH (TCP 22 - All IPv4, All IPv6)',
-    value: 'ssh',
-  },
-  {
-    label: 'HTTP (TCP 80 - All IPv4, All IPv6)',
-    value: 'http',
-  },
-  {
-    label: 'HTTPS (TCP 443 - All IPv4, All IPv6)',
-    value: 'https',
-  },
-  {
-    label: 'MySQL (TCP 3306 - All IPv4, All IPv6)',
-    value: 'mysql',
-  },
-  {
-    label: 'DNS (TCP 53 - All IPv4, All IPv6)',
-    value: 'dns',
-  },
-];
-
-// Predefined Firewall options for Select components (short-form).
-export const firewallOptionItemsShort = [
-  {
-    label: 'SSH',
-    value: 'ssh',
-  },
-  {
-    label: 'HTTP',
-    value: 'http',
-  },
-  {
-    label: 'HTTPS',
-    value: 'https',
-  },
-  {
-    label: 'MySQL',
-    value: 'mysql',
-  },
-  {
-    label: 'DNS',
-    value: 'dns',
-  },
-] as const;
-
-export const protocolOptions: FirewallOptionItem<FirewallRuleProtocol>[] = [
-  { label: 'TCP', value: 'TCP' },
-  { label: 'UDP', value: 'UDP' },
-  { label: 'ICMP', value: 'ICMP' },
-  { label: 'IPENCAP', value: 'IPENCAP' },
-];
-
-export const addressOptions = [
-  { label: 'All IPv4, All IPv6', value: 'all' },
-  { label: 'All IPv4', value: 'allIPv4' },
-  { label: 'All IPv6', value: 'allIPv6' },
-  { label: 'IP / Netmask', value: 'ip/netmask' },
-];
-
-export const portPresets: Record<FirewallPreset, keyof typeof PORT_PRESETS> = {
-  dns: '53',
-  http: '80',
-  https: '443',
-  mysql: '3306',
-  ssh: '22',
-};
-
-export const allIPv4 = '0.0.0.0/0';
-export const allIPv6 = '::/0';
-
-export const allIPs = {
-  ipv4: [allIPv4],
-  ipv6: [allIPv6],
-};
-
-export interface PredefinedFirewall {
-  inbound: FirewallRuleType[];
-  label: string;
-}
-
-export const predefinedFirewalls: Record<FirewallPreset, PredefinedFirewall> = {
-  dns: {
-    inbound: [
-      {
-        action: 'ACCEPT',
-        addresses: allIPs,
-        label: `accept-inbound-DNS`,
-        ports: portPresets.dns,
-        protocol: 'TCP',
-      },
-    ],
-    label: 'DNS',
-  },
-  http: {
-    inbound: [
-      {
-        action: 'ACCEPT',
-        addresses: allIPs,
-        label: `accept-inbound-HTTP`,
-        ports: portPresets.http,
-        protocol: 'TCP',
-      },
-    ],
-    label: 'HTTP',
-  },
-  https: {
-    inbound: [
-      {
-        action: 'ACCEPT',
-        addresses: allIPs,
-        label: `accept-inbound-HTTPS`,
-        ports: portPresets.https,
-        protocol: 'TCP',
-      },
-    ],
-    label: 'HTTPS',
-  },
-  mysql: {
-    inbound: [
-      {
-        action: 'ACCEPT',
-        addresses: allIPs,
-        label: `accept-inbound-MYSQL`,
-        ports: portPresets.mysql,
-        protocol: 'TCP',
-      },
-    ],
-    label: 'MySQL',
-  },
-  ssh: {
-    inbound: [
-      {
-        action: 'ACCEPT',
-        addresses: allIPs,
-        label: `accept-inbound-SSH`,
-        ports: portPresets.ssh,
-        protocol: 'TCP',
-      },
-    ],
-    label: 'SSH',
-  },
-};
-
-export const predefinedFirewallFromRule = (
-  rule: FirewallRuleType
-): FirewallPreset | undefined => {
-  const { addresses, ports, protocol } = rule;
-
-  // All predefined Firewalls have a protocol of TCP.
-  if (protocol !== 'TCP') {
-    return undefined;
-  }
-
-  // All predefined Firewalls allow all IPs.
-  if (!allowsAllIPs(addresses)) {
-    return undefined;
-  }
-
-  switch (ports) {
-    case portPresets.dns:
-      return 'dns';
-    case portPresets.http:
-      return 'http';
-    case portPresets.https:
-      return 'https';
-    case portPresets.mysql:
-      return 'mysql';
-    case portPresets.ssh:
-      return 'ssh';
-    default:
-      return undefined;
-  }
-};
-
-export const allowsAllIPs = (addresses: FirewallRuleType['addresses']) =>
-  allowAllIPv4(addresses) && allowAllIPv6(addresses);
-
-export const allowAllIPv4 = (addresses: FirewallRuleType['addresses']) =>
-  addresses?.ipv4?.includes(allIPv4);
-
-export const allowAllIPv6 = (addresses: FirewallRuleType['addresses']) =>
-  addresses?.ipv6?.includes(allIPv6);
-
-export const allowNoneIPv4 = (addresses: FirewallRuleType['addresses']) =>
-  !addresses?.ipv4?.length;
-
-export const allowNoneIPv6 = (addresses: FirewallRuleType['addresses']) =>
-  !addresses?.ipv6?.length;
-
-export const generateRuleLabel = (ruleType?: FirewallPreset) =>
-  ruleType ? predefinedFirewalls[ruleType].label : 'Custom';
-
-export const generateAddressesLabel = (
-  addresses: FirewallRuleType['addresses']
-) => {
-  const strBuilder: string[] = [];
-
-  const allowedAllIPv4 = allowAllIPv4(addresses);
-  const allowedAllIPv6 = allowAllIPv6(addresses);
-
-  // First add the "All IPvX" strings so they always appear, even if the list
-  // ends up being truncated.
-  if (allowedAllIPv4) {
-    strBuilder.push('All IPv4');
-  }
-
-  if (allowedAllIPv6) {
-    strBuilder.push('All IPv6');
-  }
-
-  // Now we can look at the rest of the rules:
-  if (!allowedAllIPv4) {
-    addresses?.ipv4?.forEach((thisIP) => {
-      strBuilder.push(thisIP);
-    });
-  }
-
-  if (!allowedAllIPv6) {
-    addresses?.ipv6?.forEach((thisIP) => {
-      strBuilder.push(thisIP);
-    });
-  }
-
-  if (strBuilder.length > 0) {
-    return truncateAndJoinList(strBuilder, 3);
-  }
-
-  // If no IPs are allowed.
-  return 'None';
-};
-
-export const getFirewallDescription = (firewall: Firewall) => {
-  const description = [
-    `Status: ${capitalize(firewall.status)}`,
-    `Services Assigned: ${firewall.entities.length}`,
-  ];
-  return description.join(', ');
-};
-
-/**
- * Returns whether or not features related to the Firewall Rulesets & Prefix Lists project
- * should be enabled, and whether they are in beta, LA, or GA.
- *
- * Note: Currently, this just uses the `fwRulesetsPrefixlists` feature flag as a source of truth,
- * but will eventually also look at account capabilities if available.
- */
-export const useIsFirewallRulesetsPrefixlistsEnabled = () => {
-  const flags = useFlags();
-
-  // @TODO: Firewall Rulesets & Prefix Lists - check for customer tag/account capability when it exists
-  return {
-    isFirewallRulesetsPrefixlistsFeatureEnabled:
-      flags.fwRulesetsPrefixLists?.enabled ?? false,
-    isFirewallRulesetsPrefixListsBetaEnabled:
-      flags.fwRulesetsPrefixLists?.beta ?? false,
-    isFirewallRulesetsPrefixListsLAEnabled:
-      flags.fwRulesetsPrefixLists?.la ?? false,
-    isFirewallRulesetsPrefixListsGAEnabled:
-      flags.fwRulesetsPrefixLists?.ga ?? false,
-  };
-};
diff --git a/packages/manager/src/features/Firewalls/shared.tsx b/packages/manager/src/features/Firewalls/shared.tsx
new file mode 100644
index 00000000000..c119735f991
--- /dev/null
+++ b/packages/manager/src/features/Firewalls/shared.tsx
@@ -0,0 +1,562 @@
+import { Box, Chip, Tooltip } from '@linode/ui';
+import { capitalize, truncateAndJoinList } from '@linode/utilities';
+import React from 'react';
+
+import { Link } from 'src/components/Link';
+import { useFlags } from 'src/hooks/useFlags';
+
+import type { PORT_PRESETS } from './FirewallDetail/Rules/shared';
+import type {
+  Firewall,
+  FirewallRuleProtocol,
+  FirewallRuleType,
+} from '@linode/api-v4/lib/firewalls/types';
+
+export type FirewallPreset = 'dns' | 'http' | 'https' | 'mysql' | 'ssh';
+export interface FirewallOptionItem<T = number | string, L = string> {
+  label: L;
+  value: T;
+}
+// Predefined Firewall options for Select components (long-form).
+export const firewallOptionItemsLong = [
+  {
+    label: 'SSH (TCP 22 - All IPv4, All IPv6)',
+    value: 'ssh',
+  },
+  {
+    label: 'HTTP (TCP 80 - All IPv4, All IPv6)',
+    value: 'http',
+  },
+  {
+    label: 'HTTPS (TCP 443 - All IPv4, All IPv6)',
+    value: 'https',
+  },
+  {
+    label: 'MySQL (TCP 3306 - All IPv4, All IPv6)',
+    value: 'mysql',
+  },
+  {
+    label: 'DNS (TCP 53 - All IPv4, All IPv6)',
+    value: 'dns',
+  },
+];
+
+// Predefined Firewall options for Select components (short-form).
+export const firewallOptionItemsShort = [
+  {
+    label: 'SSH',
+    value: 'ssh',
+  },
+  {
+    label: 'HTTP',
+    value: 'http',
+  },
+  {
+    label: 'HTTPS',
+    value: 'https',
+  },
+  {
+    label: 'MySQL',
+    value: 'mysql',
+  },
+  {
+    label: 'DNS',
+    value: 'dns',
+  },
+] as const;
+
+export const protocolOptions: FirewallOptionItem<FirewallRuleProtocol>[] = [
+  { label: 'TCP', value: 'TCP' },
+  { label: 'UDP', value: 'UDP' },
+  { label: 'ICMP', value: 'ICMP' },
+  { label: 'IPENCAP', value: 'IPENCAP' },
+];
+
+export const addressOptions = [
+  { label: 'All IPv4, All IPv6', value: 'all' },
+  { label: 'All IPv4', value: 'allIPv4' },
+  { label: 'All IPv6', value: 'allIPv6' },
+  { label: 'IP / Netmask', value: 'ip/netmask' },
+];
+
+export const portPresets: Record<FirewallPreset, keyof typeof PORT_PRESETS> = {
+  dns: '53',
+  http: '80',
+  https: '443',
+  mysql: '3306',
+  ssh: '22',
+};
+
+export const allIPv4 = '0.0.0.0/0';
+export const allIPv6 = '::/0';
+
+export const allIPs = {
+  ipv4: [allIPv4],
+  ipv6: [allIPv6],
+};
+
+export interface PredefinedFirewall {
+  inbound: FirewallRuleType[];
+  label: string;
+}
+
+export const predefinedFirewalls: Record<FirewallPreset, PredefinedFirewall> = {
+  dns: {
+    inbound: [
+      {
+        action: 'ACCEPT',
+        addresses: allIPs,
+        label: `accept-inbound-DNS`,
+        ports: portPresets.dns,
+        protocol: 'TCP',
+      },
+    ],
+    label: 'DNS',
+  },
+  http: {
+    inbound: [
+      {
+        action: 'ACCEPT',
+        addresses: allIPs,
+        label: `accept-inbound-HTTP`,
+        ports: portPresets.http,
+        protocol: 'TCP',
+      },
+    ],
+    label: 'HTTP',
+  },
+  https: {
+    inbound: [
+      {
+        action: 'ACCEPT',
+        addresses: allIPs,
+        label: `accept-inbound-HTTPS`,
+        ports: portPresets.https,
+        protocol: 'TCP',
+      },
+    ],
+    label: 'HTTPS',
+  },
+  mysql: {
+    inbound: [
+      {
+        action: 'ACCEPT',
+        addresses: allIPs,
+        label: `accept-inbound-MYSQL`,
+        ports: portPresets.mysql,
+        protocol: 'TCP',
+      },
+    ],
+    label: 'MySQL',
+  },
+  ssh: {
+    inbound: [
+      {
+        action: 'ACCEPT',
+        addresses: allIPs,
+        label: `accept-inbound-SSH`,
+        ports: portPresets.ssh,
+        protocol: 'TCP',
+      },
+    ],
+    label: 'SSH',
+  },
+};
+
+export const predefinedFirewallFromRule = (
+  rule: FirewallRuleType
+): FirewallPreset | undefined => {
+  const { addresses, ports, protocol } = rule;
+
+  // All predefined Firewalls have a protocol of TCP.
+  if (protocol !== 'TCP') {
+    return undefined;
+  }
+
+  // All predefined Firewalls allow all IPs.
+  if (!allowsAllIPs(addresses)) {
+    return undefined;
+  }
+
+  switch (ports) {
+    case portPresets.dns:
+      return 'dns';
+    case portPresets.http:
+      return 'http';
+    case portPresets.https:
+      return 'https';
+    case portPresets.mysql:
+      return 'mysql';
+    case portPresets.ssh:
+      return 'ssh';
+    default:
+      return undefined;
+  }
+};
+
+export const allowsAllIPs = (addresses: FirewallRuleType['addresses']) =>
+  allowAllIPv4(addresses) && allowAllIPv6(addresses);
+
+export const allowAllIPv4 = (addresses: FirewallRuleType['addresses']) =>
+  addresses?.ipv4?.includes(allIPv4);
+
+export const allowAllIPv6 = (addresses: FirewallRuleType['addresses']) =>
+  addresses?.ipv6?.includes(allIPv6);
+
+export const allowNoneIPv4 = (addresses: FirewallRuleType['addresses']) =>
+  !addresses?.ipv4?.length;
+
+export const allowNoneIPv6 = (addresses: FirewallRuleType['addresses']) =>
+  !addresses?.ipv6?.length;
+
+export const generateRuleLabel = (ruleType?: FirewallPreset) =>
+  ruleType ? predefinedFirewalls[ruleType].label : 'Custom';
+
+export const generateAddressesLabel = (
+  addresses: FirewallRuleType['addresses']
+) => {
+  const strBuilder: string[] = [];
+
+  const allowedAllIPv4 = allowAllIPv4(addresses);
+  const allowedAllIPv6 = allowAllIPv6(addresses);
+
+  // First add the "All IPvX" strings so they always appear, even if the list
+  // ends up being truncated.
+  if (allowedAllIPv4) {
+    strBuilder.push('All IPv4');
+  }
+
+  if (allowedAllIPv6) {
+    strBuilder.push('All IPv6');
+  }
+
+  // Now we can look at the rest of the rules:
+  if (!allowedAllIPv4) {
+    addresses?.ipv4?.forEach((thisIP) => {
+      strBuilder.push(thisIP);
+    });
+  }
+
+  if (!allowedAllIPv6) {
+    addresses?.ipv6?.forEach((thisIP) => {
+      strBuilder.push(thisIP);
+    });
+  }
+
+  if (strBuilder.length > 0) {
+    return truncateAndJoinList(strBuilder, 3);
+  }
+
+  // If no IPs are allowed.
+  return 'None';
+};
+
+export type PrefixListReference = { inIPv4Rule: boolean; inIPv6Rule: boolean };
+export type PrefixListReferenceMap = Record<string, PrefixListReference>;
+
+const isPrefixList = (ip: string) => ip.startsWith('pl:');
+
+/**
+ * Builds a map of Prefix List (PL) labels to their firewall rule references.
+ *
+ * @param addresses - Object containing optional arrays of IPv4 and IPv6 addresses.
+ *                    Only addresses that are prefix lists (starting with 'pl:') are considered.
+ * @returns A map where each key is a PL label, and the value indicates whether
+ *          the PL is referenced in the IPv4 and/or IPv6 firewall rule.
+ *
+ * @example
+ * const map = buildPrefixListReferenceMap({
+ *   ipv4: ['pl:system:test1', '1.2.3.4'],
+ *   ipv6: ['pl:system:test1', '::1']
+ * });
+ *
+ * // Result:
+ * // {
+ * //   'pl:system:test1': { inIPv4Rule: true, inIPv6Rule: true }
+ * // }
+ */
+export const buildPrefixListReferenceMap = (addresses: {
+  ipv4?: string[];
+  ipv6?: string[];
+}): PrefixListReferenceMap => {
+  const { ipv4 = [], ipv6 = [] } = addresses;
+
+  const prefixListMap: PrefixListReferenceMap = {};
+
+  // Handle IPv4
+  ipv4.forEach((ip) => {
+    if (isPrefixList(ip)) {
+      if (!prefixListMap[ip]) {
+        prefixListMap[ip] = { inIPv4Rule: false, inIPv6Rule: false };
+      }
+      prefixListMap[ip].inIPv4Rule = true;
+    }
+  });
+
+  // Handle IPv6
+  ipv6.forEach((ip) => {
+    if (isPrefixList(ip)) {
+      if (!prefixListMap[ip]) {
+        prefixListMap[ip] = { inIPv4Rule: false, inIPv6Rule: false };
+      }
+      prefixListMap[ip].inIPv6Rule = true;
+    }
+  });
+
+  return prefixListMap;
+};
+
+/**
+ * Represents the Firewall Rule IP families to which a Prefix List (PL) is attached or referenced.
+ *
+ * Used for display and logic purposes, e.g., appending to a PL label in the UI as:
+ * "pl:system:example (IPv4)", "pl:system:example (IPv6)", or "pl:system:example (IPv4, IPv6)".
+ *
+ * The value indicates which firewall IPs the PL applies to:
+ * - "(IPv4)" -> PL is attached to Firewall Rule IPv4 only
+ * - "(IPv6)" -> PL is attached to Firewall Rule IPv6 only
+ * - "(IPv4, IPv6)" -> PL is attached to both Firewall Rule IPv4 and IPv6
+ */
+export type FirewallRulePrefixListReferenceTag =
+  | '(IPv4)'
+  | '(IPv4, IPv6)'
+  | '(IPv6)';
+
+interface GenerateAddressesLabelV2Options {
+  /**
+   * The list of addresses associated with a firewall rule.
+   */
+  addresses: FirewallRuleType['addresses'];
+  /**
+   * Optional callback invoked when a prefix list label is clicked.
+   *
+   * @param prefixListLabel - The label of the clicked prefix list (e.g., "pl:system:test")
+   * @param plRuleRefTag - Indicates which firewall rule IP family(s) this PL belongs to: `(IPv4)`, `(IPv6)`, or `(IPv4, IPv6)`
+   */
+  onPrefixListClick?: (
+    prefixListLabel: string,
+    plRuleRefTag: FirewallRulePrefixListReferenceTag
+  ) => void;
+  /**
+   * Whether to show the truncation "+N" chip with a scrollable tooltip
+   * when there are more addresses than `truncateAt`.
+   * @default true
+   */
+  showTruncateChip?: boolean;
+  /**
+   * Maximum number of addresses to show before truncation.
+   * Ignored if `showTruncateChip` is false.
+   * @default 1
+   */
+  truncateAt?: number;
+}
+
+/**
+ * Generates IP addresses and clickable prefix lists (PLs) if available.
+ * Can render either a full list of elements or a truncated list with a "+N" chip and a full list tooltip.
+ *
+ * - Detects prefix lists (`pl::` or `pl:system:`) and renders them as clickable links.
+ * - Labels PLs across IPv4/IPv6 with rules reference suffixes:
+ *     - Example PL: `pl:system:test`
+ *     - Reference suffix: `(IPv4, IPv6)`, `(IPv4)`, or `(IPv6)`
+ *     - Result: `pl:system:test (IPv4, IPv6)` or `pl:system:test (IPv4)` or `pl:system:test (IPv6)`
+ * - Supports optional truncation with a "+N" chip and a full list tooltip.
+ * - Reusable across components with configurable behavior.
+ *
+ * @param options - Configuration object including addresses, click handler, and truncation options.
+ * @returns React elements representing addresses and clickable PLs, or `'None'` if empty.
+ */
+export const generateAddressesLabelV2 = (
+  options: GenerateAddressesLabelV2Options
+) => {
+  const {
+    addresses,
+    onPrefixListClick,
+    showTruncateChip = true,
+    truncateAt = 1,
+  } = options;
+  const elements: React.ReactNode[] = [];
+
+  const allowedAllIPv4 = allowAllIPv4(addresses);
+  const allowedAllIPv6 = allowAllIPv6(addresses);
+
+  // First add "All IPvX" items
+  if (allowedAllIPv4 && allowedAllIPv6) {
+    elements.push('All IPv4, All IPv6');
+  } else if (allowedAllIPv4) {
+    elements.push('All IPv4');
+  } else if (allowedAllIPv6) {
+    elements.push('All IPv6');
+  }
+
+  // Build a map of prefix lists.
+  // NOTE: If "allowedAllIPv4" or "allowedAllIPv6" is true, we skip those IPs entirely
+  // because "All IPvX" is already represented, and there are no specific addresses to map.
+  const ipv4ForPLMapping = allowedAllIPv4 ? [] : (addresses?.ipv4 ?? []);
+  const ipv6ForPLMapping = allowedAllIPv6 ? [] : (addresses?.ipv6 ?? []);
+
+  const prefixListReferenceMap = buildPrefixListReferenceMap({
+    ipv4: ipv4ForPLMapping,
+    ipv6: ipv6ForPLMapping,
+  });
+
+  // Add prefix list links with merged labels (eg., "pl:system:test (IPv4, IPv6)")
+  Object.entries(prefixListReferenceMap).forEach(([pl, reference]) => {
+    let plRuleRefTag = '' as FirewallRulePrefixListReferenceTag;
+    if (reference.inIPv4Rule && reference.inIPv6Rule) {
+      plRuleRefTag = '(IPv4, IPv6)';
+    } else if (reference.inIPv4Rule) {
+      plRuleRefTag = '(IPv4)';
+    } else if (reference.inIPv6Rule) {
+      plRuleRefTag = '(IPv6)';
+    }
+
+    elements.push(
+      <Link
+        key={pl}
+        onClick={(e) => {
+          e.preventDefault();
+          onPrefixListClick?.(pl, plRuleRefTag);
+        }}
+      >
+        {`${pl} ${plRuleRefTag}`}
+      </Link>
+    );
+  });
+
+  // Add remaining IPv4 addresses that are not prefix lists
+  if (!allowedAllIPv4) {
+    addresses?.ipv4?.forEach((ip) => {
+      if (!isPrefixList(ip)) {
+        elements.push(<span key={ip}>{ip}</span>);
+      }
+    });
+  }
+
+  // Add remaining IPv6 addresses that are not prefix lists
+  if (!allowedAllIPv6) {
+    addresses?.ipv6?.forEach((ip) => {
+      if (!isPrefixList(ip)) {
+        elements.push(<span key={ip}>{ip}</span>);
+      }
+    });
+  }
+
+  // If no IPs are allowed
+  if (elements.length === 0) return 'None';
+
+  //  Truncation / Chip logic
+  const truncated = showTruncateChip ? elements.slice(0, truncateAt) : elements;
+  const hidden = elements.length - truncateAt;
+  const hasMore = showTruncateChip && elements.length > truncateAt;
+
+  const fullTooltip = (
+    <Box
+      sx={(theme) => ({
+        maxHeight: '40vh',
+        overflowY: 'auto',
+        // Extra space on the right to prevent scrollbar from overlapping content
+        paddingRight: theme.spacingFunction(8),
+      })}
+    >
+      <ul
+        style={{
+          display: 'flex',
+          flexDirection: 'column',
+          gap: 4,
+          paddingLeft: 20,
+          margin: 0,
+        }}
+      >
+        {elements.map((el, i) => (
+          <li key={i} style={{ listStyleType: 'disc' }}>
+            {el}
+          </li>
+        ))}
+      </ul>
+    </Box>
+  );
+
+  return (
+    <>
+      <Box
+        component="span"
+        sx={(theme) => ({
+          // Only add gap if Chip is visible
+          marginRight: hasMore ? theme.spacingFunction(8) : 0,
+        })}
+      >
+        {truncated.map((el, idx) => (
+          <React.Fragment key={idx}>
+            {el}
+            {idx < truncated.length - 1 && ', '}
+          </React.Fragment>
+        ))}
+      </Box>
+      {hasMore && (
+        <Tooltip
+          arrow
+          placement="bottom"
+          slotProps={{
+            tooltip: {
+              sx: (theme) => ({
+                minWidth: '248px',
+                padding: `${theme.spacingFunction(16)} !important`,
+              }),
+            },
+          }}
+          title={fullTooltip}
+        >
+          <Chip
+            label={`+${hidden}`}
+            sx={(theme) => ({
+              cursor: 'pointer',
+              borderRadius: '12px',
+              minWidth: '33px',
+              borderColor: theme.tokens.component.Tag.Default.Border,
+              '&:hover': {
+                borderColor: theme.tokens.alias.Content.Icon.Primary.Hover,
+              },
+              '& .MuiChip-label': {
+                // eslint-disable-next-line @linode/cloud-manager/no-custom-fontWeight
+                fontWeight: theme.tokens.font.FontWeight.Semibold,
+              },
+            })}
+            variant="outlined"
+          />
+        </Tooltip>
+      )}
+    </>
+  );
+};
+
+export const getFirewallDescription = (firewall: Firewall) => {
+  const description = [
+    `Status: ${capitalize(firewall.status)}`,
+    `Services Assigned: ${firewall.entities.length}`,
+  ];
+  return description.join(', ');
+};
+
+/**
+ * Returns whether or not features related to the Firewall Rulesets & Prefix Lists project
+ * should be enabled, and whether they are in beta, LA, or GA.
+ *
+ * Note: Currently, this just uses the `fwRulesetsPrefixlists` feature flag as a source of truth,
+ * but will eventually also look at account capabilities if available.
+ */
+export const useIsFirewallRulesetsPrefixlistsEnabled = () => {
+  const flags = useFlags();
+
+  // @TODO: Firewall Rulesets & Prefix Lists - check for customer tag/account capability when it exists
+  return {
+    isFirewallRulesetsPrefixlistsFeatureEnabled:
+      flags.fwRulesetsPrefixLists?.enabled ?? false,
+    isFirewallRulesetsPrefixListsBetaEnabled:
+      flags.fwRulesetsPrefixLists?.beta ?? false,
+    isFirewallRulesetsPrefixListsLAEnabled:
+      flags.fwRulesetsPrefixLists?.la ?? false,
+    isFirewallRulesetsPrefixListsGAEnabled:
+      flags.fwRulesetsPrefixLists?.ga ?? false,
+  };
+};
diff --git a/packages/manager/src/mocks/serverHandlers.ts b/packages/manager/src/mocks/serverHandlers.ts
index 461ba32685f..4d1b36dae66 100644
--- a/packages/manager/src/mocks/serverHandlers.ts
+++ b/packages/manager/src/mocks/serverHandlers.ts
@@ -1338,7 +1338,27 @@ export const handlers = [
     return HttpResponse.json(makeResourcePage(devices));
   }),
   http.get('*/v4beta/networking/firewalls/rulesets', () => {
-    const rulesets = firewallRuleSetFactory.buildList(10);
+    const rulesetWithPrefixLists = firewallRuleSetFactory.build({
+      rules: firewallRuleFactory.buildList(1, {
+        addresses: {
+          ipv4: [
+            'pl:system:resolvers:test',
+            'pl:system:test',
+            '192.168.1.200',
+            '192.168.1.201',
+          ],
+          ipv6: [
+            '2001:db8:85a3::8a2e:371:7335/128',
+            'pl:system:test',
+            'pl::vpcs:test',
+          ],
+        },
+      }),
+    });
+    const rulesets = [
+      rulesetWithPrefixLists,
+      ...firewallRuleSetFactory.buildList(9),
+    ];
     return HttpResponse.json(makeResourcePage(rulesets));
   }),
   http.get('*/v4beta/networking/prefixlists', () => {
@@ -1356,7 +1376,7 @@ export const handlers = [
               id: 123,
             });
           case 123456789:
-            // Ruleset with larger ID 123456789, Longer label with 32 chars, and
+            // Ruleset with larger ID 123456789, Longer label with 32 chars, PrefixLists, and
             // Marked for deletion status
             return firewallRuleSetFactory.build({
               id: 123456789,
@@ -1364,6 +1384,21 @@ export const handlers = [
               deleted: '2025-11-18T18:51:11',
               description:
                 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a fermentum quam. Mauris posuere dapibus aliquet. Ut id dictum magna, vitae congue turpis. Curabitur sollicitudin odio vel lacus vehicula maximus.',
+              rules: firewallRuleFactory.buildList(1, {
+                addresses: {
+                  ipv4: [
+                    'pl:system:resolvers:test',
+                    'pl:system:test',
+                    '192.168.1.200',
+                    '192.168.1.201',
+                  ],
+                  ipv6: [
+                    '2001:db8:85a3::8a2e:371:7335/128',
+                    'pl:system:test',
+                    'pl::vpcs:test',
+                  ],
+                },
+              }),
             });
           default:
             return firewallRuleSetFactory.build();
@@ -1385,10 +1420,25 @@ export const handlers = [
                 firewallRuleFactory.build({ ruleset: 123456789 }), // Referenced Ruleset to the Firewall (ID 123456789)
                 ...firewallRuleFactory.buildList(1, {
                   addresses: {
-                    ipv4: ['192.168.1.213', '172.31.255.255'],
+                    ipv4: [
+                      'pl:system:test-1',
+                      'pl::vpcs:test-1',
+                      '192.168.1.213',
+                      '192.168.1.214',
+                      '192.168.1.215',
+                      '192.168.1.216',
+                      'pl::vpcs:test-2',
+                      '172.31.255.255',
+                    ],
                     ipv6: [
+                      'pl:system:test-1',
+                      'pl::vpcs:test-3',
                       '2001:db8:85a3::8a2e:370:7334/128',
                       '2001:db8:85a3::8a2e:371:7335/128',
+                      'pl::vpcs:test-3',
+                      'pl::vpcs:test-4',
+                      'pl::vpcs:test-5',
+                      '2001:db8:85a3::8a2e:372:7336/128',
                     ],
                   },
                   ports: '22, 53, 80, 100, 443, 3306',
diff --git a/packages/manager/src/utilities/createMaskedText.ts b/packages/manager/src/utilities/createMaskedText.ts
index be074b6bdf9..64b7b205585 100644
--- a/packages/manager/src/utilities/createMaskedText.ts
+++ b/packages/manager/src/utilities/createMaskedText.ts
@@ -9,15 +9,20 @@ export const MASKABLE_TEXT_LENGTH_MAP: Map<MaskableTextLength, number> =
   ]);
 
 export const createMaskedText = (
-  plainText: string,
+  plainText: React.ReactNode | string,
   length?: MaskableTextLength | number
 ) => {
+  const textLength =
+    typeof plainText === 'string'
+      ? plainText.length
+      : DEFAULT_MASKED_TEXT_LENGTH; // JSX fallback
+
   // Mask a default of 12 dots, unless the prop specifies a different default or the plaintext length.
   const MASKED_TEXT_LENGTH = !length
     ? DEFAULT_MASKED_TEXT_LENGTH
     : typeof length === 'number'
       ? length
-      : (MASKABLE_TEXT_LENGTH_MAP.get(length) ?? plainText.length);
+      : (MASKABLE_TEXT_LENGTH_MAP.get(length) ?? textLength);
 
   return '•'.repeat(MASKED_TEXT_LENGTH);
 };

From 55d3ff47067670541c55881d012379804619f5cf Mon Sep 17 00:00:00 2001
From: santoshp210-akamai
 <159890961+santoshp210-akamai@users.noreply.github.com>
Date: Wed, 26 Nov 2025 19:42:41 +0530
Subject: [PATCH 46/91] upcoming: [DI-28227] - Firewall Alerts enhancements
 (#13110)

* upcoming: [DI-28227] - Firewall Alerts enhancements

* add changeset

* upcoming: [DI-28227] - Use constant for the tooltip string

---------

Co-authored-by: Ankita <ankitaan@akamai.com>
---
 ...r-13110-upcoming-features-1763617588411.md |  5 ++
 .../EntityTypeSelect.test.tsx                 | 22 +++++
 .../GeneralInformation/EntityTypeSelect.tsx   |  7 +-
 .../EditAlert/EditAlertDefinition.test.tsx    | 80 +++++++++++++++++--
 .../Alerts/EditAlert/EditAlertResources.tsx   | 10 +++
 .../features/CloudPulse/Alerts/constants.ts   |  3 +
 packages/manager/src/mocks/serverHandlers.ts  | 54 +++++++++++++
 7 files changed, 172 insertions(+), 9 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13110-upcoming-features-1763617588411.md

diff --git a/packages/manager/.changeset/pr-13110-upcoming-features-1763617588411.md b/packages/manager/.changeset/pr-13110-upcoming-features-1763617588411.md
new file mode 100644
index 00000000000..17bae8d23d4
--- /dev/null
+++ b/packages/manager/.changeset/pr-13110-upcoming-features-1763617588411.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+ACLP-Alerting: Filtering entities for firewall system alerts, add tooltip text to Entity Type component ([#13110](https://github.com/linode/manager/pull/13110))
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/GeneralInformation/EntityTypeSelect.test.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/GeneralInformation/EntityTypeSelect.test.tsx
index 952574122dd..4a4065dceff 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/GeneralInformation/EntityTypeSelect.test.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/GeneralInformation/EntityTypeSelect.test.tsx
@@ -4,6 +4,7 @@ import * as React from 'react';
 
 import { renderWithThemeAndHookFormContext } from 'src/utilities/testHelpers';
 
+import { entityTypeTooltipText } from '../../constants';
 import { EntityTypeSelect } from './EntityTypeSelect';
 
 describe('EntityTypeSelect component tests', () => {
@@ -129,4 +130,25 @@ describe('EntityTypeSelect component tests', () => {
       within(entityTypeDropdown).queryByRole('button', { name: 'Clear' })
     ).not.toBeInTheDocument();
   });
+
+  it('should display tooltip text on hover of the help icon', async () => {
+    renderWithThemeAndHookFormContext({
+      component: (
+        <EntityTypeSelect
+          name="entity_type"
+          onEntityTypeChange={onEntityChange}
+        />
+      ),
+    });
+
+    const entityTypeContainer = screen.getByTestId(ENTITY_TYPE_SELECT_TEST_ID);
+    const helpButton =
+      within(entityTypeContainer).getByTestId('tooltip-info-icon');
+
+    await userEvent.hover(helpButton);
+
+    expect(await screen.findByText(entityTypeTooltipText)).toBeVisible();
+
+    await userEvent.unhover(helpButton);
+  });
 });
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/GeneralInformation/EntityTypeSelect.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/GeneralInformation/EntityTypeSelect.tsx
index b5f00f52aed..1ecef33f6b9 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/GeneralInformation/EntityTypeSelect.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/GeneralInformation/EntityTypeSelect.tsx
@@ -3,7 +3,8 @@ import * as React from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 import type { ControllerRenderProps, FieldPathByValue } from 'react-hook-form';
 
-import type { Item } from '../../constants';
+import { entityTypeTooltipText, type Item } from '../../constants';
+
 import type { CreateAlertDefinitionForm } from '../types';
 
 interface EntityTypeSelectProps {
@@ -55,6 +56,10 @@ export const EntityTypeSelect = (props: EntityTypeSelectProps) => {
           options={entityTypeOptions}
           placeholder="Select an Entity Type"
           sx={{ marginTop: '5px' }}
+          textFieldProps={{
+            labelTooltipText: entityTypeTooltipText,
+            tooltipPosition: 'right',
+          }}
           value={
             entityTypeOptions.find((option) => option.value === field.value) ??
             undefined
diff --git a/packages/manager/src/features/CloudPulse/Alerts/EditAlert/EditAlertDefinition.test.tsx b/packages/manager/src/features/CloudPulse/Alerts/EditAlert/EditAlertDefinition.test.tsx
index 05e19604265..a7f93ac3bb7 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/EditAlert/EditAlertDefinition.test.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/EditAlert/EditAlertDefinition.test.tsx
@@ -1,8 +1,13 @@
-import { waitFor } from '@testing-library/react';
+import { waitFor, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { alertFactory, notificationChannelFactory } from 'src/factories';
+import {
+  alertFactory,
+  firewallMetricRulesFactory,
+  firewallNodebalancerMetricCriteria,
+  notificationChannelFactory,
+} from 'src/factories';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { UPDATE_ALERT_SUCCESS_MESSAGE } from '../constants';
@@ -47,6 +52,9 @@ const alertDetails = alertFactory.build({
   service_type: 'linode',
   scope: 'entity',
 });
+
+const ENTITY_TYPE_SELECT_TEST_ID = 'entity-type-select';
+
 describe('EditAlertDefinition component', () => {
   it('renders the components of the form', { timeout: 20000 }, async () => {
     const { findByPlaceholderText, getByLabelText, getByText } =
@@ -96,13 +104,69 @@ describe('EditAlertDefinition component', () => {
 
     await waitFor(() => expect(mutateAsyncSpy).toHaveBeenCalledTimes(1));
 
-    expect(navigate).toHaveBeenLastCalledWith({
-      to: '/alerts/definitions',
+      expect(navigate).toHaveBeenLastCalledWith({
+        to: '/alerts/definitions',
+      });
+      await waitFor(() => {
+        expect(
+          getByText(UPDATE_ALERT_SUCCESS_MESSAGE) // validate whether snackbar is displayed properly
+        ).toBeInTheDocument();
+      });
     });
-    await waitFor(() => {
-      expect(
-        getByText(UPDATE_ALERT_SUCCESS_MESSAGE) // validate whether snackbar is displayed properly
-      ).toBeInTheDocument();
+
+  it('should render EntityTypeSelect for firewall with Linode entity type', () => {
+    const linodeFirewallAlertDetails = alertFactory.build({
+      id: 1,
+      rule_criteria: {
+        rules: [firewallMetricRulesFactory.build()],
+      },
+      scope: 'entity',
+      service_type: 'firewall',
+    });
+
+    const { getByTestId } = renderWithTheme(
+      <EditAlertDefinition
+        alertDetails={linodeFirewallAlertDetails}
+        serviceType="firewall"
+      />
+    );
+
+    const entityTypeSelect = getByTestId(ENTITY_TYPE_SELECT_TEST_ID);
+    expect(entityTypeSelect).toBeVisible();
+
+    const combobox = within(entityTypeSelect).getByRole('combobox');
+    expect(combobox).toHaveAttribute('value', 'Linodes');
+  });
+
+  it('should render EntityTypeSelect for firewall with NodeBalancer entity type', () => {
+    const nodebalancerFirewallAlertDetails = alertFactory.build({
+      id: 2,
+      rule_criteria: {
+        rules: [firewallNodebalancerMetricCriteria.build()],
+      },
+      scope: 'entity',
+      service_type: 'firewall',
     });
+
+    const { getByTestId } = renderWithTheme(
+      <EditAlertDefinition
+        alertDetails={nodebalancerFirewallAlertDetails}
+        serviceType="firewall"
+      />
+    );
+
+    const entityTypeSelect = getByTestId(ENTITY_TYPE_SELECT_TEST_ID);
+    expect(entityTypeSelect).toBeVisible();
+
+    const combobox = within(entityTypeSelect).getByRole('combobox');
+    expect(combobox).toHaveAttribute('value', 'NodeBalancers');
+  });
+
+  it('should not render EntityTypeSelect for non-firewall service types', () => {
+    const { queryByTestId } = renderWithTheme(
+      <EditAlertDefinition alertDetails={alertDetails} serviceType="linode" />
+    );
+
+    expect(queryByTestId(ENTITY_TYPE_SELECT_TEST_ID)).not.toBeInTheDocument();
   });
 });
diff --git a/packages/manager/src/features/CloudPulse/Alerts/EditAlert/EditAlertResources.tsx b/packages/manager/src/features/CloudPulse/Alerts/EditAlert/EditAlertResources.tsx
index fb24c4b98c3..8672f9a92f9 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/EditAlert/EditAlertResources.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/EditAlert/EditAlertResources.tsx
@@ -8,6 +8,7 @@ import { Breadcrumb } from 'src/components/Breadcrumb/Breadcrumb';
 import { useEditAlertDefinition } from 'src/queries/cloudpulse/alerts';
 
 import { AlertResources } from '../AlertsResources/AlertsResources';
+import { entityLabelMap } from '../constants';
 import { isResourcesEqual } from '../Utils/AlertResourceUtils';
 import { getAlertBoxStyles } from '../Utils/utils';
 import { EditAlertResourcesConfirmDialog } from './EditAlertResourcesConfirmationDialog';
@@ -85,6 +86,14 @@ export const EditAlertResources = (props: EditAlertProps) => {
     type,
   } = alertDetails;
 
+  const entityType =
+    serviceType === 'firewall'
+      ? alertDetails.rule_criteria.rules[0]?.label.includes(
+          entityLabelMap['nodebalancer']
+        )
+        ? 'nodebalancer'
+        : 'linode'
+      : undefined;
   return (
     <>
       <Breadcrumb crumbOverrides={overrides} pathname={newPathname} />
@@ -100,6 +109,7 @@ export const EditAlertResources = (props: EditAlertProps) => {
           alertLabel={label}
           alertResourceIds={entity_ids}
           alertType={type}
+          entityType={entityType}
           handleResourcesSelection={handleResourcesSelection}
           isSelectionsNeeded
           serviceType={service_type}
diff --git a/packages/manager/src/features/CloudPulse/Alerts/constants.ts b/packages/manager/src/features/CloudPulse/Alerts/constants.ts
index 5414c10e684..51becf87d3c 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/constants.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/constants.ts
@@ -291,3 +291,6 @@ export const entityLabelMap = {
   linode: 'Linode',
   nodebalancer: 'Node Balancer',
 };
+
+export const entityTypeTooltipText =
+  'Select a firewall entity type to filter the list in the Entities section. The metrics and dimensions in the Criteria section will update automatically based on your selection.';
diff --git a/packages/manager/src/mocks/serverHandlers.ts b/packages/manager/src/mocks/serverHandlers.ts
index 4d1b36dae66..6e185699fc8 100644
--- a/packages/manager/src/mocks/serverHandlers.ts
+++ b/packages/manager/src/mocks/serverHandlers.ts
@@ -3273,6 +3273,28 @@ export const handlers = [
           rules: [firewallNodebalancerMetricCriteria.build()],
         },
       }),
+      alertFactory.build({
+        id: 340,
+        label: 'Firewall-nodebalancer-system',
+        type: 'system',
+        service_type: 'firewall',
+        entity_ids: ['25'],
+        rule_criteria: {
+          rules: [
+            firewallNodebalancerMetricCriteria.build({ dimension_filters: [] }),
+          ],
+        },
+      }),
+      alertFactory.build({
+        id: 123,
+        label: 'Firewall-linode-system',
+        type: 'system',
+        service_type: 'firewall',
+        entity_ids: ['1', '4'],
+        rule_criteria: {
+          rules: [firewallMetricRulesFactory.build()],
+        },
+      }),
       ...alertFactory.buildList(3, { status: 'enabling', type: 'user' }),
       ...alertFactory.buildList(3, { status: 'disabling', type: 'user' }),
       ...alertFactory.buildList(3, { status: 'provisioning', type: 'user' }),
@@ -3344,6 +3366,38 @@ export const handlers = [
           })
         );
       }
+      if (params.id === '340' && params.serviceType === 'firewall') {
+        return HttpResponse.json(
+          alertFactory.build({
+            id: 340,
+            label: 'Firewall - nodebalancer - system',
+            type: 'system',
+            service_type: 'firewall',
+            entity_ids: ['25'],
+            rule_criteria: {
+              rules: [
+                firewallNodebalancerMetricCriteria.build({
+                  dimension_filters: [],
+                }),
+              ],
+            },
+          })
+        );
+      }
+      if (params.id === '123' && params.serviceType === 'firewall') {
+        return HttpResponse.json(
+          alertFactory.build({
+            id: 123,
+            label: 'Firewall-linode-system',
+            type: 'system',
+            service_type: 'firewall',
+            entity_ids: ['1', '4'],
+            rule_criteria: {
+              rules: [firewallMetricRulesFactory.build()],
+            },
+          })
+        );
+      }
       if (params.id !== undefined) {
         return HttpResponse.json(
           alertFactory.build({

From b64386095fa18a866f54e8bead109105af13851c Mon Sep 17 00:00:00 2001
From: Dmytro Chyrva <dchyrva@akamai.com>
Date: Wed, 26 Nov 2025 16:01:19 +0100
Subject: [PATCH 47/91] fix: [STORIF-173] - Volume card disappearing bug fixed
 (#13128)

---
 packages/manager/src/routes/volumes/index.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/manager/src/routes/volumes/index.ts b/packages/manager/src/routes/volumes/index.ts
index 5de98e4c584..817b819e9d8 100644
--- a/packages/manager/src/routes/volumes/index.ts
+++ b/packages/manager/src/routes/volumes/index.ts
@@ -59,6 +59,7 @@ const volumeDetailsMetricsRoute = createRoute({
     'src/features/Volumes/VolumeDetails/VolumeMetrics/volumeMetricsLazyRoute'
   ).then((m) => m.volumeMetricsLazyRoute)
 );
+
 const volumeDetailsSummaryActionRoute = createRoute({
   path: 'summary/$action',
   getParentRoute: () => volumeDetailsRoute,
@@ -81,7 +82,11 @@ const volumeDetailsSummaryActionRoute = createRoute({
     }),
   },
   validateSearch: (search: VolumesSearchParams) => search,
-});
+}).lazy(() =>
+  import(
+    'src/features/Volumes/VolumeDetails/VolumeSummary/volumeSummaryLazyRoute'
+  ).then((m) => m.volumeSummaryLazyRoute)
+);
 
 const volumesIndexRoute = createRoute({
   getParentRoute: () => volumesRoute,

From b5dcacdf5a5beb97b5d0983cbdcd78b6500319a8 Mon Sep 17 00:00:00 2001
From: smans-akamai <smans@akamai.com>
Date: Wed, 26 Nov 2025 10:23:20 -0500
Subject: [PATCH 48/91] upcoming: [UIE-9383] - DBaaS - Add feature flag support
 for PgBouncer (#13134)

* upcoming: [UIE-9383] - DBaaS - Add feature flag support for PgBouncer

* Adding changeset for PgBouncer feature flag change
---
 .../.changeset/pr-13134-upcoming-features-1764110309888.md   | 5 +++++
 packages/manager/src/dev-tools/FeatureFlagTool.tsx           | 1 +
 packages/manager/src/featureFlags.ts                         | 1 +
 3 files changed, 7 insertions(+)
 create mode 100644 packages/manager/.changeset/pr-13134-upcoming-features-1764110309888.md

diff --git a/packages/manager/.changeset/pr-13134-upcoming-features-1764110309888.md b/packages/manager/.changeset/pr-13134-upcoming-features-1764110309888.md
new file mode 100644
index 00000000000..7f7b3ff0afc
--- /dev/null
+++ b/packages/manager/.changeset/pr-13134-upcoming-features-1764110309888.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Add feature flag support for PgBouncer in DBaaS ([#13134](https://github.com/linode/manager/pull/13134))
diff --git a/packages/manager/src/dev-tools/FeatureFlagTool.tsx b/packages/manager/src/dev-tools/FeatureFlagTool.tsx
index ce9d38cc1ed..ec87b33c2d8 100644
--- a/packages/manager/src/dev-tools/FeatureFlagTool.tsx
+++ b/packages/manager/src/dev-tools/FeatureFlagTool.tsx
@@ -50,6 +50,7 @@ const options: { flag: keyof Flags; label: string }[] = [
   { flag: 'supportTicketSeverity', label: 'Support Ticket Severity' },
   { flag: 'dbaasV2', label: 'Databases V2 Beta' },
   { flag: 'dbaasV2MonitorMetrics', label: 'Databases V2 Monitor' },
+  { flag: 'databasePgBouncer', label: 'Database PgBouncer' },
   { flag: 'databaseResize', label: 'Database Resize' },
   { flag: 'databaseAdvancedConfig', label: 'Database Advanced Config' },
   { flag: 'databaseVpc', label: 'Database VPC' },
diff --git a/packages/manager/src/featureFlags.ts b/packages/manager/src/featureFlags.ts
index f1b74bdf9e0..ba3b8b61dd6 100644
--- a/packages/manager/src/featureFlags.ts
+++ b/packages/manager/src/featureFlags.ts
@@ -196,6 +196,7 @@ export interface Flags {
   cloudNat: CloudNatFlag;
   databaseAdvancedConfig: boolean;
   databaseBeta: boolean;
+  databasePgBouncer: boolean;
   databasePremium: boolean;
   databaseResize: boolean;
   databaseRestrictPlanResize: boolean;

From 2f0bee08bb7d9fbdee8709de72d92bfd0da29528 Mon Sep 17 00:00:00 2001
From: santoshp210-akamai
 <159890961+santoshp210-akamai@users.noreply.github.com>
Date: Thu, 27 Nov 2025 12:47:25 +0530
Subject: [PATCH 49/91] upcoming: [DI-28427] - Add and consume beta property to
 aclpAlerting flag (#13137)

* upcoming: [DI-28427] - Add and consume beta property to aclpAlerting flag

* add changeset
---
 .../.changeset/pr-13137-upcoming-features-1764156818321.md   | 5 +++++
 .../manager/src/components/PrimaryNav/PrimaryNav.test.tsx    | 3 +++
 packages/manager/src/components/PrimaryNav/PrimaryNav.tsx    | 2 +-
 packages/manager/src/factories/featureFlags.ts               | 1 +
 packages/manager/src/featureFlags.ts                         | 1 +
 .../CloudPulse/Alerts/AlertsListing/AlertTableRow.test.tsx   | 1 +
 6 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 packages/manager/.changeset/pr-13137-upcoming-features-1764156818321.md

diff --git a/packages/manager/.changeset/pr-13137-upcoming-features-1764156818321.md b/packages/manager/.changeset/pr-13137-upcoming-features-1764156818321.md
new file mode 100644
index 00000000000..b21f0da7b01
--- /dev/null
+++ b/packages/manager/.changeset/pr-13137-upcoming-features-1764156818321.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+ACLP-Alerting: Update aclpAlerting flag to have beta marker control ([#13137](https://github.com/linode/manager/pull/13137))
diff --git a/packages/manager/src/components/PrimaryNav/PrimaryNav.test.tsx b/packages/manager/src/components/PrimaryNav/PrimaryNav.test.tsx
index 835b35727eb..774bcdc49c1 100644
--- a/packages/manager/src/components/PrimaryNav/PrimaryNav.test.tsx
+++ b/packages/manager/src/components/PrimaryNav/PrimaryNav.test.tsx
@@ -233,6 +233,7 @@ describe('PrimaryNav', () => {
         accountAlertLimit: 10,
         accountMetricLimit: 10,
         alertDefinitions: true,
+        beta: true,
         notificationChannels: false,
         recentActivity: false,
       },
@@ -274,6 +275,7 @@ describe('PrimaryNav', () => {
         accountAlertLimit: 10,
         accountMetricLimit: 10,
         alertDefinitions: true,
+        beta: false,
         notificationChannels: true,
         recentActivity: true,
       },
@@ -314,6 +316,7 @@ describe('PrimaryNav', () => {
         accountAlertLimit: 10,
         accountMetricLimit: 10,
         alertDefinitions: false,
+        beta: true,
         notificationChannels: false,
         recentActivity: false,
       },
diff --git a/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx b/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx
index f2b0ef1ab18..7e35cbfb6ab 100644
--- a/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx
+++ b/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx
@@ -246,7 +246,7 @@ export const PrimaryNav = (props: PrimaryNavProps) => {
                 display: 'Alerts',
                 hide: !isAlertsEnabled,
                 to: '/alerts',
-                isBeta: flags.aclp?.beta,
+                isBeta: flags.aclpAlerting?.beta,
               },
               {
                 display: 'Longview',
diff --git a/packages/manager/src/factories/featureFlags.ts b/packages/manager/src/factories/featureFlags.ts
index 9ff40bea222..d3a66e9c6ff 100644
--- a/packages/manager/src/factories/featureFlags.ts
+++ b/packages/manager/src/factories/featureFlags.ts
@@ -22,6 +22,7 @@ export const flagsFactory = Factory.Sync.makeFactory<Partial<Flags>>({
     accountAlertLimit: 10,
     accountMetricLimit: 10,
     alertDefinitions: true,
+    beta: true,
     recentActivity: false,
     notificationChannels: false,
     editDisabledStatuses: [
diff --git a/packages/manager/src/featureFlags.ts b/packages/manager/src/featureFlags.ts
index ba3b8b61dd6..0ab07445dee 100644
--- a/packages/manager/src/featureFlags.ts
+++ b/packages/manager/src/featureFlags.ts
@@ -149,6 +149,7 @@ interface AclpAlerting {
   accountAlertLimit: number;
   accountMetricLimit: number;
   alertDefinitions: boolean;
+  beta: boolean;
   editDisabledStatuses?: AlertStatusType[];
   notificationChannels: boolean;
   recentActivity: boolean;
diff --git a/packages/manager/src/features/CloudPulse/Alerts/AlertsListing/AlertTableRow.test.tsx b/packages/manager/src/features/CloudPulse/Alerts/AlertsListing/AlertTableRow.test.tsx
index a7a415aeeb2..fdc608e3f35 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/AlertsListing/AlertTableRow.test.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/AlertsListing/AlertTableRow.test.tsx
@@ -190,6 +190,7 @@ describe('Alert Row', () => {
             editDisabledStatuses: ['failed', 'in progress'],
             accountAlertLimit: 10,
             accountMetricLimit: 100,
+            beta: true,
             alertDefinitions: true,
             notificationChannels: false,
             recentActivity: false,

From 855eabec7f6b263009f1aef4c74f5a0664e0fd21 Mon Sep 17 00:00:00 2001
From: mpolotsk-akamai <157619599+mpolotsk-akamai@users.noreply.github.com>
Date: Fri, 28 Nov 2025 10:31:04 +0100
Subject: [PATCH 50/91] fix: [UIE-9671] - IAM: create Linode permission fix
 (#13118)

* fix: [UIE-9671] - IAM: create Linode permission fix

* fix: [UIE-9671] - test fix
---
 .../.changeset/pr-13118-fixed-1763722681223.md  |  5 +++++
 .../features/Linodes/LinodeCreate/Actions.tsx   |  6 +++++-
 .../StackScripts/StackScriptSelectionRow.tsx    | 17 +++++++++++++++--
 .../shared/LinodeSelectTable.test.tsx           |  1 +
 .../shared/LinodeSelectTableRow.test.tsx        |  3 +++
 .../shared/LinodeSelectTableRow.tsx             |  8 +++++++-
 6 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13118-fixed-1763722681223.md

diff --git a/packages/manager/.changeset/pr-13118-fixed-1763722681223.md b/packages/manager/.changeset/pr-13118-fixed-1763722681223.md
new file mode 100644
index 00000000000..491ee99f5d2
--- /dev/null
+++ b/packages/manager/.changeset/pr-13118-fixed-1763722681223.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+IAM: The StackScript/Linode selector is enabled in the Create Linode flow when the user doesn’t have the create_linode permission ([#13118](https://github.com/linode/manager/pull/13118))
diff --git a/packages/manager/src/features/Linodes/LinodeCreate/Actions.tsx b/packages/manager/src/features/Linodes/LinodeCreate/Actions.tsx
index 1852a581950..b7469edc159 100644
--- a/packages/manager/src/features/Linodes/LinodeCreate/Actions.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreate/Actions.tsx
@@ -83,7 +83,11 @@ export const Actions = ({ isAlertsBetaMode }: ActionProps) => {
 
   return (
     <Box sx={{ display: 'flex', gap: 1, justifyContent: 'flex-end' }}>
-      <Button buttonType="outlined" onClick={onOpenAPIAwareness}>
+      <Button
+        buttonType="outlined"
+        disabled={isDisabled}
+        onClick={onOpenAPIAwareness}
+      >
         View Code Snippets
       </Button>
       <Button
diff --git a/packages/manager/src/features/Linodes/LinodeCreate/Tabs/StackScripts/StackScriptSelectionRow.tsx b/packages/manager/src/features/Linodes/LinodeCreate/Tabs/StackScripts/StackScriptSelectionRow.tsx
index db44b371c2c..934fa5892f1 100644
--- a/packages/manager/src/features/Linodes/LinodeCreate/Tabs/StackScripts/StackScriptSelectionRow.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreate/Tabs/StackScripts/StackScriptSelectionRow.tsx
@@ -1,11 +1,13 @@
 /* eslint-disable jsx-a11y/label-has-associated-control */
 import { Radio, Stack, Typography } from '@linode/ui';
 import { truncate } from '@linode/utilities';
+import { useLocation } from '@tanstack/react-router';
 import React from 'react';
 
 import { InlineMenuAction } from 'src/components/InlineMenuAction/InlineMenuAction';
 import { TableCell } from 'src/components/TableCell';
 import { TableRow } from 'src/components/TableRow';
+import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
 import { isLKEStackScript } from 'src/features/StackScripts/stackScriptUtils';
 
 import type { StackScript } from '@linode/api-v4';
@@ -21,6 +23,13 @@ interface Props {
 export const StackScriptSelectionRow = (props: Props) => {
   const { disabled, isSelected, onOpenDetails, onSelect, stackscript } = props;
 
+  const location = useLocation();
+  const { data: permissions } = usePermissions('account', ['create_linode']);
+
+  const rowIsDisabled =
+    disabled ||
+    (!permissions?.create_linode &&
+      location.pathname.includes('/linodes/create'));
   // Never show LKE StackScripts. We try to hide these from the user even though they
   // are returned by the API.
   if (isLKEStackScript(stackscript)) {
@@ -32,7 +41,7 @@ export const StackScriptSelectionRow = (props: Props) => {
       <TableCell>
         <Radio
           checked={isSelected}
-          disabled={disabled}
+          disabled={rowIsDisabled}
           id={`stackscript-${stackscript.id}`}
           onChange={onSelect}
         />
@@ -61,7 +70,11 @@ export const StackScriptSelectionRow = (props: Props) => {
         </label>
       </TableCell>
       <TableCell actionCell>
-        <InlineMenuAction actionText="Show Details" onClick={onOpenDetails} />
+        <InlineMenuAction
+          actionText="Show Details"
+          disabled={rowIsDisabled}
+          onClick={onOpenDetails}
+        />
       </TableCell>
     </TableRow>
   );
diff --git a/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTable.test.tsx b/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTable.test.tsx
index 4cf73ca9ae3..26e53665750 100644
--- a/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTable.test.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTable.test.tsx
@@ -20,6 +20,7 @@ const queryMocks = vi.hoisted(() => ({
   userPermissions: vi.fn(() => ({
     data: {
       clone_linode: true,
+      create_linode: true,
     },
   })),
 }));
diff --git a/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTableRow.test.tsx b/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTableRow.test.tsx
index 271adf308ae..0d8231e3617 100644
--- a/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTableRow.test.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTableRow.test.tsx
@@ -17,6 +17,7 @@ const queryMocks = vi.hoisted(() => ({
     data: {
       shutdown_linode: false,
       clone_linode: false,
+      create_linode: false,
     },
   })),
 }));
@@ -71,6 +72,7 @@ describe('LinodeSelectTableRow', () => {
       data: {
         shutdown_linode: false,
         clone_linode: true,
+        create_linode: true,
       },
     });
     const linode = linodeFactory.build();
@@ -182,6 +184,7 @@ describe('LinodeSelectTableRow', () => {
       data: {
         shutdown_linode: true,
         clone_linode: true,
+        create_linode: true,
       },
     });
 
diff --git a/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTableRow.tsx b/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTableRow.tsx
index ae6b9a20440..dba275bec94 100644
--- a/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTableRow.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTableRow.tsx
@@ -33,6 +33,10 @@ export const LinodeSelectTableRow = (props: Props) => {
 
   const region = regions?.find((r) => r.id === linode.region);
 
+  const { data: accountPermissions } = usePermissions('account', [
+    'create_linode',
+  ]);
+
   const { data: permissions } = usePermissions(
     'linode',
     ['shutdown_linode', 'clone_linode'],
@@ -45,7 +49,9 @@ export const LinodeSelectTableRow = (props: Props) => {
         <FormControlLabel
           checked={selected}
           control={<Radio />}
-          disabled={!permissions.clone_linode}
+          disabled={
+            !permissions.clone_linode || !accountPermissions?.create_linode
+          }
           label={linode.label}
           onChange={onSelect}
           sx={{ gap: 2 }}

From fcb8b3cfcfaa8b3b4dbb5979f0f9d9b794406a21 Mon Sep 17 00:00:00 2001
From: venkatmano-akamai <vmangalr@akamai.com>
Date: Fri, 28 Nov 2025 17:21:17 +0530
Subject: [PATCH 51/91] fix: [DI-28200] - Fix for the volume contextual view
 dimension filter bug fix and group by default selection retention (#13139)

* upcoming: [DI-28222] - Dimension filter bug fix

* upcoming: [DI-28222] - NB contextual view

* upcoming: [DI-28200] - Group By issue fix

* upcoming: [DI-28200] - Contextual view setup

* upcoming: [DI-28200] - Changeset

* fix: [DI-28200] - Remove contextual view changes

* fix: [DI-28200] - Add info comments

* fix: [DI-28200] - code refactorings

* fix: [DI-28200] - code refactorings

* fix: [DI-28200] - pass current dashboard

* fix: [DI-28200] - UT for group by

* fix: [DI-28200] - UT for group by
---
 .../pr-13139-fixed-1764247173880.md           |  5 ++++
 .../CloudPulseDashboardWithFilters.test.tsx   | 26 ++++++++++++++++++-
 .../CloudPulseDashboardWithFilters.tsx        |  2 +-
 .../CloudPulse/Overview/GlobalFilters.tsx     |  6 ++++-
 .../CloudPulse/Widget/CloudPulseWidget.tsx    | 12 ++++++---
 5 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13139-fixed-1764247173880.md

diff --git a/packages/manager/.changeset/pr-13139-fixed-1764247173880.md b/packages/manager/.changeset/pr-13139-fixed-1764247173880.md
new file mode 100644
index 00000000000..fb971eb3f3e
--- /dev/null
+++ b/packages/manager/.changeset/pr-13139-fixed-1764247173880.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+CloudPulse metrics volumes contextual view `not showing dimension values` and CloudPulse metrics `group by default selection retention` ([#13139](https://github.com/linode/manager/pull/13139))
diff --git a/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardWithFilters.test.tsx b/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardWithFilters.test.tsx
index 4b199e9dfe7..238f49432d9 100644
--- a/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardWithFilters.test.tsx
+++ b/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardWithFilters.test.tsx
@@ -8,12 +8,20 @@ import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { CloudPulseDashboardWithFilters } from './CloudPulseDashboardWithFilters';
 
+import type { GroupByOption } from '../GroupBy/CloudPulseGroupByDrawer';
+
 const queryMocks = vi.hoisted(() => ({
   useCloudPulseDashboardsQuery: vi.fn().mockReturnValue({}),
+  useGlobalDimensions: vi.fn().mockReturnValue({}),
 }));
 
 const circleProgress = 'circle-progress';
 const mandatoryFiltersError = 'Select filters to visualize metrics.';
+const mockGroupByOptions: GroupByOption[] = [
+  { value: 'option1', label: 'Option 1' },
+  { value: 'option2', label: 'Option 2' },
+  { value: 'option3', label: 'Option 3' },
+];
 
 vi.mock('src/queries/cloudpulse/dashboards', async () => {
   const actual = await vi.importActual('src/queries/cloudpulse/dashboards');
@@ -22,6 +30,14 @@ vi.mock('src/queries/cloudpulse/dashboards', async () => {
     useCloudPulseDashboardsQuery: queryMocks.useCloudPulseDashboardsQuery,
   };
 });
+vi.mock('../GroupBy/utils', async () => {
+  const actual = await vi.importActual('../GroupBy/utils');
+
+  return {
+    ...actual,
+    useGlobalDimensions: queryMocks.useGlobalDimensions,
+  };
+});
 const mockDashboard = dashboardFactory.build();
 
 describe('CloudPulseDashboardWithFilters component tests', () => {
@@ -61,10 +77,19 @@ describe('CloudPulseDashboardWithFilters component tests', () => {
       isLoading: false,
     });
 
+    queryMocks.useGlobalDimensions.mockReturnValue({
+      isLoading: false,
+      options: mockGroupByOptions,
+      defaultValue: [],
+    });
+
     renderWithTheme(
       <CloudPulseDashboardWithFilters resource={1} serviceType="dbaas" />
     );
 
+    const groupByIcon = screen.getByTestId('group-by');
+    expect(groupByIcon).toBeEnabled();
+
     const startDate = screen.getByText('Start Date');
     const nodeTypeSelect = screen.getByTestId('node-type-select');
     expect(startDate).toBeInTheDocument();
@@ -217,7 +242,6 @@ describe('CloudPulseDashboardWithFilters component tests', () => {
 
     const startDate = screen.getByText('Start Date');
     expect(startDate).toBeInTheDocument();
-
     await userEvent.click(screen.getByPlaceholderText('Select a Dashboard'));
     await userEvent.click(screen.getByText('nodebalancer_firewall_dashbaord'));
     expect(
diff --git a/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardWithFilters.tsx b/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardWithFilters.tsx
index da2046e17cf..8d139630e7a 100644
--- a/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardWithFilters.tsx
+++ b/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardWithFilters.tsx
@@ -202,7 +202,7 @@ export const CloudPulseDashboardWithFilters = React.memo(
                   />
                   <GlobalFilterGroupByRenderer
                     handleChange={handleGroupByChange}
-                    selectedDashboard={dashboard}
+                    selectedDashboard={currentDashboard}
                   />
                 </Box>
               </Box>
diff --git a/packages/manager/src/features/CloudPulse/Overview/GlobalFilters.tsx b/packages/manager/src/features/CloudPulse/Overview/GlobalFilters.tsx
index 5f7dcbf7488..fdbd89ecf4f 100644
--- a/packages/manager/src/features/CloudPulse/Overview/GlobalFilters.tsx
+++ b/packages/manager/src/features/CloudPulse/Overview/GlobalFilters.tsx
@@ -165,7 +165,11 @@ export const GlobalFilters = React.memo((props: GlobalFilterProperties) => {
               handleChange={onGroupByChange}
               preferenceGroupBy={preferences?.[GROUP_BY]}
               savePreferences
-              selectedDashboard={selectedDashboard}
+              selectedDashboard={
+                preferences?.[DASHBOARD_ID] === selectedDashboard?.id // wait for dashboard id in preference to match selected dashboard id
+                  ? selectedDashboard
+                  : undefined
+              }
             />
           </Box>
         </Box>
diff --git a/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidget.tsx b/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidget.tsx
index bba0b004af4..2220f3d45e4 100644
--- a/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidget.tsx
+++ b/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidget.tsx
@@ -209,7 +209,9 @@ export const CloudPulseWidget = (props: CloudPulseWidgetProperties) => {
     dimensionLabel: 'linode_id',
     type: 'metrics',
     entities: entityIds,
-    regions: regions?.filter((region) => region.id === linodeRegion) ?? [],
+    regions: linodeRegion // if linode region is selected, filter regions to only that region else pass all regions
+      ? (regions?.filter(({ id }) => id === linodeRegion) ?? [])
+      : regions,
     scope: 'entity',
     serviceType,
     associatedEntityType: FILTER_CONFIG.get(dashboardId)?.associatedEntityType,
@@ -218,7 +220,9 @@ export const CloudPulseWidget = (props: CloudPulseWidgetProperties) => {
     dimensionLabel: 'vpc_subnet_id',
     type: 'metrics',
     entities: entityIds,
-    regions: regions?.filter((region) => region.id === linodeRegion) ?? [],
+    regions: linodeRegion // if linode region is selected, filter regions to only that region else pass all regions
+      ? (regions?.filter(({ id }) => id === linodeRegion) ?? [])
+      : regions,
     scope: 'entity',
     serviceType,
     associatedEntityType: FILTER_CONFIG.get(dashboardId)?.associatedEntityType,
@@ -226,7 +230,9 @@ export const CloudPulseWidget = (props: CloudPulseWidgetProperties) => {
   const linodeFromVolumes = useBlockStorageFetchOptions({
     entities: entityIds,
     dimensionLabel: 'linode_id',
-    regions: regions?.filter(({ id }) => id === region) ?? [],
+    regions: region // if region is selected, filter regions to only that region else pass all regions
+      ? (regions?.filter(({ id }) => id === region) ?? [])
+      : regions,
     type: 'metrics',
     scope: 'entity',
     serviceType,

From 47f0958d196e31f73bc6b842aa330c4c62706130 Mon Sep 17 00:00:00 2001
From: Alban Bailly <130582365+abailly-akamai@users.noreply.github.com>
Date: Fri, 28 Nov 2025 14:13:12 +0100
Subject: [PATCH 52/91] feat: [feature-branch/UIE 9568] - Support &
 Implementation of the new entities by permission endpoint (#13086)

* UIE-9570

* UIE-9570 cleanup

* UIE-9570 cleanup

* UIE-9570 username from profile

* UIE-9571 - Replace useQueryWithPermissions in CustomFirewallFields

* UIE-9572

* Cloud version 1.155.0, API v4 version 0.153.0, Utilities version 0.12.0, Queries version 0.17.0

* UIE-9574 - Replace useQueryWithPermissions in RestoreToLinodeDrawer

* UIE-9573

* UIE-9576

* UIE-9575 - Replace useQueryWithPermissions in AddFirewallForm

* UIE-9577

* UIE-9578 - Replace useQueryWithPermissions in SubnetAssignLinodesDrawer

* UIE-9579 - Replace useQueryWithPermissions in SubnetUnassignLinodesDrawer

* UIE-9580

* fix test failues

* Revert "Cloud version 1.155.0, API v4 version 0.153.0, Utilities version 0.12.0, Queries version 0.17.0"

This reverts commit 2c1f4e9c22f5b502de8f3fab5fee3b5a2884badb.

* feat: [UIE-9667] - filter out linodes in AttachVolumeDrawer

* adjust types + fetch all

* fix some tests + cleanup

* hook refactor

* fix AddFirewallForm.tsx

* run time fix

* missing page params

---------

Co-authored-by: mpolotsk <mpolotsk@akamai.com>
Co-authored-by: Anastasiia Alekseenko <aaleksee@akamai.com>
---
 packages/api-v4/src/iam/iam.ts                |  23 +-
 packages/api-v4/src/iam/types.ts              |   2 +-
 .../SelectFirewallPanel.test.tsx              |   6 -
 .../Devices/AddLinodeDrawer.test.tsx          |  30 +-
 .../Devices/AddLinodeDrawer.tsx               |  26 +-
 .../Devices/AddNodebalancerDrawer.test.tsx    |  31 +-
 .../Devices/FirewallDeviceLanding.test.tsx    |   6 -
 .../CreateFirewallDrawer.test.tsx             |  38 ++-
 .../CustomFirewallFields.test.tsx             |  13 -
 .../FirewallLanding/CustomFirewallFields.tsx  |  36 +--
 .../IAM/hooks/adapters/permissionAdapters.ts  |   4 +-
 ...useGetAllUserEntitiesByPermission.test.ts} | 300 ++++++++++-------
 .../useGetAllUserEntitiesByPermission.ts      | 202 ++++++++++++
 .../hooks/useGetUserEntitiesByPermission.ts   | 130 --------
 .../src/features/IAM/hooks/usePermissions.ts  | 136 +-------
 .../IAM/hooks/useQueryWithPermissions.test.ts | 303 ------------------
 .../ImagesCreate/CreateImageTab.test.tsx      | 179 +++++++----
 .../Images/ImagesCreate/CreateImageTab.tsx    |  27 +-
 .../ImagesLanding/EditImageDrawer.test.tsx    |   5 -
 .../Images/ImagesLanding/ImageRow.test.tsx    |   5 -
 .../ImagesLanding/ImagesLanding.test.tsx      |  18 --
 .../ImagesLanding/RebuildImageDrawer.test.tsx |  32 +-
 .../ImagesLanding/RebuildImageDrawer.tsx      |  24 +-
 .../LinodeBackup/LinodeBackups.test.tsx       |  10 +-
 .../LinodeBackup/RestoreToLinodeDrawer.tsx    |  34 +-
 .../LinodeFirewalls/AddFirewallForm.tsx       |  24 +-
 .../NodeBalancers/NodeBalancerSelect.tsx      |  17 +-
 .../VPCs/VPCDetail/SubnetActionMenu.test.tsx  |   9 -
 .../SubnetAssignLinodesDrawer.test.tsx        |  13 +-
 .../VPCDetail/SubnetAssignLinodesDrawer.tsx   |  24 +-
 .../VPCs/VPCDetail/SubnetEditDrawer.test.tsx  |   8 +-
 .../VPCDetail/SubnetLinodeActionMenu.test.tsx |   6 -
 .../VPCDetail/SubnetUnassignLinodesDrawer.tsx |  40 +--
 .../VPCs/VPCDetail/VPCDetail.test.tsx         |   7 +-
 .../VPCs/VPCDetail/VPCSubnetsTable.test.tsx   |   7 +-
 .../AttachVolumeDrawer/AttachVolumeDrawer.tsx |  22 +-
 .../VolumeDrawer/VolumeSelect.tsx             |  88 ++---
 packages/queries/src/iam/iam.ts               |  25 +-
 packages/queries/src/iam/keys.ts              |  39 ++-
 39 files changed, 898 insertions(+), 1051 deletions(-)
 rename packages/manager/src/features/IAM/hooks/{useGetUserEntitiesByPermission.test.ts => useGetAllUserEntitiesByPermission.test.ts} (67%)
 create mode 100644 packages/manager/src/features/IAM/hooks/useGetAllUserEntitiesByPermission.ts
 delete mode 100644 packages/manager/src/features/IAM/hooks/useGetUserEntitiesByPermission.ts
 delete mode 100644 packages/manager/src/features/IAM/hooks/useQueryWithPermissions.test.ts

diff --git a/packages/api-v4/src/iam/iam.ts b/packages/api-v4/src/iam/iam.ts
index 405e2a68ad0..006f634b428 100644
--- a/packages/api-v4/src/iam/iam.ts
+++ b/packages/api-v4/src/iam/iam.ts
@@ -1,6 +1,13 @@
 import { BETA_API_ROOT } from '../constants';
-import Request, { setData, setMethod, setURL } from '../request';
+import Request, {
+  setData,
+  setMethod,
+  setParams,
+  setURL,
+  setXFilter,
+} from '../request';
 
+import type { Filter, Params, ResourcePage } from '../types';
 import type {
   AccessType,
   EntityByPermission,
@@ -9,7 +16,6 @@ import type {
   PermissionType,
 } from './types';
 import type { EntityType } from 'src/entities/types';
-
 /**
  * getUserRoles
  *
@@ -93,6 +99,8 @@ export const getUserEntityPermissions = (
   username: string,
   entityType: AccessType,
   entityId: number | string,
+  params?: Params,
+  filter?: Filter,
 ) =>
   Request<PermissionType[]>(
     setURL(
@@ -101,6 +109,8 @@ export const getUserEntityPermissions = (
       )}/permissions/${entityType}/${entityId}`,
     ),
     setMethod('GET'),
+    setParams(params),
+    setXFilter(filter),
   );
 
 /**
@@ -109,7 +119,10 @@ export const getUserEntityPermissions = (
  * Returns the available entities for a given permission.
  */
 export interface GetEntitiesByPermissionParams {
+  enabled?: boolean;
   entityType: EntityType;
+  filter?: Filter;
+  params?: Params;
   permission: PermissionType;
   username: string | undefined;
 }
@@ -118,10 +131,14 @@ export const getUserEntitiesByPermission = ({
   username,
   entityType,
   permission,
+  params,
+  filter,
 }: GetEntitiesByPermissionParams) =>
-  Request<EntityByPermission[]>(
+  Request<ResourcePage<EntityByPermission>>(
     setURL(
       `${BETA_API_ROOT}/iam/users/${username}/entities/${entityType}?permission=${permission}`,
     ),
     setMethod('GET'),
+    setParams(params),
+    setXFilter(filter),
   );
diff --git a/packages/api-v4/src/iam/types.ts b/packages/api-v4/src/iam/types.ts
index 4005384e3d9..3ffeaa29952 100644
--- a/packages/api-v4/src/iam/types.ts
+++ b/packages/api-v4/src/iam/types.ts
@@ -457,7 +457,7 @@ export interface Roles {
   permissions: PermissionType[];
 }
 export interface EntityByPermission {
-  id: number;
+  id: number | string;
   label: string;
   type: EntityType;
 }
diff --git a/packages/manager/src/components/SelectFirewallPanel/SelectFirewallPanel.test.tsx b/packages/manager/src/components/SelectFirewallPanel/SelectFirewallPanel.test.tsx
index a887833d578..34770806cf6 100644
--- a/packages/manager/src/components/SelectFirewallPanel/SelectFirewallPanel.test.tsx
+++ b/packages/manager/src/components/SelectFirewallPanel/SelectFirewallPanel.test.tsx
@@ -17,16 +17,10 @@ const queryMocks = vi.hoisted(() => ({
   usePermissions: vi.fn(() => ({
     data: { delete_firewall: true, update_firewall: true },
   })),
-  useQueryWithPermissions: vi.fn().mockReturnValue({
-    data: [],
-    isLoading: false,
-    isError: false,
-  }),
 }));
 
 vi.mock('src/features/IAM/hooks/usePermissions', () => ({
   usePermissions: queryMocks.usePermissions,
-  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
 }));
 
 describe('SelectFirewallPanel', () => {
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.test.tsx
index c6143a282b6..553b89e432f 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.test.tsx
@@ -16,16 +16,14 @@ const props = {
 };
 
 const queryMocks = vi.hoisted(() => ({
+  useAllFirewallsQuery: vi.fn().mockReturnValue({}),
   useParams: vi.fn().mockReturnValue({}),
-  useQueryWithPermissions: vi.fn().mockReturnValue({
-    data: [],
-    isLoading: false,
-    isError: false,
-  }),
+  useGetAllUserEntitiesByPermission: vi.fn().mockReturnValue({}),
 }));
 
-vi.mock('src/features/IAM/hooks/usePermissions', () => ({
-  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
+vi.mock('src/features/IAM/hooks/useGetAllUserEntitiesByPermission', () => ({
+  useGetAllUserEntitiesByPermission:
+    queryMocks.useGetAllUserEntitiesByPermission,
 }));
 
 vi.mock('@tanstack/react-router', async () => {
@@ -36,9 +34,27 @@ vi.mock('@tanstack/react-router', async () => {
   };
 });
 
+vi.mock('@linode/queries', async () => {
+  const actual = await vi.importActual('@linode/queries');
+  return {
+    ...actual,
+    useAllFirewallsQuery: queryMocks.useAllFirewallsQuery,
+  };
+});
+
 describe('AddLinodeDrawer', () => {
   beforeEach(() => {
     queryMocks.useParams.mockReturnValue({ id: '1' });
+    queryMocks.useGetAllUserEntitiesByPermission.mockReturnValue({
+      data: [],
+      isLoading: false,
+      error: null,
+    });
+    queryMocks.useAllFirewallsQuery.mockReturnValue({
+      data: [],
+      isLoading: false,
+      error: null,
+    });
   });
 
   it('should contain helper text', () => {
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.tsx
index ae6127c5be5..29bb8f7247b 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.tsx
@@ -2,7 +2,6 @@ import {
   linodeQueries,
   useAddFirewallDeviceMutation,
   useAllFirewallsQuery,
-  useAllLinodesQuery,
 } from '@linode/queries';
 import { LinodeSelect } from '@linode/shared';
 import {
@@ -21,7 +20,7 @@ import * as React from 'react';
 import { Link } from 'src/components/Link';
 import { SupportLink } from 'src/components/SupportLink';
 import { getRestrictedResourceText } from 'src/features/Account/utils';
-import { useQueryWithPermissions } from 'src/features/IAM/hooks/usePermissions';
+import { useGetAllUserEntitiesByPermission } from 'src/features/IAM/hooks/useGetAllUserEntitiesByPermission';
 import { getLinodeInterfaceType } from 'src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/utilities';
 import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
 import { useIsLinodeInterfacesEnabled } from 'src/utilities/linodes';
@@ -59,13 +58,16 @@ export const AddLinodeDrawer = (props: Props) => {
 
   const firewall = data?.find((firewall) => firewall.id === Number(id));
 
-  const { data: availableLinodes, isLoading: availableLinodesLoading } =
-    useQueryWithPermissions<Linode>(
-      useAllLinodesQuery({}, {}, open),
-      'linode',
-      ['update_linode'],
-      open
-    );
+  const {
+    data: availableLinodes,
+    filter: availableLinodesFilter,
+    isLoading: availableLinodesLoading,
+    error: availableLinodesError,
+  } = useGetAllUserEntitiesByPermission<Linode>({
+    entityType: 'linode',
+    permission: 'update_linode',
+    enabled: open,
+  });
 
   const linodesUsingLinodeInterfaces =
     availableLinodes?.filter((l) => l.interface_generation === 'linode') ?? [];
@@ -338,7 +340,10 @@ export const AddLinodeDrawer = (props: Props) => {
     if (error) {
       setLocalError('Could not load firewall data');
     }
-  }, [error]);
+    if (availableLinodesError) {
+      setLocalError('Could not load linode data');
+    }
+  }, [error, availableLinodesError]);
 
   return (
     <Drawer
@@ -365,6 +370,7 @@ export const AddLinodeDrawer = (props: Props) => {
           disabled={
             isLoadingAllFirewalls || availableLinodesLoading || disabled
           }
+          filter={availableLinodesFilter}
           helperText={helperText}
           loading={isLoadingAllFirewalls || availableLinodesLoading}
           multiple
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddNodebalancerDrawer.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddNodebalancerDrawer.test.tsx
index 490cccd4ef7..e41b5cb61b4 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddNodebalancerDrawer.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddNodebalancerDrawer.test.tsx
@@ -22,16 +22,12 @@ const queryMocks = vi.hoisted(() => ({
       create_firewall_device: true,
     },
   })),
-  useQueryWithPermissions: vi.fn().mockReturnValue({
-    data: [],
-    isLoading: false,
-    isError: false,
-  }),
+  useGetAllUserEntitiesByPermission: vi.fn().mockReturnValue({}),
+  useAllFirewallsQuery: vi.fn().mockReturnValue({}),
 }));
 
 vi.mock('src/features/IAM/hooks/usePermissions', () => ({
   usePermissions: queryMocks.userPermissions,
-  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
 }));
 
 vi.mock('@tanstack/react-router', async () => {
@@ -42,9 +38,32 @@ vi.mock('@tanstack/react-router', async () => {
   };
 });
 
+vi.mock('src/features/IAM/hooks/useGetAllUserEntitiesByPermission', () => ({
+  useGetAllUserEntitiesByPermission:
+    queryMocks.useGetAllUserEntitiesByPermission,
+}));
+
+vi.mock('@linode/queries', async () => {
+  const actual = await vi.importActual('@linode/queries');
+  return {
+    ...actual,
+    useAllFirewallsQuery: queryMocks.useAllFirewallsQuery,
+  };
+});
+
 describe('AddNodeBalancerDrawer', () => {
   beforeEach(() => {
     queryMocks.useParams.mockReturnValue({ id: '1' });
+    queryMocks.useGetAllUserEntitiesByPermission.mockReturnValue({
+      data: [],
+      isLoading: false,
+      error: null,
+    });
+    queryMocks.useAllFirewallsQuery.mockReturnValue({
+      data: [],
+      isLoading: false,
+      error: null,
+    });
   });
 
   it('should contain helper text', () => {
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceLanding.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceLanding.test.tsx
index 0e8467c28da..7ef14493bdd 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceLanding.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceLanding.test.tsx
@@ -23,11 +23,6 @@ const queryMocks = vi.hoisted(() => ({
       create_firewall_device: false,
     },
   })),
-  useQueryWithPermissions: vi.fn().mockReturnValue({
-    data: [],
-    isLoading: false,
-    isError: false,
-  }),
 }));
 
 vi.mock('@tanstack/react-router', async () => {
@@ -51,7 +46,6 @@ vi.mock('src/hooks/useOrderV2', async () => {
 
 vi.mock('src/features/IAM/hooks/usePermissions', () => ({
   usePermissions: queryMocks.usePermissions,
-  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
 }));
 
 const baseProps = (
diff --git a/packages/manager/src/features/Firewalls/FirewallLanding/CreateFirewallDrawer.test.tsx b/packages/manager/src/features/Firewalls/FirewallLanding/CreateFirewallDrawer.test.tsx
index b05c0bfbf0b..9f19c945bef 100644
--- a/packages/manager/src/features/Firewalls/FirewallLanding/CreateFirewallDrawer.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallLanding/CreateFirewallDrawer.test.tsx
@@ -3,25 +3,29 @@ import userEvent from '@testing-library/user-event';
 import * as React from 'react';
 
 import { accountFactory } from 'src/factories';
-import { http, HttpResponse, server } from 'src/mocks/testServer';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { CreateFirewallDrawer } from './CreateFirewallDrawer';
 
 const queryMocks = vi.hoisted(() => ({
-  userPermissions: vi.fn(() => ({
+  useAccount: vi.fn().mockReturnValue({}),
+  usePermissions: vi.fn().mockReturnValue({
     data: { create_firewall: true },
-  })),
-  useQueryWithPermissions: vi.fn().mockReturnValue({
-    data: [],
     isLoading: false,
-    isError: false,
+    error: null,
   }),
 }));
 
+vi.mock('@linode/queries', async () => {
+  const actual = await vi.importActual('@linode/queries');
+  return {
+    ...actual,
+    useAccount: queryMocks.useAccount,
+  };
+});
+
 vi.mock('src/features/IAM/hooks/usePermissions', () => ({
-  usePermissions: queryMocks.userPermissions,
-  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
+  usePermissions: queryMocks.usePermissions,
 }));
 
 const props = {
@@ -80,12 +84,14 @@ describe('Create Firewall Drawer', () => {
   });
 
   it('shows custom firewall radio group if Linode Interfaces is enabled and can toggle radio group', async () => {
-    const account = accountFactory.build({
-      capabilities: ['Linode Interfaces'],
+    queryMocks.useAccount.mockReturnValue({
+      data: accountFactory.build({
+        capabilities: ['Linode Interfaces'],
+      }),
+      isLoading: false,
+      error: null,
     });
 
-    server.use(http.get('*/v4*/account', () => HttpResponse.json(account)));
-
     const { getByLabelText, findByTestId } = renderWithTheme(
       <CreateFirewallDrawer {...props} />,
       {
@@ -119,8 +125,10 @@ describe('Create Firewall Drawer', () => {
   });
 
   it('enables the submit button if the user has create_firewall permission', () => {
-    queryMocks.userPermissions.mockReturnValue({
+    queryMocks.usePermissions.mockReturnValue({
       data: { create_firewall: true },
+      isLoading: false,
+      error: null,
     });
 
     renderWithTheme(<CreateFirewallDrawer {...props} />);
@@ -129,8 +137,10 @@ describe('Create Firewall Drawer', () => {
   });
 
   it('disables the submit button if the user does not have create_firewall permission', () => {
-    queryMocks.userPermissions.mockReturnValue({
+    queryMocks.usePermissions.mockReturnValue({
       data: { create_firewall: false },
+      isLoading: false,
+      error: null,
     });
 
     renderWithTheme(<CreateFirewallDrawer {...props} />);
diff --git a/packages/manager/src/features/Firewalls/FirewallLanding/CustomFirewallFields.test.tsx b/packages/manager/src/features/Firewalls/FirewallLanding/CustomFirewallFields.test.tsx
index 9849e2b8a38..39272d09b29 100644
--- a/packages/manager/src/features/Firewalls/FirewallLanding/CustomFirewallFields.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallLanding/CustomFirewallFields.test.tsx
@@ -6,19 +6,6 @@ import { CustomFirewallFields } from './CustomFirewallFields';
 
 import type { LinodeCreateFormEventOptions } from 'src/utilities/analytics/types';
 
-const queryMocks = vi.hoisted(() => ({
-  useQueryWithPermissions: vi.fn().mockReturnValue({
-    data: [],
-    isLoading: false,
-    isError: false,
-  }),
-}));
-
-vi.mock('src/features/IAM/hooks/usePermissions', () => ({
-  ...vi.importActual('src/features/IAM/hooks/usePermissions'),
-  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
-}));
-
 const props = {
   createFlow: undefined,
   firewallFormEventOptions: {
diff --git a/packages/manager/src/features/Firewalls/FirewallLanding/CustomFirewallFields.tsx b/packages/manager/src/features/Firewalls/FirewallLanding/CustomFirewallFields.tsx
index 79be6739f9e..ac460a10e65 100644
--- a/packages/manager/src/features/Firewalls/FirewallLanding/CustomFirewallFields.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallLanding/CustomFirewallFields.tsx
@@ -1,8 +1,7 @@
-import { useAllFirewallsQuery, useAllLinodesQuery } from '@linode/queries';
+import { useAllFirewallsQuery } from '@linode/queries';
 import { LinodeSelect } from '@linode/shared';
 import {
   Box,
-  CircleProgress,
   FormControlLabel,
   Notice,
   Radio,
@@ -14,7 +13,7 @@ import { Controller, useFormContext } from 'react-hook-form';
 
 import { Link } from 'src/components/Link';
 import { FIREWALL_LIMITS_CONSIDERATIONS_LINK } from 'src/constants';
-import { useQueryWithPermissions } from 'src/features/IAM/hooks/usePermissions';
+import { useGetAllUserEntitiesByPermission } from 'src/features/IAM/hooks/useGetAllUserEntitiesByPermission';
 import { NodeBalancerSelect } from 'src/features/NodeBalancers/NodeBalancerSelect';
 import { sendLinodeCreateFormInputEvent } from 'src/utilities/analytics/formEventAnalytics';
 import { useIsLinodeInterfacesEnabled } from 'src/utilities/linodes';
@@ -60,16 +59,18 @@ export const CustomFirewallFields = (props: CustomFirewallProps) => {
     useAllFirewallsQuery(open);
 
   const {
-    data: permissableLinodes,
-    hasFiltered: hasFilteredLinodes,
-    isLoading: isLoadingLinodes,
-  } = useQueryWithPermissions<Linode>(useAllLinodesQuery(), 'linode', [
-    'apply_linode_firewalls',
-  ]);
-
-  const deviceSelectGuidance = hasFilteredLinodes
-    ? READ_ONLY_DEVICES_HIDDEN_MESSAGE
-    : undefined;
+    data: availableLinodes,
+    filter: availableLinodesFilter,
+    isLoading: availableLinodesLoading,
+  } = useGetAllUserEntitiesByPermission<Linode>({
+    entityType: 'linode',
+    permission: 'apply_linode_firewalls',
+    enabled: open,
+  });
+  const deviceSelectGuidance =
+    availableLinodes?.length !== 0
+      ? READ_ONLY_DEVICES_HIDDEN_MESSAGE
+      : undefined;
 
   const assignedServices = firewalls
     ?.map((firewall) => firewall.entities)
@@ -111,10 +112,6 @@ export const CustomFirewallFields = (props: CustomFirewallProps) => {
     </Link>
   );
 
-  if (isLoadingLinodes) {
-    return <CircleProgress />;
-  }
-
   return (
     <>
       <Typography style={{ marginTop: 24 }}>
@@ -211,16 +208,17 @@ export const CustomFirewallFields = (props: CustomFirewallProps) => {
           <LinodeSelect
             disabled={userCannotAddFirewall || isLoadingAllFirewalls}
             errorText={fieldState.error?.message}
+            filter={availableLinodesFilter}
             helperText={deviceSelectGuidance}
             label={
               createFlow === 'linode' ? LINODE_CREATE_FLOW_TEXT : 'Linodes'
             }
-            loading={isLoadingAllFirewalls}
+            loading={isLoadingAllFirewalls || availableLinodesLoading}
             multiple
             onSelectionChange={(linodes) => {
               field.onChange(linodes.map((linode) => linode.id));
             }}
-            options={permissableLinodes ?? []}
+            options={availableLinodes ?? []}
             optionsFilter={linodeOptionsFilter}
             value={field.value ?? null}
           />
diff --git a/packages/manager/src/features/IAM/hooks/adapters/permissionAdapters.ts b/packages/manager/src/features/IAM/hooks/adapters/permissionAdapters.ts
index 9565c8eec54..9db821fe078 100644
--- a/packages/manager/src/features/IAM/hooks/adapters/permissionAdapters.ts
+++ b/packages/manager/src/features/IAM/hooks/adapters/permissionAdapters.ts
@@ -6,9 +6,9 @@ import { nodeBalancerGrantsToPermissions } from './nodeBalancerGrantsToPermissio
 import { volumeGrantsToPermissions } from './volumeGrantsToPermissions';
 import { vpcGrantsToPermissions } from './vpcGrantsToPermissions';
 
-import type { EntityBase } from '../usePermissions';
 import type {
   AccessType,
+  AccountEntity,
   Grants,
   GrantType,
   PermissionType,
@@ -161,6 +161,8 @@ export const fromGrants = (
   return permissionsMap;
 };
 
+type EntityBase = Pick<AccountEntity, 'id' | 'label'>;
+
 /** Combines a list of entities and the permissions associated with the entity */
 export const toEntityPermissionMap = (
   entities: EntityBase[] | undefined,
diff --git a/packages/manager/src/features/IAM/hooks/useGetUserEntitiesByPermission.test.ts b/packages/manager/src/features/IAM/hooks/useGetAllUserEntitiesByPermission.test.ts
similarity index 67%
rename from packages/manager/src/features/IAM/hooks/useGetUserEntitiesByPermission.test.ts
rename to packages/manager/src/features/IAM/hooks/useGetAllUserEntitiesByPermission.test.ts
index 7def28d5023..0e6db14bd6a 100644
--- a/packages/manager/src/features/IAM/hooks/useGetUserEntitiesByPermission.test.ts
+++ b/packages/manager/src/features/IAM/hooks/useGetAllUserEntitiesByPermission.test.ts
@@ -2,13 +2,18 @@ import { renderHook, waitFor } from '@testing-library/react';
 
 import { wrapWithTheme } from 'src/utilities/testHelpers';
 
-import { useGetUserEntitiesByPermission } from './useGetUserEntitiesByPermission';
+import { useGetAllUserEntitiesByPermission } from './useGetAllUserEntitiesByPermission';
 
-import type { APIError, Grants, Linode, Profile } from '@linode/api-v4';
-import type { UseQueryResult } from '@tanstack/react-query';
+import type { Grants, Linode, Profile } from '@linode/api-v4';
 
 const queryMocks = vi.hoisted(() => ({
-  useGetUserEntitiesByPermissionQuery: vi.fn(),
+  useAllFirewallsQuery: vi.fn(),
+  useAllImagesQuery: vi.fn(),
+  useAllLinodesQuery: vi.fn(),
+  useAllNodeBalancersQuery: vi.fn(),
+  useAllVolumesQuery: vi.fn(),
+  useAllVPCsQuery: vi.fn(),
+  useGetAllUserEntitiesByPermissionQuery: vi.fn(),
   useGrants: vi.fn(),
   useIsIAMEnabled: vi.fn(),
   entityPermissionMapFrom: vi.fn(),
@@ -18,8 +23,14 @@ vi.mock(import('@linode/queries'), async (importOriginal) => {
   const actual = await importOriginal();
   return {
     ...actual,
-    useGetUserEntitiesByPermissionQuery:
-      queryMocks.useGetUserEntitiesByPermissionQuery,
+    useAllFirewallsQuery: queryMocks.useAllFirewallsQuery,
+    useAllImagesQuery: queryMocks.useAllImagesQuery,
+    useAllLinodesQuery: queryMocks.useAllLinodesQuery,
+    useAllNodeBalancersQuery: queryMocks.useAllNodeBalancersQuery,
+    useAllVolumesQuery: queryMocks.useAllVolumesQuery,
+    useAllVPCsQuery: queryMocks.useAllVPCsQuery,
+    useGetAllUserEntitiesByPermissionQuery:
+      queryMocks.useGetAllUserEntitiesByPermissionQuery,
     useGrants: queryMocks.useGrants,
   };
 });
@@ -32,7 +43,7 @@ vi.mock('./adapters/permissionAdapters', () => ({
   entityPermissionMapFrom: queryMocks.entityPermissionMapFrom,
 }));
 
-describe('useGetUserEntitiesByPermission', () => {
+describe('useGetAllUserEntitiesByPermission', () => {
   const mockLinodes: Linode[] = [
     {
       id: 1,
@@ -54,24 +65,34 @@ describe('useGetUserEntitiesByPermission', () => {
     } as Linode,
   ];
 
-  const mockQuery = {
+  const mockLinodeQueryResult = {
     data: mockLinodes,
     isLoading: false,
     error: null,
     refetch: vi.fn(),
     isSuccess: true,
     isError: false,
-  } as unknown as UseQueryResult<Linode[], APIError[]>;
+  };
 
   beforeEach(() => {
     vi.clearAllMocks();
-    queryMocks.useGetUserEntitiesByPermissionQuery.mockReturnValue({
+
+    // Default mock for all entity query hooks
+    queryMocks.useAllLinodesQuery.mockReturnValue(mockLinodeQueryResult);
+    queryMocks.useAllFirewallsQuery.mockReturnValue(mockLinodeQueryResult);
+    queryMocks.useAllVolumesQuery.mockReturnValue(mockLinodeQueryResult);
+    queryMocks.useAllNodeBalancersQuery.mockReturnValue(mockLinodeQueryResult);
+    queryMocks.useAllImagesQuery.mockReturnValue(mockLinodeQueryResult);
+    queryMocks.useAllVPCsQuery.mockReturnValue(mockLinodeQueryResult);
+
+    queryMocks.useGetAllUserEntitiesByPermissionQuery.mockReturnValue({
       data: undefined,
       isLoading: false,
       error: null,
     });
     queryMocks.useGrants.mockReturnValue({
       data: undefined,
+      isLoading: false,
     });
   });
 
@@ -91,7 +112,7 @@ describe('useGetUserEntitiesByPermission', () => {
           { id: 2, label: 'linode-2', type: 'linode' },
         ];
 
-        queryMocks.useGetUserEntitiesByPermissionQuery.mockReturnValue({
+        queryMocks.useGetAllUserEntitiesByPermissionQuery.mockReturnValue({
           data: mockEntitiesByPermission,
           isLoading: false,
           error: null,
@@ -101,11 +122,9 @@ describe('useGetUserEntitiesByPermission', () => {
 
         const { result } = renderHook(
           () =>
-            useGetUserEntitiesByPermission({
-              query: mockQuery,
+            useGetAllUserEntitiesByPermission({
               entityType: 'linode',
               permission: 'view_linode',
-              username: 'restricted-user',
             }),
           {
             wrapper: (ui) => wrapWithTheme(ui, { flags }),
@@ -114,33 +133,28 @@ describe('useGetUserEntitiesByPermission', () => {
 
         await waitFor(() => {
           expect(result.current.data).toHaveLength(2);
-          expect(result.current.data?.[0]).toEqual(mockLinodes[0]);
-          // eslint-disable-next-line testing-library/no-wait-for-multiple-assertions
-          expect(result.current.data?.[1]).toEqual(mockLinodes[1]);
         });
       });
 
-      it('should filter out entities not found in allEntities', async () => {
-        const mockEntitiesByPermission = [
-          { id: 1, label: 'linode-1', type: 'linode' },
-          { id: 999, label: 'missing-linode', type: 'linode' },
-        ];
-
-        queryMocks.useGetUserEntitiesByPermissionQuery.mockReturnValue({
-          data: mockEntitiesByPermission,
+      it('should return empty array when user has no permissions', async () => {
+        queryMocks.useGetAllUserEntitiesByPermissionQuery.mockReturnValue({
+          data: [],
           isLoading: false,
           error: null,
         });
 
+        queryMocks.useAllLinodesQuery.mockReturnValue({
+          ...mockLinodeQueryResult,
+          data: [],
+        });
+
         const flags = { iam: { beta: false, enabled: true } };
 
         const { result } = renderHook(
           () =>
-            useGetUserEntitiesByPermission({
-              query: mockQuery,
+            useGetAllUserEntitiesByPermission({
               entityType: 'linode',
               permission: 'view_linode',
-              username: 'restricted-user',
             }),
           {
             wrapper: (ui) => wrapWithTheme(ui, { flags }),
@@ -148,28 +162,26 @@ describe('useGetUserEntitiesByPermission', () => {
         );
 
         await waitFor(() => {
-          expect(result.current.data).toHaveLength(1);
-          // eslint-disable-next-line testing-library/no-wait-for-multiple-assertions
-          expect(result.current.data?.[0]?.id).toBe(1);
+          expect(result.current.data).toEqual([]);
         });
       });
 
-      it('should return empty array when user has no permissions', async () => {
-        queryMocks.useGetUserEntitiesByPermissionQuery.mockReturnValue({
-          data: [],
+      it('should return empty array and error when permission query fails', async () => {
+        const mockError = [{ reason: 'Permission denied' }];
+
+        queryMocks.useGetAllUserEntitiesByPermissionQuery.mockReturnValue({
+          data: undefined,
           isLoading: false,
-          error: null,
+          error: mockError,
         });
 
         const flags = { iam: { beta: false, enabled: true } };
 
         const { result } = renderHook(
           () =>
-            useGetUserEntitiesByPermission({
-              query: mockQuery,
+            useGetAllUserEntitiesByPermission({
               entityType: 'linode',
               permission: 'view_linode',
-              username: 'restricted-user',
             }),
           {
             wrapper: (ui) => wrapWithTheme(ui, { flags }),
@@ -177,7 +189,8 @@ describe('useGetUserEntitiesByPermission', () => {
         );
 
         await waitFor(() => {
-          expect(result.current.data).toEqual([]);
+          expect(result.current.data).toEqual([]); // Security: don't return all
+          expect(result.current.error).toEqual(mockError);
         });
       });
     });
@@ -195,7 +208,7 @@ describe('useGetUserEntitiesByPermission', () => {
       });
 
       it('should return all entities without filtering', async () => {
-        queryMocks.useGetUserEntitiesByPermissionQuery.mockReturnValue({
+        queryMocks.useGetAllUserEntitiesByPermissionQuery.mockReturnValue({
           data: [],
           isLoading: false,
           error: null,
@@ -205,11 +218,9 @@ describe('useGetUserEntitiesByPermission', () => {
 
         const { result } = renderHook(
           () =>
-            useGetUserEntitiesByPermission({
-              query: mockQuery,
+            useGetAllUserEntitiesByPermission({
               entityType: 'linode',
               permission: 'view_linode',
-              username: 'unrestricted-user',
             }),
           {
             wrapper: (ui) => wrapWithTheme(ui, { flags }),
@@ -218,21 +229,25 @@ describe('useGetUserEntitiesByPermission', () => {
 
         await waitFor(() => {
           expect(result.current.data).toEqual(mockLinodes);
-          // eslint-disable-next-line testing-library/no-wait-for-multiple-assertions
           expect(result.current.data).toHaveLength(3);
+          expect(result.current.filter).toEqual({}); // No filter for unrestricted
         });
       });
 
-      it('should not call permission query for unrestricted users', async () => {
+      it('should call entity query without filter', async () => {
+        queryMocks.useGetAllUserEntitiesByPermissionQuery.mockReturnValue({
+          data: [],
+          isLoading: false,
+          error: null,
+        });
+
         const flags = { iam: { beta: false, enabled: true } };
 
         renderHook(
           () =>
-            useGetUserEntitiesByPermission({
-              query: mockQuery,
+            useGetAllUserEntitiesByPermission({
               entityType: 'linode',
               permission: 'view_linode',
-              username: 'unrestricted-user',
             }),
           {
             wrapper: (ui) => wrapWithTheme(ui, { flags }),
@@ -240,9 +255,11 @@ describe('useGetUserEntitiesByPermission', () => {
         );
 
         await waitFor(() => {
-          expect(
-            queryMocks.useGetUserEntitiesByPermissionQuery
-          ).toHaveBeenCalled();
+          expect(queryMocks.useAllLinodesQuery).toHaveBeenCalledWith(
+            {},
+            {}, // Empty filter
+            true
+          );
         });
       });
     });
@@ -266,21 +283,24 @@ describe('useGetUserEntitiesByPermission', () => {
           { id: 1, label: 'linode-1', type: 'linode' },
         ];
 
-        queryMocks.useGetUserEntitiesByPermissionQuery.mockReturnValue({
+        queryMocks.useGetAllUserEntitiesByPermissionQuery.mockReturnValue({
           data: mockEntitiesByPermission,
           isLoading: false,
           error: null,
         });
 
+        queryMocks.useAllLinodesQuery.mockReturnValue({
+          ...mockLinodeQueryResult,
+          data: [mockLinodes[0]],
+        });
+
         const flags = { iam: { beta: true, enabled: true } };
 
         const { result } = renderHook(
           () =>
-            useGetUserEntitiesByPermission({
-              query: mockQuery,
+            useGetAllUserEntitiesByPermission({
               entityType: 'linode',
               permission: 'view_linode',
-              username: 'beta-restricted-user',
             }),
           {
             wrapper: (ui) => wrapWithTheme(ui, { flags }),
@@ -289,7 +309,6 @@ describe('useGetUserEntitiesByPermission', () => {
 
         await waitFor(() => {
           expect(result.current.data).toHaveLength(1);
-          // eslint-disable-next-line testing-library/no-wait-for-multiple-assertions
           expect(result.current.data?.[0]?.id).toBe(1);
         });
       });
@@ -308,7 +327,7 @@ describe('useGetUserEntitiesByPermission', () => {
       });
 
       it('should return all entities for unrestricted beta users', async () => {
-        queryMocks.useGetUserEntitiesByPermissionQuery.mockReturnValue({
+        queryMocks.useGetAllUserEntitiesByPermissionQuery.mockReturnValue({
           data: [],
           isLoading: false,
           error: null,
@@ -318,11 +337,9 @@ describe('useGetUserEntitiesByPermission', () => {
 
         const { result } = renderHook(
           () =>
-            useGetUserEntitiesByPermission({
-              query: mockQuery,
+            useGetAllUserEntitiesByPermission({
               entityType: 'linode',
               permission: 'view_linode',
-              username: 'beta-unrestricted-user',
             }),
           {
             wrapper: (ui) => wrapWithTheme(ui, { flags }),
@@ -331,7 +348,6 @@ describe('useGetUserEntitiesByPermission', () => {
 
         await waitFor(() => {
           expect(result.current.data).toEqual(mockLinodes);
-          // eslint-disable-next-line testing-library/no-wait-for-multiple-assertions
           expect(result.current.data).toHaveLength(3);
         });
       });
@@ -366,6 +382,7 @@ describe('useGetUserEntitiesByPermission', () => {
 
         queryMocks.useGrants.mockReturnValue({
           data: mockGrants,
+          isLoading: false,
         });
 
         queryMocks.entityPermissionMapFrom.mockReturnValue(mockPermissionMap);
@@ -374,11 +391,9 @@ describe('useGetUserEntitiesByPermission', () => {
 
         const { result } = renderHook(
           () =>
-            useGetUserEntitiesByPermission({
-              query: mockQuery,
+            useGetAllUserEntitiesByPermission({
               entityType: 'linode',
               permission: 'view_linode',
-              username: 'grants-restricted-user',
             }),
           {
             wrapper: (ui) => wrapWithTheme(ui, { flags }),
@@ -387,7 +402,6 @@ describe('useGetUserEntitiesByPermission', () => {
 
         await waitFor(() => {
           expect(result.current.data).toHaveLength(2);
-          // eslint-disable-next-line testing-library/no-wait-for-multiple-assertions
           expect(queryMocks.entityPermissionMapFrom).toHaveBeenCalledWith(
             mockGrants,
             'linode',
@@ -408,6 +422,7 @@ describe('useGetUserEntitiesByPermission', () => {
 
         queryMocks.useGrants.mockReturnValue({
           data: mockGrants,
+          isLoading: false,
         });
 
         queryMocks.entityPermissionMapFrom.mockReturnValue(mockPermissionMap);
@@ -416,11 +431,9 @@ describe('useGetUserEntitiesByPermission', () => {
 
         const { result } = renderHook(
           () =>
-            useGetUserEntitiesByPermission({
-              query: mockQuery,
+            useGetAllUserEntitiesByPermission({
               entityType: 'linode',
               permission: 'view_linode',
-              username: 'grants-restricted-user',
             }),
           {
             wrapper: (ui) => wrapWithTheme(ui, { flags }),
@@ -429,7 +442,6 @@ describe('useGetUserEntitiesByPermission', () => {
 
         await waitFor(() => {
           expect(result.current.data).toHaveLength(1);
-          // eslint-disable-next-line testing-library/no-wait-for-multiple-assertions
           expect(result.current.data?.[0]?.id).toBe(1);
         });
       });
@@ -437,6 +449,7 @@ describe('useGetUserEntitiesByPermission', () => {
       it('should return empty array when grants are empty', async () => {
         queryMocks.useGrants.mockReturnValue({
           data: {} as Grants,
+          isLoading: false,
         });
 
         queryMocks.entityPermissionMapFrom.mockReturnValue({});
@@ -445,11 +458,9 @@ describe('useGetUserEntitiesByPermission', () => {
 
         const { result } = renderHook(
           () =>
-            useGetUserEntitiesByPermission({
-              query: mockQuery,
+            useGetAllUserEntitiesByPermission({
               entityType: 'linode',
               permission: 'view_linode',
-              username: 'grants-restricted-user',
             }),
           {
             wrapper: (ui) => wrapWithTheme(ui, { flags }),
@@ -460,6 +471,35 @@ describe('useGetUserEntitiesByPermission', () => {
           expect(result.current.data).toEqual([]);
         });
       });
+
+      it('should call entity query without filter for legacy grants', async () => {
+        queryMocks.useGrants.mockReturnValue({
+          data: {} as Grants,
+          isLoading: false,
+        });
+
+        const flags = { iam: { beta: false, enabled: false } };
+
+        renderHook(
+          () =>
+            useGetAllUserEntitiesByPermission({
+              entityType: 'linode',
+              permission: 'view_linode',
+            }),
+          {
+            wrapper: (ui) => wrapWithTheme(ui, { flags }),
+          }
+        );
+
+        await waitFor(() => {
+          // Legacy path calls query without filter
+          expect(queryMocks.useAllLinodesQuery).toHaveBeenCalledWith(
+            {},
+            {},
+            true
+          );
+        });
+      });
     });
 
     describe('Unrestricted User', () => {
@@ -477,17 +517,16 @@ describe('useGetUserEntitiesByPermission', () => {
       it('should return all entities without grant filtering', async () => {
         queryMocks.useGrants.mockReturnValue({
           data: undefined,
+          isLoading: false,
         });
 
         const flags = { iam: { beta: false, enabled: false } };
 
         const { result } = renderHook(
           () =>
-            useGetUserEntitiesByPermission({
-              query: mockQuery,
+            useGetAllUserEntitiesByPermission({
               entityType: 'linode',
               permission: 'view_linode',
-              username: 'grants-unrestricted-user',
             }),
           {
             wrapper: (ui) => wrapWithTheme(ui, { flags }),
@@ -496,7 +535,6 @@ describe('useGetUserEntitiesByPermission', () => {
 
         await waitFor(() => {
           expect(result.current.data).toEqual(mockLinodes);
-          // eslint-disable-next-line testing-library/no-wait-for-multiple-assertions
           expect(result.current.data).toHaveLength(3);
         });
       });
@@ -504,17 +542,16 @@ describe('useGetUserEntitiesByPermission', () => {
       it('should not call entityPermissionMapFrom for unrestricted users', async () => {
         queryMocks.useGrants.mockReturnValue({
           data: {} as Grants,
+          isLoading: false,
         });
 
         const flags = { iam: { beta: false, enabled: false } };
 
         renderHook(
           () =>
-            useGetUserEntitiesByPermission({
-              query: mockQuery,
+            useGetAllUserEntitiesByPermission({
               entityType: 'linode',
               permission: 'view_linode',
-              username: 'grants-unrestricted-user',
             }),
           {
             wrapper: (ui) => wrapWithTheme(ui, { flags }),
@@ -529,18 +566,18 @@ describe('useGetUserEntitiesByPermission', () => {
   });
 
   describe('Loading States', () => {
-    it('should combine loading states from both queries', async () => {
-      const loadingQuery = {
-        ...mockQuery,
-        isLoading: true,
-      } as unknown as UseQueryResult<Linode[], APIError[]>;
-
-      queryMocks.useGetUserEntitiesByPermissionQuery.mockReturnValue({
+    it('should combine loading states from permission and entity queries', async () => {
+      queryMocks.useGetAllUserEntitiesByPermissionQuery.mockReturnValue({
         data: undefined,
         isLoading: true,
         error: null,
       });
 
+      queryMocks.useAllLinodesQuery.mockReturnValue({
+        ...mockLinodeQueryResult,
+        isLoading: true,
+      });
+
       queryMocks.useIsIAMEnabled.mockReturnValue({
         isIAMEnabled: true,
         isIAMBeta: false,
@@ -551,11 +588,9 @@ describe('useGetUserEntitiesByPermission', () => {
 
       const { result } = renderHook(
         () =>
-          useGetUserEntitiesByPermission({
-            query: loadingQuery,
+          useGetAllUserEntitiesByPermission({
             entityType: 'linode',
             permission: 'view_linode',
-            username: 'test-user',
           }),
         {
           wrapper: (ui) => wrapWithTheme(ui, { flags }),
@@ -566,12 +601,17 @@ describe('useGetUserEntitiesByPermission', () => {
     });
 
     it('should return isLoading false when all queries are complete', async () => {
-      queryMocks.useGetUserEntitiesByPermissionQuery.mockReturnValue({
+      queryMocks.useGetAllUserEntitiesByPermissionQuery.mockReturnValue({
         data: [],
         isLoading: false,
         error: null,
       });
 
+      queryMocks.useAllLinodesQuery.mockReturnValue({
+        ...mockLinodeQueryResult,
+        isLoading: false,
+      });
+
       queryMocks.useIsIAMEnabled.mockReturnValue({
         isIAMEnabled: true,
         isIAMBeta: false,
@@ -582,11 +622,9 @@ describe('useGetUserEntitiesByPermission', () => {
 
       const { result } = renderHook(
         () =>
-          useGetUserEntitiesByPermission({
-            query: mockQuery,
+          useGetAllUserEntitiesByPermission({
             entityType: 'linode',
             permission: 'view_linode',
-            username: 'test-user',
           }),
         {
           wrapper: (ui) => wrapWithTheme(ui, { flags }),
@@ -600,14 +638,10 @@ describe('useGetUserEntitiesByPermission', () => {
   });
 
   describe('Error States', () => {
-    it('should combine error states from both queries', async () => {
-      const mockError = [{ reason: 'Test error' }];
-      const errorQuery = {
-        ...mockQuery,
-        error: mockError,
-      } as unknown as UseQueryResult<Linode[], APIError[]>;
+    it('should return permission query error and empty data', async () => {
+      const mockError = [{ reason: 'Permission query error' }];
 
-      queryMocks.useGetUserEntitiesByPermissionQuery.mockReturnValue({
+      queryMocks.useGetAllUserEntitiesByPermissionQuery.mockReturnValue({
         data: undefined,
         isLoading: false,
         error: mockError,
@@ -623,26 +657,32 @@ describe('useGetUserEntitiesByPermission', () => {
 
       const { result } = renderHook(
         () =>
-          useGetUserEntitiesByPermission({
-            query: errorQuery,
+          useGetAllUserEntitiesByPermission({
             entityType: 'linode',
             permission: 'view_linode',
-            username: 'test-user',
           }),
         {
           wrapper: (ui) => wrapWithTheme(ui, { flags }),
         }
       );
 
-      expect(result.current.error).toBeTruthy();
+      await waitFor(() => {
+        expect(result.current.error).toEqual(mockError);
+        expect(result.current.data).toEqual([]); // Security: empty on error
+      });
     });
 
-    it('should handle permission query errors', async () => {
-      const mockError = [{ reason: 'Permission query error' }];
+    it('should handle entity query errors', async () => {
+      const mockError = [{ reason: 'Entity query error' }];
 
-      queryMocks.useGetUserEntitiesByPermissionQuery.mockReturnValue({
-        data: undefined,
+      queryMocks.useGetAllUserEntitiesByPermissionQuery.mockReturnValue({
+        data: [{ id: 1, label: 'linode-1', type: 'linode' }],
         isLoading: false,
+        error: null,
+      });
+
+      queryMocks.useAllLinodesQuery.mockReturnValue({
+        ...mockLinodeQueryResult,
         error: mockError,
       });
 
@@ -656,11 +696,9 @@ describe('useGetUserEntitiesByPermission', () => {
 
       const { result } = renderHook(
         () =>
-          useGetUserEntitiesByPermission({
-            query: mockQuery,
+          useGetAllUserEntitiesByPermission({
             entityType: 'linode',
             permission: 'view_linode',
-            username: 'test-user',
           }),
         {
           wrapper: (ui) => wrapWithTheme(ui, { flags }),
@@ -670,4 +708,44 @@ describe('useGetUserEntitiesByPermission', () => {
       expect(result.current.error).toEqual(mockError);
     });
   });
+
+  describe('Custom Filter and Params', () => {
+    it('should pass custom params to entity query', async () => {
+      const customParams = { page: 1, page_size: 50 };
+
+      queryMocks.useGetAllUserEntitiesByPermissionQuery.mockReturnValue({
+        data: [],
+        isLoading: false,
+        error: null,
+      });
+
+      queryMocks.useIsIAMEnabled.mockReturnValue({
+        isIAMEnabled: true,
+        isIAMBeta: false,
+        profile: { restricted: false, username: 'test-user' } as Profile,
+      });
+
+      const flags = { iam: { beta: false, enabled: true } };
+
+      renderHook(
+        () =>
+          useGetAllUserEntitiesByPermission({
+            entityType: 'linode',
+            permission: 'view_linode',
+            params: customParams,
+          }),
+        {
+          wrapper: (ui) => wrapWithTheme(ui, { flags }),
+        }
+      );
+
+      await waitFor(() => {
+        expect(queryMocks.useAllLinodesQuery).toHaveBeenCalledWith(
+          customParams,
+          {},
+          true
+        );
+      });
+    });
+  });
 });
diff --git a/packages/manager/src/features/IAM/hooks/useGetAllUserEntitiesByPermission.ts b/packages/manager/src/features/IAM/hooks/useGetAllUserEntitiesByPermission.ts
new file mode 100644
index 00000000000..b1b6eab9076
--- /dev/null
+++ b/packages/manager/src/features/IAM/hooks/useGetAllUserEntitiesByPermission.ts
@@ -0,0 +1,202 @@
+import {
+  useAllFirewallsQuery,
+  useAllImagesQuery,
+  useAllLinodesQuery,
+  useAllNodeBalancersQuery,
+  useAllVolumesQuery,
+  useAllVPCsQuery,
+  useGetAllUserEntitiesByPermissionQuery,
+  useGrants,
+} from '@linode/queries';
+
+import { entityPermissionMapFrom } from './adapters/permissionAdapters';
+import { useIsIAMEnabled } from './useIsIAMEnabled';
+import {
+  BETA_ACCESS_TYPE_SCOPE,
+  LA_ACCOUNT_ADMIN_PERMISSIONS_TO_EXCLUDE,
+} from './usePermissions';
+
+import type {
+  APIError,
+  EntityType,
+  Filter,
+  Firewall,
+  GrantType,
+  Image,
+  Linode,
+  NodeBalancer,
+  Params,
+  PermissionType,
+  Volume,
+  VPC,
+} from '@linode/api-v4';
+import type { UseQueryResult } from '@linode/queries';
+
+type FullEntityType = Firewall | Image | Linode | NodeBalancer | Volume | VPC;
+
+interface UseGetEntitiesByPermissionProps {
+  enabled?: boolean;
+  entityType: EntityType;
+  filter?: Filter;
+  params?: Params;
+  permission: PermissionType;
+}
+
+type EntityQueryResult<T extends FullEntityType> = UseQueryResult<
+  T[] | undefined,
+  APIError[]
+> & { filter: Filter };
+
+/**
+ * Helper to call the right query hook based on entity type
+ * Doing this here allows the consumer to not have to worry about the different query hooks for each entity type
+ */
+const useEntityQuery = <T extends FullEntityType>(
+  entityType: EntityType,
+  filter: Filter,
+  params: Params,
+  enabled: boolean
+): EntityQueryResult<T> => {
+  const linodeQuery = useAllLinodesQuery(
+    params,
+    filter,
+    entityType === 'linode' && enabled
+  );
+  const firewallQuery = useAllFirewallsQuery(
+    entityType === 'firewall' && enabled,
+    params,
+    filter
+  );
+  const volumeQuery = useAllVolumesQuery(
+    params,
+    filter,
+    entityType === 'volume' && enabled
+  );
+  const nodeBalancerQuery = useAllNodeBalancersQuery(
+    entityType === 'nodebalancer' && enabled,
+    params,
+    filter
+  );
+  const imageQuery = useAllImagesQuery(
+    params,
+    filter,
+    entityType === 'image' && enabled
+  );
+  const vpcQuery = useAllVPCsQuery({
+    enabled: entityType === 'vpc' && enabled,
+    filter,
+  });
+
+  /**
+   * Return the appropriate query result based on entity type
+   */
+  switch (entityType) {
+    case 'firewall':
+      return firewallQuery as EntityQueryResult<T>;
+    case 'image':
+      return imageQuery as EntityQueryResult<T>;
+    case 'linode':
+      return linodeQuery as EntityQueryResult<T>;
+    case 'nodebalancer':
+      return nodeBalancerQuery as EntityQueryResult<T>;
+    case 'volume':
+      return volumeQuery as EntityQueryResult<T>;
+    case 'vpc':
+      return vpcQuery as EntityQueryResult<T>;
+    default:
+      throw new Error(`Unsupported entity type: ${entityType}`);
+  }
+};
+
+export const useGetAllUserEntitiesByPermission = <T extends FullEntityType>({
+  entityType,
+  permission,
+  enabled = true,
+  filter = {},
+  params = {},
+}: UseGetEntitiesByPermissionProps) => {
+  const { isIAMBeta, isIAMEnabled, profile } = useIsIAMEnabled();
+
+  // Get entities by permission (Restricted IAM users only)
+  const {
+    data: entitiesByPermission,
+    isLoading: isEntitiesByPermissionLoading,
+    error: isEntitiesByPermissionError,
+  } = useGetAllUserEntitiesByPermissionQuery({
+    username: profile?.username,
+    entityType,
+    permission,
+    enabled: enabled && isIAMEnabled,
+  });
+
+  /**
+   * Determine if we should use IAM permissions or legacy permissions
+   */
+  const useBetaPermissions =
+    isIAMEnabled &&
+    isIAMBeta &&
+    BETA_ACCESS_TYPE_SCOPE.includes(entityType) &&
+    LA_ACCOUNT_ADMIN_PERMISSIONS_TO_EXCLUDE.some((blacklistedPermission) =>
+      permission.includes(blacklistedPermission)
+    ) === false;
+  const useLAPermissions = isIAMEnabled && !isIAMBeta;
+  const shouldUseIAMPermissions = useBetaPermissions || useLAPermissions;
+
+  /**
+   * Extract entity IDs from the entities by permission data
+   */
+  const entityIds =
+    shouldUseIAMPermissions && profile?.restricted
+      ? entitiesByPermission?.map((e) => e.id)
+      : undefined;
+
+  /**
+   *  Call entity query
+   */
+  const entityQuery = useEntityQuery<T>(entityType, filter, params, enabled);
+
+  /**
+   * Legacy grants for non-IAM users
+   */
+  const { data: grants, isLoading: grantsLoading } = useGrants(
+    !shouldUseIAMPermissions && profile?.restricted && enabled
+  );
+
+  /**
+   * Return IAM path
+   *
+   * In case a filter was used, we also return it to be used for client-side filtering
+   * ex: we also pass this filter to the LinodeSelect to avoid caching two different queries (with and without filter)
+   */
+  if (shouldUseIAMPermissions) {
+    return {
+      ...entityQuery,
+      filter,
+      data: profile?.restricted
+        ? entityQuery.data?.filter((entity) => entityIds?.includes(entity.id))
+        : entityQuery.data,
+      isLoading: isEntitiesByPermissionLoading || entityQuery.isLoading,
+      error: isEntitiesByPermissionError || entityQuery.error,
+    };
+  }
+
+  /**
+   * Legacy path with client-side filtering/mapping
+   */
+  const entityPermissionsMap = profile?.restricted
+    ? entityPermissionMapFrom(grants, entityType as GrantType, profile)
+    : {};
+
+  const filteredEntities = profile?.restricted
+    ? entityQuery.data?.filter(
+        (entity: T) => entityPermissionsMap[entity.id]?.[permission]
+      )
+    : entityQuery.data;
+
+  return {
+    ...entityQuery,
+    data: filteredEntities ?? [],
+    isLoading: entityQuery.isLoading || grantsLoading,
+    error: entityQuery.error,
+  };
+};
diff --git a/packages/manager/src/features/IAM/hooks/useGetUserEntitiesByPermission.ts b/packages/manager/src/features/IAM/hooks/useGetUserEntitiesByPermission.ts
deleted file mode 100644
index 2dbfe6386e0..00000000000
--- a/packages/manager/src/features/IAM/hooks/useGetUserEntitiesByPermission.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import {
-  useGetUserEntitiesByPermissionQuery,
-  useGrants,
-} from '@linode/queries';
-
-import { entityPermissionMapFrom } from './adapters/permissionAdapters';
-import { useIsIAMEnabled } from './useIsIAMEnabled';
-import {
-  BETA_ACCESS_TYPE_SCOPE,
-  LA_ACCOUNT_ADMIN_PERMISSIONS_TO_EXCLUDE,
-} from './usePermissions';
-
-import type { EntityPermissionMap } from './adapters/permissionAdapters';
-import type {
-  APIError,
-  EntityType,
-  Firewall,
-  GrantType,
-  Image,
-  Linode,
-  NodeBalancer,
-  PermissionType,
-  Volume,
-  VPC,
-} from '@linode/api-v4';
-import type { UseQueryResult } from '@linode/queries';
-
-type FullEntityType = Firewall | Image | Linode | NodeBalancer | Volume | VPC;
-
-interface UseGetEntitiesByPermissionProps<T extends FullEntityType> {
-  enabled?: boolean;
-  entityType: EntityType;
-  permission: PermissionType;
-  query: UseQueryResult<T[] | undefined, APIError[]>;
-  username: string | undefined;
-}
-
-export const useGetUserEntitiesByPermission = <T extends FullEntityType>({
-  query,
-  entityType,
-  permission,
-  username,
-  enabled = true,
-}: UseGetEntitiesByPermissionProps<T>) => {
-  /**
-   * Get the full entities from the API
-   */
-  const {
-    data: allEntities,
-    error: isAllEntitiesError,
-    isLoading: isAllEntitiesLoading,
-    ...restQueryResult
-  } = query;
-  const { isIAMBeta, isIAMEnabled, profile } = useIsIAMEnabled();
-
-  /**
-   * Get the entities by permission from the API
-   * This returns entities IDs which we need to map against the allEntities query
-   */
-  const {
-    data: entitiesByPermission,
-    isLoading: isEntitiesByPermissionLoading,
-    error: isEntitiesByPermissionError,
-  } = useGetUserEntitiesByPermissionQuery({
-    entityType,
-    permission,
-    username,
-  });
-
-  /**
-   * Beta/LA permission logic
-   * Will be cleaned up as soon as LA is fully adopted
-   */
-  const useBetaPermissions =
-    isIAMEnabled &&
-    isIAMBeta &&
-    BETA_ACCESS_TYPE_SCOPE.includes(entityType) &&
-    LA_ACCOUNT_ADMIN_PERMISSIONS_TO_EXCLUDE.some((blacklistedPermission) =>
-      permission.includes(blacklistedPermission)
-    ) === false;
-  const useLAPermissions = isIAMEnabled && !isIAMBeta;
-  const shouldUseIAMPermissions = useBetaPermissions || useLAPermissions;
-
-  /**
-   * Legacy Grants - only used for restricted users if IAM is disabled
-   */
-  const { data: grants } = useGrants(
-    (!isIAMEnabled || !shouldUseIAMPermissions) && enabled
-  );
-  let entityPermissionsMap: EntityPermissionMap = {};
-  if (profile?.restricted) {
-    entityPermissionsMap = entityPermissionMapFrom(
-      grants,
-      entityType as GrantType,
-      profile
-    );
-  }
-
-  /**
-   * Map the entities by permission to the full entities
-   */
-  const fullEntitiesFromEntitiesByPermission = entitiesByPermission
-    ?.map((entity) => allEntities?.find((e) => e.id === entity.id))
-    .filter((e): e is T => e !== undefined);
-
-  /**
-   * Build the entities list based on the user types (restricted or unrestricted) and the beta/LA permission logic
-   */
-  const _availableEntities = shouldUseIAMPermissions
-    ? profile?.restricted
-      ? fullEntitiesFromEntitiesByPermission
-      : allEntities
-    : profile?.restricted
-      ? allEntities?.filter(
-          (entity: T) =>
-            entityPermissionsMap[entity.id] &&
-            entityPermissionsMap[entity.id][permission]
-        )
-      : allEntities;
-
-  const isLoading = isAllEntitiesLoading || isEntitiesByPermissionLoading;
-  const error = isAllEntitiesError || isEntitiesByPermissionError;
-
-  return {
-    data: _availableEntities,
-    isLoading,
-    error,
-    ...restQueryResult,
-  };
-};
diff --git a/packages/manager/src/features/IAM/hooks/usePermissions.ts b/packages/manager/src/features/IAM/hooks/usePermissions.ts
index 9054b1f8b3d..b184155af59 100644
--- a/packages/manager/src/features/IAM/hooks/usePermissions.ts
+++ b/packages/manager/src/features/IAM/hooks/usePermissions.ts
@@ -1,30 +1,20 @@
-import { getUserEntityPermissions } from '@linode/api-v4';
 import {
   useGrants,
   useProfile,
-  useQueries,
   useUserAccountPermissions,
   useUserEntityPermissions,
 } from '@linode/queries';
 
-import {
-  entityPermissionMapFrom,
-  fromGrants,
-  toEntityPermissionMap,
-  toPermissionMap,
-} from './adapters/permissionAdapters';
+import { fromGrants, toPermissionMap } from './adapters/permissionAdapters';
 import { useIsIAMEnabled } from './useIsIAMEnabled';
 
 import type {
   AccessType,
   AccountAdmin,
-  AccountEntity,
   APIError,
-  EntityType,
   FirewallAdmin,
   FirewallContributor,
   FirewallViewer,
-  GrantType,
   ImageAdmin,
   ImageContributor,
   ImageViewer,
@@ -35,7 +25,6 @@ import type {
   NodeBalancerContributor,
   NodeBalancerViewer,
   PermissionType,
-  Profile,
   VolumeAdmin,
   VolumeContributor,
   VolumeViewer,
@@ -242,126 +231,3 @@ export function usePermissions<
     ...restEntityPermissions,
   } as const;
 }
-
-export type EntityBase = Pick<AccountEntity, 'id' | 'label'>;
-
-/**
- * Helper function to get the permissions for a list of entities.
- * Used only for restricted users who need to check permissions for each entity.
- *
- * ⚠️ This is a performance bottleneck for restricted users who have many entities.
- * It will need to be deprecated and refactored when we add the ability to filter entities by permission(s).
- */
-export const useEntitiesPermissions = <T extends EntityBase>(
-  entities: T[] | undefined,
-  entityType: EntityType,
-  profile?: Profile,
-  enabled = true
-) => {
-  const queries = useQueries({
-    queries: (entities || []).map((entity: T) => ({
-      queryKey: [entityType, entity.id],
-      queryFn: () =>
-        getUserEntityPermissions(
-          profile?.username || '',
-          entityType,
-          entity.id
-        ),
-      enabled: enabled && Boolean(profile?.restricted),
-    })),
-  });
-
-  const data = queries.map((query) => query.data);
-  const error = queries.map((query) => query.error);
-  const isError = queries.some((query) => query.isError);
-  const isLoading = queries.some((query) => query.isLoading);
-
-  return { data, error, isError, isLoading };
-};
-
-export type QueryWithPermissionsResult<T> = {
-  data: T[];
-  error: APIError[] | null;
-  hasFiltered: boolean;
-  isError: boolean;
-  isLoading: boolean;
-} & Omit<
-  UseQueryResult<T[], APIError[]>,
-  'data' | 'error' | 'isError' | 'isLoading'
->;
-
-export const useQueryWithPermissions = <T extends EntityBase>(
-  useQueryResult: UseQueryResult<T[], APIError[]>,
-  entityType: EntityType,
-  permissionsToCheck: PermissionType[],
-  enabled?: boolean
-): QueryWithPermissionsResult<T> => {
-  const {
-    data: allEntities,
-    error: allEntitiesError,
-    isLoading: areEntitiesLoading,
-    isError: isEntitiesError,
-    ...restQueryResult
-  } = useQueryResult;
-  const { data: profile } = useProfile();
-  const { isIAMBeta, isIAMEnabled } = useIsIAMEnabled();
-
-  const accessType = entityType;
-
-  /**
-   * Apply the same Beta/LA permission logic as usePermissions.
-   * - Use Beta Permissions if:
-   *   - The feature is beta
-   *   - The access type is in the BETA_ACCESS_TYPE_SCOPE
-   *   - The account permission is not in the LA_ACCOUNT_ADMIN_PERMISSIONS_TO_EXCLUDE
-   * - Use LA Permissions if:
-   *   - The feature is not beta
-   */
-  const useBetaPermissions =
-    isIAMEnabled &&
-    isIAMBeta &&
-    BETA_ACCESS_TYPE_SCOPE.includes(accessType) &&
-    LA_ACCOUNT_ADMIN_PERMISSIONS_TO_EXCLUDE.some((blacklistedPermission) =>
-      permissionsToCheck.includes(blacklistedPermission as AccountAdmin)
-    ) === false;
-  const useLAPermissions = isIAMEnabled && !isIAMBeta;
-  const shouldUsePermissionMap = useBetaPermissions || useLAPermissions;
-
-  const { data: entityPermissions, isLoading: areEntityPermissionsLoading } =
-    useEntitiesPermissions<T>(
-      allEntities,
-      entityType,
-      profile,
-      shouldUsePermissionMap && enabled
-    );
-  const { data: grants } = useGrants(
-    (!isIAMEnabled || !shouldUsePermissionMap) && enabled
-  );
-
-  const entityPermissionsMap = shouldUsePermissionMap
-    ? toEntityPermissionMap(
-        allEntities,
-        entityPermissions,
-        permissionsToCheck,
-        profile?.restricted
-      )
-    : entityPermissionMapFrom(grants, entityType as GrantType, profile);
-
-  const entities: T[] | undefined = allEntities?.filter((entity: T) => {
-    const permissions = entityPermissionsMap[entity.id] ?? {};
-    return (
-      !profile?.restricted ||
-      (permissions &&
-        permissionsToCheck.every((permission) => permissions[permission]))
-    );
-  });
-
-  return {
-    data: entities || [],
-    error: allEntitiesError,
-    hasFiltered: allEntities?.length !== entities?.length,
-    isError: isEntitiesError,
-    isLoading: areEntitiesLoading || areEntityPermissionsLoading,
-    ...restQueryResult,
-  } as const;
-};
diff --git a/packages/manager/src/features/IAM/hooks/useQueryWithPermissions.test.ts b/packages/manager/src/features/IAM/hooks/useQueryWithPermissions.test.ts
deleted file mode 100644
index c5ad8301161..00000000000
--- a/packages/manager/src/features/IAM/hooks/useQueryWithPermissions.test.ts
+++ /dev/null
@@ -1,303 +0,0 @@
-import { renderHook } from '@testing-library/react';
-
-import { wrapWithTheme } from 'src/utilities/testHelpers';
-
-import { useQueryWithPermissions } from './usePermissions';
-
-import type { EntityBase } from './usePermissions';
-import type { APIError, PermissionType } from '@linode/api-v4';
-import type { UseQueryResult } from '@tanstack/react-query';
-
-type Entity = { id: number; label: string };
-
-const queryMocks = vi.hoisted(() => {
-  let entitiesPermsLoading = false;
-
-  return {
-    useIsIAMEnabled: vi
-      .fn()
-      .mockReturnValue({ isIAMEnabled: true, isIAMBeta: true }),
-    useGrants: vi.fn().mockReturnValue({ data: null }),
-    useProfile: vi
-      .fn()
-      .mockReturnValue({ data: { username: 'user-1', restricted: true } }),
-    useQueries: Object.assign(
-      vi.fn().mockImplementation(({ queries }) =>
-        (queries || []).map(() => ({
-          data: null,
-          error: null,
-          isError: false,
-          isLoading: entitiesPermsLoading,
-        }))
-      ),
-      {
-        setEntitiesPermsLoading: (b: boolean) => {
-          entitiesPermsLoading = b;
-        },
-      }
-    ),
-  };
-});
-
-vi.mock(import('@linode/queries'), async (importOriginal) => {
-  const actual = await importOriginal();
-
-  return {
-    ...actual,
-    useGrants: queryMocks.useGrants,
-    useProfile: queryMocks.useProfile,
-    useQueries: queryMocks.useQueries,
-  };
-});
-
-vi.mock('src/features/IAM/hooks/useIsIAMEnabled', async () => {
-  const actual = await vi.importActual(
-    'src/features/IAM/hooks/useIsIAMEnabled'
-  );
-
-  return {
-    ...actual,
-    useIsIAMEnabled: queryMocks.useIsIAMEnabled,
-  };
-});
-
-vi.mock('./adapters/permissionAdapters', () => ({
-  toEntityPermissionMap: vi.fn(
-    (entities: EntityBase[] = [], entitiesPermissions: PermissionType[]) => {
-      const map: Record<number, Record<string, boolean>> = {};
-      entities.forEach((e) => {
-        map[e.id] = entitiesPermissions?.reduce<Record<string, boolean>>(
-          (acc, p) => {
-            acc[p] = e.id === 1;
-            return acc;
-          },
-          {}
-        );
-      });
-
-      return map;
-    }
-  ),
-  entityPermissionMapFrom: vi.fn(() => {
-    return {
-      1: { update_linode: true, resize_volume: true, create_volume: true },
-      2: { update_linode: true, resize_volume: true, create_volume: true },
-    };
-  }),
-}));
-
-describe('useQueryWithPermissions', () => {
-  const entities: Entity[] = [
-    { id: 1, label: 'one' },
-    { id: 2, label: 'two' },
-  ];
-
-  const baseQueryResult = {
-    data: entities,
-    error: null,
-    isError: false,
-    isLoading: false,
-  } as UseQueryResult<Entity[], APIError[]>;
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    queryMocks.useQueries.setEntitiesPermsLoading(false);
-  });
-
-  it('uses Beta permissions when IAM enabled + beta true + in scope; filters restricted entities', () => {
-    const flags = { iam: { beta: true, enabled: true } };
-    queryMocks.useIsIAMEnabled.mockReturnValue({
-      isIAMEnabled: true,
-      isIAMBeta: true,
-    });
-    queryMocks.useProfile.mockReturnValue({
-      data: { username: 'user-1', restricted: true },
-    });
-
-    const { result } = renderHook(
-      () =>
-        useQueryWithPermissions(
-          baseQueryResult,
-          'linode',
-          ['update_linode'],
-          true
-        ),
-      { wrapper: (ui) => wrapWithTheme(ui, { flags }) }
-    );
-
-    expect(queryMocks.useGrants).toHaveBeenCalledWith(false);
-
-    const calls = queryMocks.useQueries.mock.calls;
-    expect(calls.length).toBeGreaterThan(0);
-    const queryArgs = calls[0][0];
-    expect(
-      queryArgs.queries.every((q: { enabled?: boolean }) => q.enabled === true)
-    ).toBe(true);
-
-    expect(result.current.data.map((e) => e.id)).toEqual([]);
-    expect(result.current.hasFiltered).toBe(true);
-    expect(result.current.isLoading).toBe(false);
-  });
-
-  it('falls back to grants when IAM disabled', () => {
-    const flags = { iam: { beta: false, enabled: false } };
-    queryMocks.useIsIAMEnabled.mockReturnValue({
-      isIAMEnabled: false,
-      isIAMBeta: false,
-    });
-
-    const { result } = renderHook(
-      () =>
-        useQueryWithPermissions(
-          baseQueryResult,
-          'linode',
-          ['update_linode'],
-          true
-        ),
-      { wrapper: (ui) => wrapWithTheme(ui, { flags }) }
-    );
-
-    expect(queryMocks.useGrants).toHaveBeenCalledWith(true);
-
-    const queryArgs = queryMocks.useQueries.mock.calls[0][0];
-    expect(
-      queryArgs.queries.every((q: { enabled?: boolean }) => q.enabled === false)
-    ).toBe(true);
-
-    expect(result.current.data.map((e) => e.id)).toEqual([1, 2]);
-    expect(result.current.hasFiltered).toBe(false);
-  });
-
-  it('falls back to grants when Beta true but entityType not in scope', () => {
-    const flags = { iam: { beta: true, enabled: true } };
-    queryMocks.useIsIAMEnabled.mockReturnValue({
-      isIAMEnabled: true,
-      isIAMBeta: true,
-    });
-
-    renderHook(
-      () =>
-        useQueryWithPermissions(
-          baseQueryResult,
-          'volume',
-          ['resize_volume'],
-          true
-        ),
-      { wrapper: (ui) => wrapWithTheme(ui, { flags }) }
-    );
-
-    expect(queryMocks.useGrants).toHaveBeenCalledWith(true);
-    const qArg = queryMocks.useQueries.mock.calls[0][0];
-    expect(
-      qArg.queries.every((q: { enabled?: boolean }) => q.enabled === false)
-    ).toBe(true);
-  });
-
-  it('falls back to grants when Beta true but permission is in the LA exclusion list', () => {
-    const flags = { iam: { beta: true, enabled: true } };
-    queryMocks.useIsIAMEnabled.mockReturnValue({
-      isIAMEnabled: true,
-      isIAMBeta: true,
-    });
-
-    renderHook(
-      () =>
-        useQueryWithPermissions(
-          baseQueryResult,
-          'volume',
-          ['create_volume'], // blacklisted
-          true
-        ),
-      { wrapper: (ui) => wrapWithTheme(ui, { flags }) }
-    );
-
-    expect(queryMocks.useGrants).toHaveBeenCalledWith(true);
-    const queryArgs = queryMocks.useQueries.mock.calls[0][0];
-    expect(
-      queryArgs.queries.every((q: { enabled?: boolean }) => q.enabled === false)
-    ).toBe(true);
-  });
-
-  it('uses LA permissions when IAM enabled + beta false', () => {
-    const flags = { iam: { beta: false, enabled: true } };
-    queryMocks.useIsIAMEnabled.mockReturnValue({
-      isIAMEnabled: true,
-      isIAMBeta: false,
-    });
-
-    renderHook(
-      () =>
-        useQueryWithPermissions(
-          baseQueryResult,
-          'linode',
-          ['update_linode'],
-          true
-        ),
-      { wrapper: (ui) => wrapWithTheme(ui, { flags }) }
-    );
-
-    expect(queryMocks.useGrants).toHaveBeenCalledWith(false);
-    const queryArgs = queryMocks.useQueries.mock.calls[0][0];
-    expect(
-      queryArgs.queries.every((q: { enabled?: boolean }) => q.enabled === true)
-    ).toBe(true);
-  });
-
-  it('marks loading when entity permissions queries are loading', () => {
-    const flags = { iam: { beta: true, enabled: true } };
-    queryMocks.useIsIAMEnabled.mockReturnValue({
-      isIAMEnabled: true,
-      isIAMBeta: true,
-    });
-    queryMocks.useQueries.setEntitiesPermsLoading(true);
-
-    const { result } = renderHook(
-      () =>
-        useQueryWithPermissions(
-          baseQueryResult,
-          'linode',
-          ['update_linode'],
-          true
-        ),
-      { wrapper: (ui) => wrapWithTheme(ui, { flags }) }
-    );
-
-    expect(result.current.isLoading).toBe(true);
-  });
-
-  it('grants all permissions to unrestricted (admin) users without making permission API calls', () => {
-    const flags = { iam: { beta: true, enabled: true } };
-    queryMocks.useIsIAMEnabled.mockReturnValue({
-      isIAMEnabled: true,
-      isIAMBeta: true,
-    });
-    queryMocks.useProfile.mockReturnValue({
-      data: { username: 'admin-user', restricted: false },
-    });
-
-    const { result } = renderHook(
-      () =>
-        useQueryWithPermissions(
-          baseQueryResult,
-          'linode',
-          ['update_linode', 'delete_linode', 'reboot_linode'],
-          true
-        ),
-      { wrapper: (ui) => wrapWithTheme(ui, { flags }) }
-    );
-
-    // Verify grants are NOT fetched (IAM is enabled)
-    expect(queryMocks.useGrants).toHaveBeenCalledWith(false);
-
-    // Verify permission queries are disabled (no N API calls for unrestricted users!)
-    const queryArgs = queryMocks.useQueries.mock.calls[0][0];
-    expect(
-      queryArgs.queries.every((q: { enabled?: boolean }) => q.enabled === false)
-    ).toBe(true);
-
-    // Unrestricted users should see ALL entities
-    expect(result.current.data.map((e) => e.id)).toEqual([1, 2]);
-    expect(result.current.hasFiltered).toBe(false);
-    expect(result.current.isLoading).toBe(false);
-  });
-});
diff --git a/packages/manager/src/features/Images/ImagesCreate/CreateImageTab.test.tsx b/packages/manager/src/features/Images/ImagesCreate/CreateImageTab.test.tsx
index 16823d67373..4c8e2045f80 100644
--- a/packages/manager/src/features/Images/ImagesCreate/CreateImageTab.test.tsx
+++ b/packages/manager/src/features/Images/ImagesCreate/CreateImageTab.test.tsx
@@ -4,19 +4,33 @@ import { userEvent } from '@testing-library/user-event';
 import React from 'react';
 
 import { imageFactory, linodeDiskFactory } from 'src/factories';
-import { makeResourcePage } from 'src/mocks/serverHandlers';
-import { http, HttpResponse, server } from 'src/mocks/testServer';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { CreateImageTab } from './CreateImageTab';
 
 const queryMocks = vi.hoisted(() => ({
+  useLinodeQuery: vi.fn().mockReturnValue({}),
+  useAllLinodesQuery: vi.fn().mockReturnValue({}),
+  useAllLinodeDisksQuery: vi.fn().mockReturnValue({}),
+  useRegionsQuery: vi.fn().mockReturnValue({}),
+  useCreateImageMutation: vi.fn().mockReturnValue({}),
   useSearch: vi.fn().mockReturnValue({ query: undefined }),
   usePermissions: vi.fn().mockReturnValue({}),
-  useQueryWithPermissions: vi.fn().mockReturnValue({}),
-  useLinodesPermissionsCheck: vi.fn().mockReturnValue({}),
+  useGetAllUserEntitiesByPermission: vi.fn().mockReturnValue({}),
 }));
 
+vi.mock('@linode/queries', async () => {
+  const actual = await vi.importActual('@linode/queries');
+  return {
+    ...actual,
+    useLinodeQuery: queryMocks.useLinodeQuery,
+    useAllLinodesQuery: queryMocks.useAllLinodesQuery,
+    useAllLinodeDisksQuery: queryMocks.useAllLinodeDisksQuery,
+    useRegionsQuery: queryMocks.useRegionsQuery,
+    useCreateImageMutation: queryMocks.useCreateImageMutation,
+  };
+});
+
 vi.mock('@tanstack/react-router', async () => {
   const actual = await vi.importActual('@tanstack/react-router');
   return {
@@ -27,16 +41,24 @@ vi.mock('@tanstack/react-router', async () => {
 
 vi.mock('src/features/IAM/hooks/usePermissions', () => ({
   usePermissions: queryMocks.usePermissions,
-  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
+}));
+
+vi.mock('src/features/IAM/hooks/useGetAllUserEntitiesByPermission', () => ({
+  useGetAllUserEntitiesByPermission:
+    queryMocks.useGetAllUserEntitiesByPermission,
 }));
 
 describe('CreateImageTab', () => {
   beforeEach(() => {
     queryMocks.usePermissions.mockReturnValue({
       data: { create_image: true },
+      isLoading: false,
+      error: null,
     });
-    queryMocks.useLinodesPermissionsCheck.mockReturnValue({
-      availableLinodes: [linodeFactory.build().id],
+    queryMocks.useGetAllUserEntitiesByPermission.mockReturnValue({
+      data: [],
+      isLoading: false,
+      error: null,
     });
   });
 
@@ -70,15 +92,26 @@ describe('CreateImageTab', () => {
     const linode = linodeFactory.build();
     const disk = linodeDiskFactory.build();
 
-    server.use(
-      http.get('*/v4*/linode/instances', () => {
-        return HttpResponse.json(makeResourcePage([linode]));
-      }),
-      http.get('*/v4*/linode/instances/:id/disks', () => {
-        return HttpResponse.json(makeResourcePage([disk]));
-      })
-    );
-
+    queryMocks.useGetAllUserEntitiesByPermission.mockReturnValue({
+      data: [linode],
+      isLoading: false,
+      error: null,
+    });
+    queryMocks.useAllLinodesQuery.mockReturnValue({
+      data: [linode],
+      isLoading: false,
+      error: null,
+    });
+    queryMocks.useLinodeQuery.mockReturnValue({
+      data: linode,
+      isLoading: false,
+      error: null,
+    });
+    queryMocks.useAllLinodeDisksQuery.mockReturnValue({
+      data: [disk],
+      isFetching: false,
+      error: null,
+    });
     queryMocks.useSearch.mockReturnValue({
       selectedDisk: disk.id,
       selectedLinode: linode.id,
@@ -111,24 +144,31 @@ describe('CreateImageTab', () => {
     const disk = linodeDiskFactory.build();
     const image = imageFactory.build();
 
-    queryMocks.useLinodesPermissionsCheck.mockReturnValue({
-      availableLinodes: [linode.id],
+    queryMocks.useGetAllUserEntitiesByPermission.mockReturnValue({
+      data: [linode],
+      isLoading: false,
+      error: null,
     });
-    queryMocks.useQueryWithPermissions.mockReturnValue({
+    queryMocks.useAllLinodesQuery.mockReturnValue({
       data: [linode],
+      isLoading: false,
+      error: null,
+    });
+    queryMocks.useLinodeQuery.mockReturnValue({
+      data: linode,
+      isLoading: false,
+      error: null,
+    });
+    queryMocks.useAllLinodeDisksQuery.mockReturnValue({
+      data: [disk],
+      isFetching: false,
+      error: null,
+    });
+    queryMocks.useCreateImageMutation.mockReturnValue({
+      mutateAsync: vi.fn().mockResolvedValue(image),
+      isLoading: false,
+      error: null,
     });
-
-    server.use(
-      http.get('*/v4*/linode/instances', () => {
-        return HttpResponse.json(makeResourcePage([linode]));
-      }),
-      http.get('*/v4*/linode/instances/:id/disks', () => {
-        return HttpResponse.json(makeResourcePage([disk]));
-      }),
-      http.post('*/v4/images', () => {
-        return HttpResponse.json(image);
-      })
-    );
 
     const { findByText, getByLabelText, getByText, queryByText } =
       renderWithTheme(<CreateImageTab />);
@@ -165,24 +205,31 @@ describe('CreateImageTab', () => {
     const region = regionFactory.build({ capabilities: [] });
     const linode = linodeFactory.build({ region: region.id });
 
-    queryMocks.useLinodesPermissionsCheck.mockReturnValue({
-      availableLinodes: [linode.id],
+    queryMocks.useGetAllUserEntitiesByPermission.mockReturnValue({
+      data: [linode],
+      isLoading: false,
+      error: null,
     });
-    queryMocks.useQueryWithPermissions.mockReturnValue({
+    queryMocks.useAllLinodesQuery.mockReturnValue({
       data: [linode],
+      isLoading: false,
+      error: null,
+    });
+    queryMocks.useLinodeQuery.mockReturnValue({
+      data: linode,
+      isLoading: false,
+      error: null,
+    });
+    queryMocks.useAllLinodeDisksQuery.mockReturnValue({
+      data: [linode],
+      isFetching: false,
+      error: null,
+    });
+    queryMocks.useRegionsQuery.mockReturnValue({
+      data: [region],
+      isLoading: false,
+      error: null,
     });
-
-    server.use(
-      http.get('*/v4*/linode/instances', () => {
-        return HttpResponse.json(makeResourcePage([linode]));
-      }),
-      http.get('*/v4*/linode/instances/:id', () => {
-        return HttpResponse.json(linode);
-      }),
-      http.get('*/v4*/regions', () => {
-        return HttpResponse.json(makeResourcePage([region]));
-      })
-    );
 
     const { findByText, getByLabelText } = renderWithTheme(<CreateImageTab />);
 
@@ -206,27 +253,31 @@ describe('CreateImageTab', () => {
     const disk2 = linodeDiskFactory.build();
     const image = imageFactory.build();
 
-    queryMocks.useLinodesPermissionsCheck.mockReturnValue({
-      availableLinodes: [linode.id],
+    queryMocks.useGetAllUserEntitiesByPermission.mockReturnValue({
+      data: [linode],
+      isLoading: false,
+      error: null,
     });
-    queryMocks.useQueryWithPermissions.mockReturnValue({
+    queryMocks.useAllLinodesQuery.mockReturnValue({
       data: [linode],
+      isLoading: false,
+      error: null,
+    });
+    queryMocks.useLinodeQuery.mockReturnValue({
+      data: linode,
+      isLoading: false,
+      error: null,
+    });
+    queryMocks.useAllLinodeDisksQuery.mockReturnValue({
+      data: [disk1, disk2],
+      isFetching: false,
+      error: null,
+    });
+    queryMocks.useCreateImageMutation.mockReturnValue({
+      mutateAsync: vi.fn().mockResolvedValue(image),
+      isLoading: false,
+      error: null,
     });
-
-    server.use(
-      http.get('*/v4*/linode/instances', () => {
-        return HttpResponse.json(makeResourcePage([linode]));
-      }),
-      http.get('*/v4*/linode/instances/:id', () => {
-        return HttpResponse.json(linode);
-      }),
-      http.get('*/v4*/linode/instances/:id/disks', () => {
-        return HttpResponse.json(makeResourcePage([disk1, disk2]));
-      }),
-      http.post('*/v4/images', () => {
-        return HttpResponse.json(image);
-      })
-    );
 
     const { findByText, getByLabelText, queryByText } = renderWithTheme(
       <CreateImageTab />
diff --git a/packages/manager/src/features/Images/ImagesCreate/CreateImageTab.tsx b/packages/manager/src/features/Images/ImagesCreate/CreateImageTab.tsx
index 9a48643ff90..222dc1da043 100644
--- a/packages/manager/src/features/Images/ImagesCreate/CreateImageTab.tsx
+++ b/packages/manager/src/features/Images/ImagesCreate/CreateImageTab.tsx
@@ -1,7 +1,6 @@
 import { yupResolver } from '@hookform/resolvers/yup';
 import {
   useAllLinodeDisksQuery,
-  useAllLinodesQuery,
   useCreateImageMutation,
   useLinodeQuery,
   useRegionsQuery,
@@ -28,10 +27,8 @@ import { Controller, useForm } from 'react-hook-form';
 import { Link } from 'src/components/Link';
 import { TagsInput } from 'src/components/TagsInput/TagsInput';
 import { getRestrictedResourceText } from 'src/features/Account/utils';
-import {
-  usePermissions,
-  useQueryWithPermissions,
-} from 'src/features/IAM/hooks/usePermissions';
+import { useGetAllUserEntitiesByPermission } from 'src/features/IAM/hooks/useGetAllUserEntitiesByPermission';
+import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
 import { useFlags } from 'src/hooks/useFlags';
 import { useEventsPollingActions } from 'src/queries/events/events';
 
@@ -108,13 +105,16 @@ export const CreateImageTab = () => {
     selectedLinodeId !== null
   );
 
-  const { data: linodes, isLoading } = useQueryWithPermissions<Linode>(
-    useAllLinodesQuery({}, {}, Boolean(imagePermissions.create_image)),
-    'linode',
-    ['view_linode', 'update_linode'],
-    Boolean(imagePermissions.create_image)
-  );
-  const availableLinodes = linodes?.map((linode) => linode.id);
+  const {
+    data: linodes,
+    isLoading,
+    filter: linodeFilter,
+  } = useGetAllUserEntitiesByPermission<Linode>({
+    entityType: 'linode',
+    permission: 'update_linode',
+    enabled: Boolean(imagePermissions.create_image),
+  });
+  const availableLinodes = linodes?.map((linode) => linode.id) ?? [];
 
   const {
     data: disks,
@@ -160,7 +160,7 @@ export const CreateImageTab = () => {
   return (
     <form onSubmit={onSubmit}>
       <Stack spacing={2}>
-        {!canCreateImage && (
+        {!canCreateImage && !isLoading && (
           <Notice
             text={getRestrictedResourceText({
               action: 'create',
@@ -195,6 +195,7 @@ export const CreateImageTab = () => {
 
             <LinodeSelect
               disabled={!canCreateImage}
+              filter={linodeFilter}
               getOptionDisabled={(linode) =>
                 !availableLinodes.includes(linode.id)
               }
diff --git a/packages/manager/src/features/Images/ImagesLanding/EditImageDrawer.test.tsx b/packages/manager/src/features/Images/ImagesLanding/EditImageDrawer.test.tsx
index 8b2f34fbdf0..e8080871237 100644
--- a/packages/manager/src/features/Images/ImagesLanding/EditImageDrawer.test.tsx
+++ b/packages/manager/src/features/Images/ImagesLanding/EditImageDrawer.test.tsx
@@ -17,12 +17,10 @@ const props = {
 
 const queryMocks = vi.hoisted(() => ({
   usePermissions: vi.fn().mockReturnValue({}),
-  useQueryWithPermissions: vi.fn().mockReturnValue({}),
 }));
 
 vi.mock('src/features/IAM/hooks/usePermissions', () => ({
   usePermissions: queryMocks.usePermissions,
-  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
 }));
 
 const mockUpdateImage = vi.fn();
@@ -40,9 +38,6 @@ beforeEach(() => {
   queryMocks.usePermissions.mockReturnValue({
     data: { update_image: true, is_account_admin: true },
   });
-  queryMocks.useQueryWithPermissions.mockReturnValue({
-    data: [props.image],
-  });
 });
 
 describe('EditImageDrawer', () => {
diff --git a/packages/manager/src/features/Images/ImagesLanding/ImageRow.test.tsx b/packages/manager/src/features/Images/ImagesLanding/ImageRow.test.tsx
index d54f0b77714..bc92f3bf696 100644
--- a/packages/manager/src/features/Images/ImagesLanding/ImageRow.test.tsx
+++ b/packages/manager/src/features/Images/ImagesLanding/ImageRow.test.tsx
@@ -16,12 +16,10 @@ beforeAll(() => mockMatchMedia());
 
 const queryMocks = vi.hoisted(() => ({
   usePermissions: vi.fn().mockReturnValue({}),
-  useQueryWithPermissions: vi.fn().mockReturnValue({}),
 }));
 
 vi.mock('src/features/IAM/hooks/usePermissions', () => ({
   usePermissions: queryMocks.usePermissions,
-  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
 }));
 
 describe('Image Table Row', () => {
@@ -166,9 +164,6 @@ describe('Image Table Row', () => {
     const image = imageFactory.build({
       regions: [{ region: 'us-east', status: 'available' }],
     });
-    queryMocks.useQueryWithPermissions.mockReturnValue({
-      data: [image],
-    });
 
     const { getByLabelText, getByText } = renderWithTheme(
       wrapWithTableBody(<ImageRow handlers={handlers} image={image} />)
diff --git a/packages/manager/src/features/Images/ImagesLanding/ImagesLanding.test.tsx b/packages/manager/src/features/Images/ImagesLanding/ImagesLanding.test.tsx
index 4701d9003c1..c39b1edca49 100644
--- a/packages/manager/src/features/Images/ImagesLanding/ImagesLanding.test.tsx
+++ b/packages/manager/src/features/Images/ImagesLanding/ImagesLanding.test.tsx
@@ -1,4 +1,3 @@
-import { linodeFactory } from '@linode/utilities';
 import { waitForElementToBeRemoved } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import * as React from 'react';
@@ -12,23 +11,12 @@ import ImagesLanding from './ImagesLanding';
 
 const queryMocks = vi.hoisted(() => ({
   usePermissions: vi.fn().mockReturnValue({ data: { create_image: false } }),
-  useQueryWithPermissions: vi.fn().mockReturnValue({}),
-  useLinodesPermissionsCheck: vi.fn().mockReturnValue({}),
 }));
 
 vi.mock('src/features/IAM/hooks/usePermissions', () => ({
   usePermissions: queryMocks.usePermissions,
-  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
 }));
 
-vi.mock('../utils.ts', async () => {
-  const actual = await vi.importActual('../utils');
-  return {
-    ...actual,
-    useLinodesPermissionsCheck: queryMocks.useLinodesPermissionsCheck,
-  };
-});
-
 beforeAll(() => mockMatchMedia());
 
 const loadingTestId = 'circle-progress';
@@ -202,9 +190,6 @@ describe('Images Landing Table', () => {
 
   it('should allow deploying to a new Linode', async () => {
     const image = imageFactory.build();
-    queryMocks.useLinodesPermissionsCheck.mockReturnValue({
-      availableLinodes: [linodeFactory.build()],
-    });
 
     server.use(
       http.get('*/images', ({ request }) => {
@@ -302,9 +287,6 @@ describe('Images Landing Table', () => {
       id: 'private/99999',
       label: 'vi-test-image',
     });
-    queryMocks.useLinodesPermissionsCheck.mockReturnValue({
-      availableLinodes: [],
-    });
 
     server.use(
       http.get('*/images', ({ request }) => {
diff --git a/packages/manager/src/features/Images/ImagesLanding/RebuildImageDrawer.test.tsx b/packages/manager/src/features/Images/ImagesLanding/RebuildImageDrawer.test.tsx
index d7f96187e5c..df7ec5fb9b8 100644
--- a/packages/manager/src/features/Images/ImagesLanding/RebuildImageDrawer.test.tsx
+++ b/packages/manager/src/features/Images/ImagesLanding/RebuildImageDrawer.test.tsx
@@ -3,8 +3,6 @@ import userEvent from '@testing-library/user-event';
 import React from 'react';
 
 import { imageFactory } from 'src/factories';
-import { makeResourcePage } from 'src/mocks/serverHandlers';
-import { http, HttpResponse, server } from 'src/mocks/testServer';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { RebuildImageDrawer } from './RebuildImageDrawer';
@@ -21,8 +19,9 @@ const props = {
 const mockNavigate = vi.fn();
 
 const queryMocks = vi.hoisted(() => ({
+  useAllLinodesQuery: vi.fn().mockReturnValue({}),
   useNavigate: vi.fn(() => mockNavigate),
-  useQueryWithPermissions: vi.fn().mockReturnValue({}),
+  useGetAllUserEntitiesByPermission: vi.fn().mockReturnValue({}),
 }));
 
 vi.mock('@tanstack/react-router', async () => {
@@ -33,14 +32,23 @@ vi.mock('@tanstack/react-router', async () => {
   };
 });
 
-vi.mock('src/features/IAM/hooks/usePermissions', () => ({
-  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
+vi.mock('@linode/queries', async () => {
+  const actual = await vi.importActual('@linode/queries');
+  return {
+    ...actual,
+    useAllLinodesQuery: queryMocks.useAllLinodesQuery,
+  };
+});
+
+vi.mock('src/features/IAM/hooks/useGetAllUserEntitiesByPermission', () => ({
+  useGetAllUserEntitiesByPermission:
+    queryMocks.useGetAllUserEntitiesByPermission,
 }));
 
 describe('RebuildImageDrawer', () => {
   beforeEach(() => {
-    vi.mocked(queryMocks.useQueryWithPermissions).mockReturnValue({
-      loading: false,
+    queryMocks.useGetAllUserEntitiesByPermission.mockReturnValue({
+      isLoading: false,
     });
   });
 
@@ -55,16 +63,14 @@ describe('RebuildImageDrawer', () => {
   });
 
   it('should allow selecting a Linode to rebuild', async () => {
+    queryMocks.useAllLinodesQuery.mockReturnValue({
+      isLoading: false,
+      data: linodeFactory.buildList(5),
+    });
     const { findByText, getByRole, getByText } = renderWithTheme(
       <RebuildImageDrawer {...props} />
     );
 
-    server.use(
-      http.get('*/linode/instances', () => {
-        return HttpResponse.json(makeResourcePage(linodeFactory.buildList(5)));
-      })
-    );
-
     await userEvent.click(getByRole('combobox'));
     await userEvent.click(await findByText('linode-1'));
     await userEvent.click(getByText('Rebuild Linode'));
diff --git a/packages/manager/src/features/Images/ImagesLanding/RebuildImageDrawer.tsx b/packages/manager/src/features/Images/ImagesLanding/RebuildImageDrawer.tsx
index f4366745cda..e84fb7fa223 100644
--- a/packages/manager/src/features/Images/ImagesLanding/RebuildImageDrawer.tsx
+++ b/packages/manager/src/features/Images/ImagesLanding/RebuildImageDrawer.tsx
@@ -1,4 +1,3 @@
-import { useAllLinodesQuery } from '@linode/queries';
 import { LinodeSelect } from '@linode/shared';
 import { ActionsPanel, Divider, Drawer, Notice, Stack } from '@linode/ui';
 import { useNavigate } from '@tanstack/react-router';
@@ -6,7 +5,7 @@ import * as React from 'react';
 import { Controller, useForm } from 'react-hook-form';
 
 import { DescriptionList } from 'src/components/DescriptionList/DescriptionList';
-import { useQueryWithPermissions } from 'src/features/IAM/hooks/usePermissions';
+import { useGetAllUserEntitiesByPermission } from 'src/features/IAM/hooks/useGetAllUserEntitiesByPermission';
 import { REBUILD_LINODE_IMAGE_PARAM_NAME } from 'src/features/Linodes/LinodesDetail/LinodeRebuild/utils';
 
 import type { APIError, Image, Linode } from '@linode/api-v4';
@@ -23,12 +22,16 @@ export const RebuildImageDrawer = (props: Props) => {
   const { image, imageError, isFetching, onClose, open } = props;
 
   const navigate = useNavigate();
-  const { data: linodes, isLoading } = useQueryWithPermissions<Linode>(
-    useAllLinodesQuery({}, {}, open),
-    'linode',
-    ['rebuild_linode', 'view_linode'],
-    open
-  );
+  const {
+    data: linodes,
+    filter: linodeFilter,
+    isLoading,
+    error: linodeError,
+  } = useGetAllUserEntitiesByPermission<Linode>({
+    entityType: 'linode',
+    permission: 'rebuild_linode',
+    enabled: open,
+  });
   const availableLinodes = linodes?.map((linode) => linode.id);
 
   const { control, formState, handleSubmit, reset } = useForm<{
@@ -77,6 +80,10 @@ export const RebuildImageDrawer = (props: Props) => {
           />
         )}
 
+        {linodeError && (
+          <Notice data-qa-notice text={linodeError[0].reason} variant="error" />
+        )}
+
         <DescriptionList
           items={[{ description: image?.label ?? '', title: 'Image' }]}
         />
@@ -90,6 +97,7 @@ export const RebuildImageDrawer = (props: Props) => {
             <LinodeSelect
               clearable={true}
               errorText={fieldState.error?.message}
+              filter={linodeFilter}
               onBlur={field.onBlur}
               onSelectionChange={(linode) => {
                 field.onChange(linode?.id);
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/LinodeBackups.test.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/LinodeBackups.test.tsx
index b1d843ac6ee..d54baae76aa 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/LinodeBackups.test.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/LinodeBackups.test.tsx
@@ -10,7 +10,7 @@ import type { LinodeBackupsResponse } from '@linode/api-v4';
 
 const queryMocks = vi.hoisted(() => ({
   useParams: vi.fn(),
-  userPermissions: vi.fn(() => ({
+  usePermissions: vi.fn(() => ({
     data: {
       list_linode_backups: true,
       create_linode_backup_snapshot: true,
@@ -19,11 +19,6 @@ const queryMocks = vi.hoisted(() => ({
       restore_linode_backup: true,
     },
   })),
-  useQueryWithPermissions: vi.fn().mockReturnValue({
-    data: [],
-    isLoading: false,
-    isError: false,
-  }),
 }));
 
 vi.mock('@tanstack/react-router', async () => {
@@ -35,8 +30,7 @@ vi.mock('@tanstack/react-router', async () => {
 });
 
 vi.mock('src/features/IAM/hooks/usePermissions', () => ({
-  usePermissions: queryMocks.userPermissions,
-  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
+  usePermissions: queryMocks.usePermissions,
 }));
 
 describe('LinodeBackups', () => {
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/RestoreToLinodeDrawer.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/RestoreToLinodeDrawer.tsx
index bcc7194f753..adab8a480b9 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/RestoreToLinodeDrawer.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/RestoreToLinodeDrawer.tsx
@@ -1,5 +1,4 @@
 import {
-  useAllLinodesQuery,
   useLinodeBackupRestoreMutation,
   useLinodeQuery,
 } from '@linode/queries';
@@ -17,7 +16,7 @@ import { useFormik } from 'formik';
 import { useSnackbar } from 'notistack';
 import * as React from 'react';
 
-import { useQueryWithPermissions } from 'src/features/IAM/hooks/usePermissions';
+import { useGetAllUserEntitiesByPermission } from 'src/features/IAM/hooks/useGetAllUserEntitiesByPermission';
 import { useEventsPollingActions } from 'src/queries/events/events';
 import { getErrorMap } from 'src/utilities/errorUtils';
 
@@ -37,19 +36,22 @@ export const RestoreToLinodeDrawer = (props: Props) => {
 
   const { checkForNewEvents } = useEventsPollingActions();
 
-  const query = useAllLinodesQuery(
-    {},
-    {
-      region: linode?.region,
-    },
-    open && linode !== undefined
-  );
-
+  const regionFilter = {
+    region: linode?.region,
+  };
   const {
-    data: linodes,
-    error: linodeError,
-    isLoading: linodesLoading,
-  } = useQueryWithPermissions<Linode>(query, 'linode', ['update_linode']);
+    data: availableLinodes,
+    isLoading: availableLinodesLoading,
+    error: availableLinodesError,
+  } = useGetAllUserEntitiesByPermission<Linode>({
+    entityType: 'linode',
+    permission: 'update_linode',
+    enabled: open,
+    filter: regionFilter,
+  });
+  const linodes = availableLinodes?.filter(
+    (l: Linode) => l.region === linode?.region
+  );
 
   const {
     error,
@@ -111,9 +113,9 @@ export const RestoreToLinodeDrawer = (props: Props) => {
         <Autocomplete
           autoHighlight
           disableClearable
-          errorText={linodeError?.[0].reason ?? errorMap.linode_id}
+          errorText={availableLinodesError?.[0].reason ?? errorMap.linode_id}
           label="Linode"
-          loading={linodesLoading}
+          loading={availableLinodesLoading}
           onChange={(_, selected) =>
             formik.setFieldValue('linode_id', selected?.value)
           }
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/AddFirewallForm.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/AddFirewallForm.tsx
index 1090d86c5b1..4270b696c84 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/AddFirewallForm.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/AddFirewallForm.tsx
@@ -1,8 +1,5 @@
 import { yupResolver } from '@hookform/resolvers/yup';
-import {
-  useAddFirewallDeviceMutation,
-  useAllFirewallsQuery,
-} from '@linode/queries';
+import { useAddFirewallDeviceMutation } from '@linode/queries';
 import { ActionsPanel, Stack, Typography } from '@linode/ui';
 import { useSnackbar } from 'notistack';
 import React from 'react';
@@ -13,7 +10,7 @@ import { number, object } from 'yup';
 import { Link } from 'src/components/Link';
 import { FirewallSelect } from 'src/features/Firewalls/components/FirewallSelect';
 import { formattedTypes } from 'src/features/Firewalls/FirewallDetail/Devices/constants';
-import { useQueryWithPermissions } from 'src/features/IAM/hooks/usePermissions';
+import { useGetAllUserEntitiesByPermission } from 'src/features/IAM/hooks/useGetAllUserEntitiesByPermission';
 
 import type { Firewall, FirewallDeviceEntityType } from '@linode/api-v4';
 
@@ -39,12 +36,11 @@ export const AddFirewallForm = (props: Props) => {
 
   const { mutateAsync } = useAddFirewallDeviceMutation();
 
-  const {
-    data: availableFirewalls,
-    isLoading: isLoadingAllAvailableFirewalls,
-  } = useQueryWithPermissions<Firewall>(useAllFirewallsQuery(), 'firewall', [
-    'create_firewall_device',
-  ]);
+  const { data: availableFirewalls, isLoading: availableFirewallsLoading } =
+    useGetAllUserEntitiesByPermission<Firewall>({
+      entityType: 'firewall',
+      permission: 'create_firewall_device',
+    });
 
   const form = useForm<Values>({
     resolver: yupResolver(schema) as Resolver<Values>,
@@ -74,12 +70,12 @@ export const AddFirewallForm = (props: Props) => {
           name="firewallId"
           render={({ field, fieldState }) => (
             <FirewallSelect
-              disabled={isLoadingAllAvailableFirewalls}
+              disabled={availableFirewallsLoading}
               errorText={fieldState.error?.message}
               label="Firewall"
-              loading={isLoadingAllAvailableFirewalls}
+              loading={availableFirewallsLoading}
               onChange={(e, value) => field.onChange(value?.id)}
-              options={availableFirewalls}
+              options={availableFirewalls ?? []}
               placeholder="Select a Firewall"
               textFieldProps={{
                 inputRef: field.ref,
diff --git a/packages/manager/src/features/NodeBalancers/NodeBalancerSelect.tsx b/packages/manager/src/features/NodeBalancers/NodeBalancerSelect.tsx
index adac3c1aacb..d962ced3312 100644
--- a/packages/manager/src/features/NodeBalancers/NodeBalancerSelect.tsx
+++ b/packages/manager/src/features/NodeBalancers/NodeBalancerSelect.tsx
@@ -5,7 +5,7 @@ import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
 import * as React from 'react';
 import type { JSX } from 'react';
 
-import { useQueryWithPermissions } from '../IAM/hooks/usePermissions';
+import { useGetAllUserEntitiesByPermission } from '../IAM/hooks/useGetAllUserEntitiesByPermission';
 
 import type { APIError, NodeBalancer } from '@linode/api-v4';
 import type { SxProps, Theme } from '@mui/material/styles';
@@ -101,15 +101,14 @@ export const NodeBalancerSelect = (
     data: availableNodebalancers,
     error: availableNodebalancersError,
     isLoading: availableNodebalancersLoading,
-  } = useQueryWithPermissions<NodeBalancer>(
-    useAllNodeBalancersQuery(Boolean(optionsFilter)),
-    'nodebalancer',
-    ['update_nodebalancer'],
-    Boolean(optionsFilter)
-  );
+  } = useGetAllUserEntitiesByPermission<NodeBalancer>({
+    entityType: 'nodebalancer',
+    permission: 'update_nodebalancer',
+    enabled: Boolean(optionsFilter),
+  });
 
   const nodebalancers = optionsFilter
-    ? availableNodebalancers.filter(optionsFilter)
+    ? availableNodebalancers?.filter(optionsFilter)
     : data;
 
   React.useEffect(() => {
@@ -132,7 +131,7 @@ export const NodeBalancerSelect = (
       disabled={disabled}
       disablePortal={true}
       errorText={
-        (error?.[0].reason || availableNodebalancersError?.[0].reason) ??
+        (error?.[0].reason || availableNodebalancersError?.[0]?.reason) ??
         errorText
       }
       getOptionLabel={(nodebalancer: NodeBalancer) =>
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetActionMenu.test.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetActionMenu.test.tsx
index 3a30c590f83..7f44c48971f 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetActionMenu.test.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetActionMenu.test.tsx
@@ -14,18 +14,9 @@ const queryMocks = vi.hoisted(() => ({
       delete_vpc: true,
     },
   })),
-  useQueryWithPermissions: vi.fn().mockReturnValue({
-    data: [
-      { id: 1, label: 'linode-1' },
-      { id: 2, label: 'linode-2' },
-    ],
-    isLoading: false,
-    isError: false,
-  }),
 }));
 vi.mock('src/features/IAM/hooks/usePermissions', () => ({
   usePermissions: queryMocks.userPermissions,
-  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
 }));
 afterEach(() => {
   vi.clearAllMocks();
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetAssignLinodesDrawer.test.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetAssignLinodesDrawer.test.tsx
index a920de4eaea..c459d13cdab 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetAssignLinodesDrawer.test.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetAssignLinodesDrawer.test.tsx
@@ -19,12 +19,10 @@ const queryMocks = vi.hoisted(() => ({
 
 const iamMocks = vi.hoisted(() => ({
   usePermissions: vi.fn().mockReturnValue({ data: { update_vpc: true } }),
-  useQueryWithPermissions: vi.fn().mockReturnValue({
+  useGetAllUserEntitiesByPermission: vi.fn().mockReturnValue({
     data: [],
     isLoading: false,
     error: null,
-    isError: false,
-    hasFiltered: false,
   }),
 }));
 
@@ -38,7 +36,10 @@ vi.mock('@linode/queries', async () => {
 
 vi.mock('src/features/IAM/hooks/usePermissions', () => ({
   usePermissions: iamMocks.usePermissions,
-  useQueryWithPermissions: iamMocks.useQueryWithPermissions,
+}));
+
+vi.mock('src/features/IAM/hooks/useGetAllUserEntitiesByPermission', () => ({
+  useGetAllUserEntitiesByPermission: iamMocks.useGetAllUserEntitiesByPermission,
 }));
 
 const props = {
@@ -66,12 +67,10 @@ describe('Subnet Assign Linodes Drawer', () => {
 
   beforeEach(() => {
     // Set up the default mock to return the linode
-    iamMocks.useQueryWithPermissions.mockReturnValue({
+    iamMocks.useGetAllUserEntitiesByPermission.mockReturnValue({
       data: [linode],
       isLoading: false,
       error: null,
-      isError: false,
-      hasFiltered: false,
     });
   });
 
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetAssignLinodesDrawer.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetAssignLinodesDrawer.tsx
index 4b8df610e09..89d105ae4c8 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetAssignLinodesDrawer.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetAssignLinodesDrawer.tsx
@@ -28,7 +28,7 @@ import { DownloadCSV } from 'src/components/DownloadCSV/DownloadCSV';
 import { Link } from 'src/components/Link';
 import { RemovableSelectionsListTable } from 'src/components/RemovableSelectionsList/RemovableSelectionsListTable';
 import { FirewallSelect } from 'src/features/Firewalls/components/FirewallSelect';
-import { useQueryWithPermissions } from 'src/features/IAM/hooks/usePermissions';
+import { useGetAllUserEntitiesByPermission } from 'src/features/IAM/hooks/useGetAllUserEntitiesByPermission';
 import { getDefaultFirewallForInterfacePurpose } from 'src/features/Linodes/LinodeCreate/Networking/utilities';
 import {
   REMOVABLE_SELECTIONS_LINODES_TABLE_HEADERS,
@@ -162,20 +162,27 @@ export const SubnetAssignLinodesDrawer = (
   };
 
   // TODO: change update_linode to create_linode_config_profile_interface once it's available
-  const { data: filteredLinodes, isLoading: isLoadingFilteredLinodes } =
-    useQueryWithPermissions<Linode>(query, 'linode', ['update_linode'], open);
+  const {
+    data: availableLinodes,
+    filter: availableLinodesFilter,
+    isLoading: availableLinodesLoading,
+  } = useGetAllUserEntitiesByPermission<Linode>({
+    entityType: 'linode',
+    permission: 'update_linode',
+    enabled: open,
+  });
 
-  const userCanAssignLinodes = filteredLinodes?.length > 0;
+  const userCanAssignLinodes = availableLinodes && availableLinodes.length > 0;
 
   const linodeOptionsToAssign = React.useMemo(() => {
     // We need to filter to the linodes from this region that are not already
     // assigned to this subnet
-    if (!filteredLinodes) return [];
+    if (!availableLinodes) return [];
 
-    return filteredLinodes?.filter((linode) => {
+    return availableLinodes?.filter((linode) => {
       return !subnet?.linodes.some((linodeInfo) => linodeInfo.id === linode.id);
     });
-  }, [subnet, filteredLinodes]);
+  }, [subnet, availableLinodes]);
 
   // Determine the configId based on the number of configurations
   function getConfigId(inputs: {
@@ -565,7 +572,7 @@ export const SubnetAssignLinodesDrawer = (
   return (
     <Drawer
       error={subnetError}
-      isFetching={isFetching || isLoadingFilteredLinodes}
+      isFetching={isFetching || availableLinodesLoading}
       onClose={handleOnClose}
       open={open}
       title={`Assign Linodes to subnet: ${subnet?.label ?? 'Unknown'}`}
@@ -579,6 +586,7 @@ export const SubnetAssignLinodesDrawer = (
         <LinodeSelect
           checkIsOptionEqualToValue
           disabled={!userCanAssignLinodes}
+          filter={availableLinodesFilter}
           label="Linode"
           onSelectionChange={(selected) => {
             setFieldValue('selectedLinode', selected);
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetEditDrawer.test.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetEditDrawer.test.tsx
index 56f79eb3363..440872f4a6f 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetEditDrawer.test.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetEditDrawer.test.tsx
@@ -11,16 +11,12 @@ const queryMocks = vi.hoisted(() => ({
       update_vpc: true,
     },
   })),
-  useQueryWithPermissions: vi.fn().mockReturnValue({
-    data: [],
-    isLoading: false,
-    isError: false,
-  }),
 }));
+
 vi.mock('src/features/IAM/hooks/usePermissions', () => ({
   usePermissions: queryMocks.userPermissions,
-  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
 }));
+
 describe('SubnetEditDrawer', () => {
   const props = {
     isFetching: false,
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeActionMenu.test.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeActionMenu.test.tsx
index 5973b8a1452..6ec8c4049ae 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeActionMenu.test.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeActionMenu.test.tsx
@@ -18,15 +18,9 @@ const queryMocks = vi.hoisted(() => ({
       update_vpc: true,
     },
   })),
-  useQueryWithPermissions: vi.fn().mockReturnValue({
-    data: [],
-    isLoading: false,
-    isError: false,
-  }),
 }));
 vi.mock('src/features/IAM/hooks/usePermissions', () => ({
   usePermissions: queryMocks.userPermissions,
-  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
 }));
 const props = {
   handlePowerActionsLinode: vi.fn(),
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetUnassignLinodesDrawer.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetUnassignLinodesDrawer.tsx
index 82fad4c4878..d93c05ee32f 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetUnassignLinodesDrawer.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetUnassignLinodesDrawer.tsx
@@ -1,4 +1,4 @@
-import { linodeQueries, useAllLinodesQuery } from '@linode/queries';
+import { linodeQueries } from '@linode/queries';
 import {
   ActionsPanel,
   Autocomplete,
@@ -15,7 +15,7 @@ import * as React from 'react';
 
 import { DownloadCSV } from 'src/components/DownloadCSV/DownloadCSV';
 import { RemovableSelectionsListTable } from 'src/components/RemovableSelectionsList/RemovableSelectionsListTable';
-import { useQueryWithPermissions } from 'src/features/IAM/hooks/usePermissions';
+import { useGetAllUserEntitiesByPermission } from 'src/features/IAM/hooks/useGetAllUserEntitiesByPermission';
 import { REMOVABLE_SELECTIONS_LINODES_TABLE_HEADERS } from 'src/features/VPCs/constants';
 import { useUnassignLinode } from 'src/hooks/useUnassignLinode';
 import { useVPCDualStack } from 'src/hooks/useVPCDualStack';
@@ -103,28 +103,28 @@ export const SubnetUnassignLinodesDrawer = React.memo(
     // 1. We need to get all the linodes.
     // TODO: change to 'delete_linode_config_profile_interface' once it's available
     const {
-      data: filteredLinodes,
-      error: linodesError,
-      isLoading: isLoadingFilteredLinodes,
+      data: availableLinodes,
+      isLoading: availableLinodesLoading,
+      error: availableLinodesError,
       refetch: getCSVData,
-    } = useQueryWithPermissions<Linode>(
-      useAllLinodesQuery({}, {}, open),
-      'linode',
-      ['delete_linode'],
-      open
-    );
-    const userCanUnassignLinodes = filteredLinodes?.length > 0;
+    } = useGetAllUserEntitiesByPermission<Linode>({
+      entityType: 'linode',
+      permission: 'delete_linode',
+      enabled: open,
+    });
+
+    const userCanUnassignLinodes =
+      availableLinodes && availableLinodes?.length > 0;
 
     const linodeOptionsToUnassign = React.useMemo(() => {
       // 2. We need to filter only the linodes that are assigned to the subnet.
-      if (!filteredLinodes) return [];
-
-      return filteredLinodes?.filter((linode) => {
+      if (!availableLinodes) return [];
+      return availableLinodes?.filter((linode) => {
         return subnetLinodeIds?.some(
           (linodeInfo) => linodeInfo.id === linode.id
         );
       });
-    }, [subnetLinodeIds, filteredLinodes]);
+    }, [subnetLinodeIds, availableLinodes]);
 
     // 3. When a linode is selected, we need to get the VPC interface to unassign.
     const getVPCInterface = React.useCallback(
@@ -342,9 +342,13 @@ export const SubnetUnassignLinodesDrawer = React.memo(
             {!singleLinodeToBeUnassigned && (
               <Autocomplete
                 disabled={!userCanUnassignLinodes}
-                errorText={linodesError ? linodesError[0].reason : undefined}
+                errorText={
+                  availableLinodesError
+                    ? availableLinodesError[0].reason
+                    : undefined
+                }
                 label="Linodes"
-                loading={isLoadingFilteredLinodes}
+                loading={availableLinodesLoading}
                 multiple
                 onChange={(_, value) => {
                   setSelectedLinodes(value);
diff --git a/packages/manager/src/features/VPCs/VPCDetail/VPCDetail.test.tsx b/packages/manager/src/features/VPCs/VPCDetail/VPCDetail.test.tsx
index 1a708ced2b6..92e34e6e2a4 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/VPCDetail.test.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/VPCDetail.test.tsx
@@ -22,11 +22,6 @@ const queryMocks = vi.hoisted(() => ({
       delete_vpc: true,
     },
   })),
-  useQueryWithPermissions: vi.fn().mockReturnValue({
-    data: [],
-    isLoading: false,
-    isError: false,
-  }),
 }));
 
 vi.mock('@linode/queries', async () => {
@@ -52,8 +47,8 @@ vi.mock('@tanstack/react-router', async () => {
 
 vi.mock('src/features/IAM/hooks/usePermissions', () => ({
   usePermissions: queryMocks.userPermissions,
-  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
 }));
+
 beforeAll(() => mockMatchMedia());
 
 describe('VPC Detail Summary section', () => {
diff --git a/packages/manager/src/features/VPCs/VPCDetail/VPCSubnetsTable.test.tsx b/packages/manager/src/features/VPCs/VPCDetail/VPCSubnetsTable.test.tsx
index cb3cefbb795..5959af08e95 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/VPCSubnetsTable.test.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/VPCSubnetsTable.test.tsx
@@ -23,11 +23,6 @@ const queryMocks = vi.hoisted(() => ({
       create_vpc_subnet: true,
     },
   })),
-  useQueryWithPermissions: vi.fn().mockReturnValue({
-    data: [],
-    isLoading: false,
-    isError: false,
-  }),
 }));
 
 vi.mock('@tanstack/react-router', async () => {
@@ -48,8 +43,8 @@ vi.mock('@linode/queries', async () => {
 });
 vi.mock('src/features/IAM/hooks/usePermissions', () => ({
   usePermissions: queryMocks.userPermissions,
-  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
 }));
+
 const loadingTestId = 'circle-progress';
 
 describe('VPC Subnets table', () => {
diff --git a/packages/manager/src/features/Volumes/VolumeDrawers/AttachVolumeDrawer/AttachVolumeDrawer.tsx b/packages/manager/src/features/Volumes/VolumeDrawers/AttachVolumeDrawer/AttachVolumeDrawer.tsx
index 211279fdbd2..c8391c65a14 100644
--- a/packages/manager/src/features/Volumes/VolumeDrawers/AttachVolumeDrawer/AttachVolumeDrawer.tsx
+++ b/packages/manager/src/features/Volumes/VolumeDrawers/AttachVolumeDrawer/AttachVolumeDrawer.tsx
@@ -16,13 +16,14 @@ import { number, object } from 'yup';
 
 import { BLOCK_STORAGE_ENCRYPTION_SETTING_IMMUTABLE_COPY } from 'src/components/Encryption/constants';
 import { useIsBlockStorageEncryptionFeatureEnabled } from 'src/components/Encryption/utils';
+import { useGetAllUserEntitiesByPermission } from 'src/features/IAM/hooks/useGetAllUserEntitiesByPermission';
 import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
 import { useEventsPollingActions } from 'src/queries/events/events';
 import { getAPIErrorFor } from 'src/utilities/getAPIErrorFor';
 
 import { ConfigSelect } from '../VolumeDrawer/ConfigSelect';
 
-import type { Volume } from '@linode/api-v4';
+import type { Linode, Volume } from '@linode/api-v4';
 
 interface Props {
   isFetching?: boolean;
@@ -53,6 +54,21 @@ export const AttachVolumeDrawer = React.memo((props: Props) => {
     volume?.id
   );
 
+  const regionFilter = {
+    region: volume?.region,
+  };
+
+  const {
+    data: availableLinodes,
+    filter: availableLinodesFilter,
+    isLoading: availableLinodesLoading,
+  } = useGetAllUserEntitiesByPermission<Linode>({
+    entityType: 'linode',
+    permission: 'update_linode',
+    enabled: open,
+    filter: regionFilter,
+  });
+
   const canAttachVolume = permissions?.attach_volume;
 
   const { error, mutateAsync: attachVolume } = useAttachVolumeMutation();
@@ -124,13 +140,15 @@ export const AttachVolumeDrawer = React.memo((props: Props) => {
               ? formik.errors.linode_id
               : linodeError
           }
-          filter={{ region: volume?.region }}
+          filter={availableLinodesFilter}
+          loading={availableLinodesLoading}
           noMarginTop
           onSelectionChange={(linode) => {
             if (linode !== null) {
               formik.setFieldValue('linode_id', linode.id);
             }
           }}
+          options={availableLinodes ?? []}
           value={formik.values.linode_id}
         />
         {!linodeError && (
diff --git a/packages/manager/src/features/Volumes/VolumeDrawers/VolumeDrawer/VolumeSelect.tsx b/packages/manager/src/features/Volumes/VolumeDrawers/VolumeDrawer/VolumeSelect.tsx
index 7dbf65e0061..2a8ecba8319 100644
--- a/packages/manager/src/features/Volumes/VolumeDrawers/VolumeDrawer/VolumeSelect.tsx
+++ b/packages/manager/src/features/Volumes/VolumeDrawers/VolumeDrawer/VolumeSelect.tsx
@@ -1,9 +1,9 @@
-import { useAllVolumesQuery, useVolumeQuery } from '@linode/queries';
-import { Autocomplete } from '@linode/ui';
+import { useVolumeQuery } from '@linode/queries';
+import { Autocomplete, Notice } from '@linode/ui';
 import { useDebouncedValue } from '@linode/utilities';
 import * as React from 'react';
 
-import { useQueryWithPermissions } from 'src/features/IAM/hooks/usePermissions';
+import { useGetAllUserEntitiesByPermission } from 'src/features/IAM/hooks/useGetAllUserEntitiesByPermission';
 
 import type { Volume } from '@linode/api-v4';
 
@@ -11,7 +11,7 @@ interface Props {
   disabled?: boolean;
   error?: string;
   name: string;
-  onBlur: (e: any) => void;
+  onBlur: (e: React.FocusEvent<HTMLInputElement>) => void;
   onChange: (volumeId: null | number) => void;
   region?: string;
   value: number;
@@ -19,18 +19,21 @@ interface Props {
 
 export const VolumeSelect = (props: Props) => {
   const { disabled, error, name, onBlur, onChange, region, value } = props;
-
   const [inputValue, setInputValue] = React.useState<string>('');
 
-  const query = useAllVolumesQuery(
-    {},
-    {
-      ...(region ? { region } : {}),
-    }
-  );
+  const regionFilter = {
+    region: region ?? undefined,
+  };
 
-  const { data: availableVolumes, isLoading: isAvailableVolumesLoading } =
-    useQueryWithPermissions<Volume>(query, 'volume', ['attach_volume']);
+  const {
+    data: availableVolumes,
+    isLoading: isAvailableVolumesLoading,
+    error: availableVolumesError,
+  } = useGetAllUserEntitiesByPermission<Volume>({
+    entityType: 'volume',
+    filter: regionFilter,
+    permission: 'attach_volume',
+  });
 
   const debouncedInputValue = useDebouncedValue(inputValue);
 
@@ -72,33 +75,38 @@ export const VolumeSelect = (props: Props) => {
     filteredVolumes?.find((option) => option.id === value) ?? null;
 
   return (
-    <Autocomplete
-      disabled={disabled || isAvailableVolumesLoading}
-      errorText={error}
-      filterOptions={(filteredVolumes) => filteredVolumes}
-      helperText={
-        region && "Only volumes in this Linode's region are attachable."
-      }
-      id={name}
-      inputValue={selectedVolume ? selectedVolume.label : inputValue}
-      isOptionEqualToValue={(option) => option.id === selectedVolume?.id}
-      label="Volume"
-      loading={isLoadingSelected || isAvailableVolumesLoading}
-      onBlur={onBlur}
-      onChange={(_, value) => {
-        setInputValue('');
-        onChange(value?.id ?? -1);
-      }}
-      onInputChange={(_, value, reason) => {
-        if (reason === 'input') {
-          setInputValue(value);
-        } else {
-          setInputValue('');
+    <>
+      {availableVolumesError && (
+        <Notice text={availableVolumesError[0].reason} variant="error" />
+      )}
+      <Autocomplete
+        disabled={disabled || isAvailableVolumesLoading}
+        errorText={error}
+        filterOptions={(filteredVolumes) => filteredVolumes}
+        helperText={
+          region && "Only volumes in this Linode's region are attachable."
         }
-      }}
-      options={filteredVolumes ?? []}
-      placeholder="Select a Volume"
-      value={selectedVolume}
-    />
+        id={name}
+        inputValue={selectedVolume ? selectedVolume.label : inputValue}
+        isOptionEqualToValue={(option) => option.id === selectedVolume?.id}
+        label="Volume"
+        loading={isLoadingSelected || isAvailableVolumesLoading}
+        onBlur={onBlur}
+        onChange={(_, value) => {
+          setInputValue('');
+          onChange(value?.id ?? -1);
+        }}
+        onInputChange={(_, value, reason) => {
+          if (reason === 'input') {
+            setInputValue(value);
+          } else {
+            setInputValue('');
+          }
+        }}
+        options={filteredVolumes ?? []}
+        placeholder="Select a Volume"
+        value={selectedVolume}
+      />
+    </>
   );
 };
diff --git a/packages/queries/src/iam/iam.ts b/packages/queries/src/iam/iam.ts
index 0d6c1fac998..97fe41fa5f4 100644
--- a/packages/queries/src/iam/iam.ts
+++ b/packages/queries/src/iam/iam.ts
@@ -83,13 +83,34 @@ export const useGetUserEntitiesByPermissionQuery = ({
   username,
   entityType,
   permission,
+  enabled = true,
+}: GetEntitiesByPermissionParams) => {
+  const { data: profile } = useProfile();
+  return useQuery<EntityByPermission[], APIError[]>({
+    ...iamQueries
+      .user(username ?? '')
+      ._ctx.getPaginatedEntitiesByPermission(entityType, permission),
+    enabled:
+      Boolean(username && entityType && permission) &&
+      profile?.restricted &&
+      enabled,
+  });
+};
+
+export const useGetAllUserEntitiesByPermissionQuery = ({
+  username,
+  entityType,
+  permission,
+  enabled = true,
 }: GetEntitiesByPermissionParams) => {
   const { data: profile } = useProfile();
   return useQuery<EntityByPermission[], APIError[]>({
     ...iamQueries
       .user(username ?? '')
-      ._ctx.getEntitiesByPermission(entityType, permission),
+      ._ctx.getAllEntitiesByPermission(entityType, permission),
     enabled:
-      Boolean(username && entityType && permission) && profile?.restricted,
+      Boolean(username && entityType && permission) &&
+      profile?.restricted &&
+      enabled,
   });
 };
diff --git a/packages/queries/src/iam/keys.ts b/packages/queries/src/iam/keys.ts
index cbe70927295..41068e0d9d9 100644
--- a/packages/queries/src/iam/keys.ts
+++ b/packages/queries/src/iam/keys.ts
@@ -5,9 +5,15 @@ import {
   getUserEntityPermissions,
   getUserRoles,
 } from '@linode/api-v4';
+import { getAll } from '@linode/utilities';
 import { createQueryKeys } from '@lukemorales/query-key-factory';
 
-import type { AccessType, PermissionType } from '@linode/api-v4';
+import type {
+  AccessType,
+  EntityByPermission,
+  GetEntitiesByPermissionParams,
+  PermissionType,
+} from '@linode/api-v4';
 
 export const iamQueries = createQueryKeys('iam', {
   user: (username: string) => ({
@@ -27,7 +33,7 @@ export const iamQueries = createQueryKeys('iam', {
         queryFn: () => getUserEntityPermissions(username, entityType, entityId),
         queryKey: [entityType, entityId],
       }),
-      getEntitiesByPermission: (
+      getPaginatedEntitiesByPermission: (
         entityType: AccessType,
         permission: PermissionType,
       ) => ({
@@ -36,7 +42,19 @@ export const iamQueries = createQueryKeys('iam', {
             username,
             entityType,
             permission,
-          }),
+          }).then((res) => res.data ?? []),
+        queryKey: [entityType, permission],
+      }),
+      getAllEntitiesByPermission: (
+        entityType: AccessType,
+        permission: PermissionType,
+      ) => ({
+        queryFn: () =>
+          getAllUserEntitiesByPermission({
+            username,
+            entityType,
+            permission,
+          }).then((res) => res.data ?? []),
         queryKey: [entityType, permission],
       }),
     },
@@ -47,3 +65,18 @@ export const iamQueries = createQueryKeys('iam', {
     queryKey: null,
   },
 });
+
+export const getAllUserEntitiesByPermission = ({
+  username,
+  entityType,
+  permission,
+}: GetEntitiesByPermissionParams) =>
+  getAll<EntityByPermission>((params, filter) =>
+    getUserEntitiesByPermission({
+      username,
+      entityType,
+      permission,
+      params,
+      filter,
+    }),
+  )();

From 10bfefb4d57149fdccfdd067f25a2d18a59624b4 Mon Sep 17 00:00:00 2001
From: Ankita <ankitaan@akamai.com>
Date: Sun, 30 Nov 2025 18:44:24 +0530
Subject: [PATCH 53/91] upcoming: [DI-28504] - Add tooltip for clusters filter
 in lke and fix preferences bug in nodebalancers filter (#13141)

* upcoming: [DI-28504] - Add tooltip for clusters filter in lke

* upcoming: [DI-28504] - Update test case

* upcoming: [DI-28504] - Fix nodebalancers preferences bug

* upcoming: [DI-28504] - Remove typo

* upcoming: [DI-28504] - Add changeset

---------

Co-authored-by: venkatmano-akamai <vmangalr@akamai.com>
---
 .../pr-13141-upcoming-features-1764311100780.md  |  5 +++++
 .../src/features/CloudPulse/Utils/constants.ts   |  2 ++
 .../CloudPulseFirewallNodebalancersSelect.tsx    |  6 +++++-
 .../shared/CloudPulseResourcesSelect.test.tsx    | 16 ++++++++++++++++
 .../shared/CloudPulseResourcesSelect.tsx         |  9 +++++++--
 5 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13141-upcoming-features-1764311100780.md

diff --git a/packages/manager/.changeset/pr-13141-upcoming-features-1764311100780.md b/packages/manager/.changeset/pr-13141-upcoming-features-1764311100780.md
new file mode 100644
index 00000000000..c216c66363d
--- /dev/null
+++ b/packages/manager/.changeset/pr-13141-upcoming-features-1764311100780.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+CloudPulse-Metrics: Add tooltip for clusters filter in lke and fix preferences bug for nodebalancers filter in firewall-nodebalancer dashboard ([#13141](https://github.com/linode/manager/pull/13141))
diff --git a/packages/manager/src/features/CloudPulse/Utils/constants.ts b/packages/manager/src/features/CloudPulse/Utils/constants.ts
index ab081c787eb..eb7629499a6 100644
--- a/packages/manager/src/features/CloudPulse/Utils/constants.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/constants.ts
@@ -91,6 +91,8 @@ export const INTERFACE_IDS_LIMIT_ERROR_MESSAGE =
 
 export const INTERFACE_IDS_PLACEHOLDER_TEXT = 'e.g., 1234,5678';
 
+export const CLUSTERS_TOOLTIP_TEXT = 'It includes enterprise Clusters only.';
+
 export const NO_REGION_MESSAGE: Record<number, string> = {
   1: 'No database clusters configured in any regions.',
   2: 'No Linodes configured in any regions.',
diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseFirewallNodebalancersSelect.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseFirewallNodebalancersSelect.tsx
index 6c19faebee9..9ab7b4b9e01 100644
--- a/packages/manager/src/features/CloudPulse/shared/CloudPulseFirewallNodebalancersSelect.tsx
+++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseFirewallNodebalancersSelect.tsx
@@ -138,7 +138,11 @@ export const CloudPulseFirewallNodebalancersSelect = React.memo(
         return;
       }
       // To save default values, go through side effects
-      if (!getNodebalancersList || !savePreferences || selectedNodebalancers) {
+      if (
+        !getNodebalancersList.length ||
+        !savePreferences ||
+        selectedNodebalancers
+      ) {
         if (selectedNodebalancers) {
           setSelectedNodebalancers([]);
           handleNodebalancersSelection([]);
diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.test.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.test.tsx
index 3ef165cf42d..5b404698265 100644
--- a/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.test.tsx
+++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.test.tsx
@@ -5,6 +5,7 @@ import * as React from 'react';
 
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
+import { CLUSTERS_TOOLTIP_TEXT } from '../Utils/constants';
 import { CloudPulseResourcesSelect } from './CloudPulseResourcesSelect';
 
 const queryMocks = vi.hoisted(() => ({
@@ -44,6 +45,21 @@ describe('CloudPulseResourcesSelect component tests', () => {
     expect(screen.getByPlaceholderText('Select Resources')).toBeInTheDocument();
   });
 
+  it('renders with the tooltip-text for lke service', async () => {
+    renderWithTheme(
+      <CloudPulseResourcesSelect
+        handleResourcesSelection={mockResourceHandler}
+        label="Clusters"
+        region={'us-east'}
+        resourceType={'lke'}
+      />
+    );
+
+    expect(
+      screen.getByRole('button', { name: CLUSTERS_TOOLTIP_TEXT })
+    ).toBeVisible();
+  });
+
   it('should render disabled component if the props are undefined or regions and service type does not have any resources', () => {
     renderWithTheme(
       <CloudPulseResourcesSelect
diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx
index c38398e5f3a..d4b6249b31b 100644
--- a/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx
+++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx
@@ -5,7 +5,7 @@ import React from 'react';
 import { useFlags } from 'src/hooks/useFlags';
 import { useResourcesQuery } from 'src/queries/cloudpulse/resources';
 
-import { RESOURCE_FILTER_MAP } from '../Utils/constants';
+import { CLUSTERS_TOOLTIP_TEXT, RESOURCE_FILTER_MAP } from '../Utils/constants';
 import { filterUsingDependentFilters } from '../Utils/FilterBuilder';
 import { deepEqual } from '../Utils/utils';
 import { CLOUD_PULSE_TEXT_FIELD_PROPS } from './styles';
@@ -69,6 +69,8 @@ export const CloudPulseResourcesSelect = React.memo(
     } = props;
 
     const flags = useFlags();
+    const tooltipText =
+      resourceType === 'lke' ? CLUSTERS_TOOLTIP_TEXT : undefined;
 
     const {
       data: resources,
@@ -206,7 +208,10 @@ export const CloudPulseResourcesSelect = React.memo(
             </ListItem>
           );
         }}
-        textFieldProps={{ ...CLOUD_PULSE_TEXT_FIELD_PROPS }}
+        textFieldProps={{
+          ...CLOUD_PULSE_TEXT_FIELD_PROPS,
+          labelTooltipText: tooltipText,
+        }}
         value={selectedResources ?? []}
       />
     );

From 2b164914c077874e8da2a6b1d4c0f7f74213e3be Mon Sep 17 00:00:00 2001
From: Purvesh Makode <pmakode@akamai.com>
Date: Mon, 1 Dec 2025 13:28:38 +0530
Subject: [PATCH 54/91] upcoming: [UIE-9732] - Update tooltip in
 `generateAddressesLabelV2` to show only hidden elements (#13145)

* Update generateAddressesLabelV2 tooltip to show only hidden elements

* More clear test title

* Minor fix
---
 .../src/features/Firewalls/shared.test.tsx    | 63 ++++++++++++++-----
 .../manager/src/features/Firewalls/shared.tsx | 15 +++--
 2 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/packages/manager/src/features/Firewalls/shared.test.tsx b/packages/manager/src/features/Firewalls/shared.test.tsx
index ca1ef1befb6..3264d4cd59c 100644
--- a/packages/manager/src/features/Firewalls/shared.test.tsx
+++ b/packages/manager/src/features/Firewalls/shared.test.tsx
@@ -249,9 +249,9 @@ describe('generateAddressesLabelV2', () => {
     const { getByText } = renderWithTheme(<>{result}</>);
 
     // Check PLs with proper suffixes
-    expect(getByText(/pl:system:test-1 \(IPv4, IPv6\)/)).toBeVisible();
-    expect(getByText(/pl::test-2 \(IPv4\)/)).toBeVisible();
-    expect(getByText(/pl::test-3 \(IPv6\)/)).toBeVisible();
+    expect(getByText('pl:system:test-1 (IPv4, IPv6)')).toBeVisible();
+    expect(getByText('pl::test-2 (IPv4)')).toBeVisible();
+    expect(getByText('pl::test-3 (IPv6)')).toBeVisible();
   });
 
   it('renders individual IP addresses correctly', () => {
@@ -302,12 +302,8 @@ describe('generateAddressesLabelV2', () => {
   });
 
   it('handles truncation and shows Chip for hidden items', () => {
-    const addressesMany = {
-      ipv4: ['1.1.1.1', '2.2.2.2', '3.3.3.3'],
-      ipv6: ['::1', '::2'],
-    };
     const result = generateAddressesLabelV2({
-      addresses: addressesMany,
+      addresses,
       showTruncateChip: true,
       truncateAt: 2,
     });
@@ -315,7 +311,7 @@ describe('generateAddressesLabelV2', () => {
     expect(container.textContent).toContain('+3'); // 5 total items (2 visible and 3 hidden)
   });
 
-  it('renders only 1 visible item and shows Chip when showTruncateChip is true and truncateAt is 1', () => {
+  it('renders only 1 visible item and shows a Chip for the remaining when showTruncateChip is true and truncateAt is 1', () => {
     const result = generateAddressesLabelV2({
       addresses,
       showTruncateChip: true,
@@ -323,13 +319,13 @@ describe('generateAddressesLabelV2', () => {
     });
     const { getByText, queryByText } = renderWithTheme(<>{result}</>);
 
-    expect(getByText(/pl:system:test-1 \(IPv4, IPv6\)/)).toBeVisible();
+    expect(getByText('pl:system:test-1 (IPv4, IPv6)')).toBeVisible();
 
     expect(getByText('+4')).toBeVisible(); // 5 total elements (1 shown + 4 hidden)
 
     // Hidden items are not rendered outside tooltip
-    expect(queryByText(/pl::test-2 \(IPv4\)/)).toBeNull();
-    expect(queryByText(/pl::test-3 \(IPv6\)/)).toBeNull();
+    expect(queryByText('pl::test-2 (IPv4)')).toBeNull();
+    expect(queryByText('pl::test-3 (IPv6)')).toBeNull();
     expect(queryByText('192.168.1.1')).toBeNull();
     expect(queryByText('2001:db8:85a3::8a2e:370:7334/128')).toBeNull();
   });
@@ -342,12 +338,49 @@ describe('generateAddressesLabelV2', () => {
     });
     const { getByText } = renderWithTheme(<>{result}</>);
 
-    expect(getByText(/pl:system:test-1 \(IPv4, IPv6\)/)).toBeVisible();
-    expect(getByText(/pl::test-2 \(IPv4\)/)).toBeVisible();
-    expect(getByText(/pl::test-3 \(IPv6\)/)).toBeVisible();
+    expect(getByText('pl:system:test-1 (IPv4, IPv6)')).toBeVisible();
+    expect(getByText('pl::test-2 (IPv4)')).toBeVisible();
+    expect(getByText('pl::test-3 (IPv6)')).toBeVisible();
     expect(getByText('192.168.1.1')).toBeVisible();
     expect(getByText('2001:db8:85a3::8a2e:370:7334/128')).toBeVisible();
   });
+
+  it('tooltip shows only hidden elements when showTruncateChip is true', async () => {
+    const result = generateAddressesLabelV2({
+      addresses,
+      showTruncateChip: true,
+      truncateAt: 2,
+    });
+
+    const { findAllByTestId, getByText, queryByText } = renderWithTheme(
+      <>{result}</> // 5 total elements (2 shown + 3 hidden)
+    );
+
+    // Only the first 2 elements are visible outside tooltip
+    expect(getByText('pl:system:test-1 (IPv4, IPv6)')).toBeVisible();
+    expect(getByText('pl::test-2 (IPv4)')).toBeVisible();
+    expect(queryByText('pl::test-3 (IPv6)')).toBeNull();
+    expect(queryByText('192.168.1.1')).toBeNull();
+    expect(queryByText('2001:db8:85a3::8a2e:370:7334/128')).toBeNull();
+
+    // Chip shows correct hidden count
+    const chip = getByText('+3');
+    expect(chip).toBeVisible();
+
+    // Hover on chip
+    await userEvent.hover(chip);
+
+    // Query all items in the tooltip
+    const tooltipItems = await findAllByTestId('tooltip-item');
+
+    // Check that only hidden items are present in tooltip
+    expect(tooltipItems).toHaveLength(3);
+    expect(tooltipItems.map((item) => item.textContent)).toEqual([
+      'pl::test-3 (IPv6)',
+      '192.168.1.1',
+      '2001:db8:85a3::8a2e:370:7334/128',
+    ]);
+  });
 });
 
 describe('useIsFirewallRulesetsPrefixlistsEnabled', () => {
diff --git a/packages/manager/src/features/Firewalls/shared.tsx b/packages/manager/src/features/Firewalls/shared.tsx
index c119735f991..13460cba613 100644
--- a/packages/manager/src/features/Firewalls/shared.tsx
+++ b/packages/manager/src/features/Firewalls/shared.tsx
@@ -446,9 +446,10 @@ export const generateAddressesLabelV2 = (
   if (elements.length === 0) return 'None';
 
   //  Truncation / Chip logic
-  const truncated = showTruncateChip ? elements.slice(0, truncateAt) : elements;
-  const hidden = elements.length - truncateAt;
   const hasMore = showTruncateChip && elements.length > truncateAt;
+  const truncated = hasMore ? elements.slice(0, truncateAt) : elements;
+  const hiddenElements = hasMore ? elements.slice(truncateAt) : [];
+  const hiddenCount = hiddenElements.length;
 
   const fullTooltip = (
     <Box
@@ -468,8 +469,12 @@ export const generateAddressesLabelV2 = (
           margin: 0,
         }}
       >
-        {elements.map((el, i) => (
-          <li key={i} style={{ listStyleType: 'disc' }}>
+        {hiddenElements.map((el, i) => (
+          <li
+            data-testid="tooltip-item"
+            key={i}
+            style={{ listStyleType: 'disc' }}
+          >
             {el}
           </li>
         ))}
@@ -508,7 +513,7 @@ export const generateAddressesLabelV2 = (
           title={fullTooltip}
         >
           <Chip
-            label={`+${hidden}`}
+            label={`+${hiddenCount}`}
             sx={(theme) => ({
               cursor: 'pointer',
               borderRadius: '12px',

From 5050b3a8e0c49fa8a29e6d8de2cc24cc3dc84ffa Mon Sep 17 00:00:00 2001
From: Harsh Shankar Rao <hrao@akamai.com>
Date: Mon, 1 Dec 2025 16:57:04 +0530
Subject: [PATCH 55/91] upcoming: [UIE-9562] - Implement Listeners Table in
 Network LoadBalancer Detail page (#13123)

* upcoming: [UIE-9562] - Implement Listeners Table in Network LoadBalancer Detail page

* Added changeset: Implement Listeners Table in Network LoadBalancer Detail page

* PR feedback

* PR feedback @bnussman-akamai

* PR feedback @tvijay-akamai

* fixed failing unit test
---
 ...r-13123-upcoming-features-1763724960594.md |   5 +
 .../NetworkLoadBalancerDetailBody.tsx         |   2 +-
 .../NetworkLoadBalancersDetail.test.tsx       | 104 +++++++++++++----
 .../NetworkLoadBalancersDetail.tsx            |   4 +-
 .../NetworkLoadBalancersListenerDetail.tsx    |  69 +++++++++++
 ...rkLoadBalancersListenerDetailLazyRoutes.ts |   9 ++
 .../NetworkLoadBalancersListenerTable.tsx     | 110 ++++++++++++++++++
 .../src/routes/networkLoadBalancer/index.ts   |  47 ++++++--
 8 files changed, 319 insertions(+), 31 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13123-upcoming-features-1763724960594.md
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetail.tsx
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetailLazyRoutes.ts
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerTable.tsx

diff --git a/packages/manager/.changeset/pr-13123-upcoming-features-1763724960594.md b/packages/manager/.changeset/pr-13123-upcoming-features-1763724960594.md
new file mode 100644
index 00000000000..718a57bd746
--- /dev/null
+++ b/packages/manager/.changeset/pr-13123-upcoming-features-1763724960594.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Implement Listeners Table in Network LoadBalancer Detail page ([#13123](https://github.com/linode/manager/pull/13123))
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerDetailBody.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerDetailBody.tsx
index 234d51b27a9..54ecf7dfb44 100644
--- a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerDetailBody.tsx
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerDetailBody.tsx
@@ -72,7 +72,7 @@ export const NetworkLoadBalancerDetailBody = (
                   {` (ID: ${lkeCluster.id})`}
                 </>
               ) : (
-                'N/A'
+                'None'
               )}
             </Box>
             <Box>
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersDetail.test.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersDetail.test.tsx
index e1da99e0a4e..db1d46b2caf 100644
--- a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersDetail.test.tsx
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersDetail.test.tsx
@@ -1,7 +1,10 @@
 import { regionFactory } from '@linode/utilities';
 import * as React from 'react';
 
-import { networkLoadBalancerFactory } from 'src/factories/networkLoadBalancer';
+import {
+  networkLoadBalancerFactory,
+  networkLoadBalancerListenerFactory,
+} from 'src/factories/networkLoadBalancer';
 import { formatDate } from 'src/utilities/formatDate';
 import { mockMatchMedia, renderWithTheme } from 'src/utilities/testHelpers';
 
@@ -12,6 +15,7 @@ const queryMocks = vi.hoisted(() => ({
   useParams: vi.fn().mockReturnValue({}),
   useProfile: vi.fn().mockReturnValue({}),
   useRegionQuery: vi.fn().mockReturnValue({}),
+  useNetworkLoadBalancerListenersQuery: vi.fn().mockReturnValue({}),
 }));
 
 vi.mock('@linode/queries', async () => {
@@ -21,6 +25,8 @@ vi.mock('@linode/queries', async () => {
     useProfile: queryMocks.useProfile,
     useRegionQuery: queryMocks.useRegionQuery,
     useNetworkLoadBalancerQuery: queryMocks.useNetworkLoadBalancerQuery,
+    useNetworkLoadBalancerListenersQuery:
+      queryMocks.useNetworkLoadBalancerListenersQuery,
   };
 });
 
@@ -55,7 +61,7 @@ describe('NetworkLoadBalancersDetail', () => {
 
     const { getByTestId } = renderWithTheme(<NetworkLoadBalancersDetail />);
 
-    expect(getByTestId('circle-progress')).toBeInTheDocument();
+    expect(getByTestId('circle-progress')).toBeVisible();
   });
 
   it('renders an error state', () => {
@@ -68,7 +74,7 @@ describe('NetworkLoadBalancersDetail', () => {
 
     expect(
       getByText('There was a problem retrieving your NLB. Please try again.')
-    ).toBeInTheDocument();
+    ).toBeVisible();
   });
 
   it('renders the NLB details', () => {
@@ -80,28 +86,28 @@ describe('NetworkLoadBalancersDetail', () => {
 
     const { getByText } = renderWithTheme(<NetworkLoadBalancersDetail />);
 
-    expect(getByText('ACTIVE')).toBeInTheDocument();
+    expect(getByText('ACTIVE')).toBeVisible();
 
-    expect(getByText('Virtual IP (IPv4)')).toBeInTheDocument();
-    expect(getByText(nlbFactory.address_v4)).toBeInTheDocument();
+    expect(getByText('Virtual IP (IPv4)')).toBeVisible();
+    expect(getByText(nlbFactory.address_v4)).toBeVisible();
 
-    expect(getByText('Virtual IP (IPv6)')).toBeInTheDocument();
-    expect(getByText(nlbFactory.address_v6)).toBeInTheDocument();
+    expect(getByText('Virtual IP (IPv6)')).toBeVisible();
+    expect(getByText(nlbFactory.address_v6)).toBeVisible();
 
-    expect(getByText('Region')).toBeInTheDocument();
-    expect(getByText('US, Newark, NJ')).toBeInTheDocument();
+    expect(getByText('Region')).toBeVisible();
+    expect(getByText('US, Newark, NJ')).toBeVisible();
 
-    expect(getByText('LKE-E Cluster')).toBeInTheDocument();
-    expect(getByText('N/A')).toBeInTheDocument();
+    expect(getByText('LKE-E Cluster')).toBeVisible();
+    expect(getByText('None')).toBeVisible();
 
-    expect(getByText('Network Load Balancer ID')).toBeInTheDocument();
-    expect(getByText(nlbFactory.id)).toBeInTheDocument();
+    expect(getByText('Network Load Balancer ID')).toBeVisible();
+    expect(getByText(nlbFactory.id)).toBeVisible();
 
-    expect(getByText('Created')).toBeInTheDocument();
-    expect(getByText(formatDate(nlbFactory.created))).toBeInTheDocument();
+    expect(getByText('Created')).toBeVisible();
+    expect(getByText(formatDate(nlbFactory.created))).toBeVisible();
 
-    expect(getByText('Updated')).toBeInTheDocument();
-    expect(getByText(formatDate(nlbFactory.updated))).toBeInTheDocument();
+    expect(getByText('Updated')).toBeVisible();
+    expect(getByText(formatDate(nlbFactory.updated))).toBeVisible();
   });
 
   it('renders LKE Details if the NLB is associated with an LKE cluster', () => {
@@ -115,12 +121,68 @@ describe('NetworkLoadBalancersDetail', () => {
 
     const { getByText } = renderWithTheme(<NetworkLoadBalancersDetail />);
 
-    expect(getByText('LKE-E Cluster')).toBeInTheDocument();
-    expect(getByText(nlbFactory.lke_cluster!.label)).toBeInTheDocument();
+    expect(getByText('LKE-E Cluster')).toBeVisible();
+    expect(getByText(nlbFactory.lke_cluster!.label)).toBeVisible();
     expect(
       getByText(`(ID: ${nlbFactory.lke_cluster!.id})`, {
         exact: false,
       })
-    ).toBeInTheDocument();
+    ).toBeVisible();
+  });
+
+  it('renders a Listeners table', () => {
+    const listenerFactory = networkLoadBalancerListenerFactory.build();
+    const nlbFactory = networkLoadBalancerFactory.build({
+      listeners: [listenerFactory],
+    });
+    queryMocks.useNetworkLoadBalancerQuery.mockReturnValue({
+      isLoading: false,
+      data: nlbFactory,
+    });
+
+    queryMocks.useNetworkLoadBalancerListenersQuery.mockReturnValue({
+      isLoading: false,
+      data: { data: [listenerFactory], results: 1, page: 1, page_size: 25 },
+    });
+
+    const { getByText, getByTestId, getByRole } = renderWithTheme(
+      <NetworkLoadBalancersDetail />
+    );
+
+    const link = getByRole('link', { name: `${listenerFactory.label}` });
+    expect(link).toHaveAttribute(
+      'href',
+      `/netloadbalancers/${nlbFactory.id}/listeners/${listenerFactory.id}`
+    );
+    expect(getByText('Listeners (1)')).toBeVisible();
+    expect(getByTestId('nlb-listeners-table')).toBeVisible();
+    expect(getByText(listenerFactory.label)).toBeVisible();
+    expect(getByText(listenerFactory.port)).toBeVisible();
+    expect(getByText(listenerFactory.protocol.toUpperCase())).toBeVisible();
+    expect(getByText(listenerFactory.id)).toBeVisible();
+  });
+
+  it('renders an empty Listeners table if there are no listeners', () => {
+    const nlbFactory = networkLoadBalancerFactory.build({
+      listeners: [],
+    });
+    queryMocks.useNetworkLoadBalancerQuery.mockReturnValue({
+      isLoading: false,
+      data: nlbFactory,
+    });
+    queryMocks.useNetworkLoadBalancerListenersQuery.mockReturnValue({
+      isLoading: false,
+      data: { data: [], results: 0 },
+    });
+
+    const { getByText, getByTestId } = renderWithTheme(
+      <NetworkLoadBalancersDetail />
+    );
+
+    expect(getByText('Listeners (0)')).toBeVisible();
+    expect(getByTestId('nlb-listeners-table')).toBeVisible();
+    expect(
+      getByText('No Listeners are defined for this Network Load Balancer')
+    ).toBeVisible();
   });
 });
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersDetail.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersDetail.tsx
index 8d1680f85f2..65caa7fbf95 100644
--- a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersDetail.tsx
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersDetail.tsx
@@ -10,6 +10,7 @@ import { LandingHeader } from 'src/components/LandingHeader';
 import { NLB_API_DOCS_LINK } from '../constants';
 import { NetworkLoadBalancerDetailBody } from './NetworkLoadBalancerDetailBody';
 import { NetworkLoadBalancerDetailHeader } from './NetworkLoadBalancerDetailHeader';
+import { NetworkLoadBalancersListenerTable } from './NetworkLoadBalancersListenerTable';
 
 const NetworkLoadBalancersDetail = () => {
   const params = useParams({ strict: false });
@@ -33,7 +34,7 @@ const NetworkLoadBalancersDetail = () => {
 
   return (
     <>
-      <DocumentTitleSegment segment="Network Load Balancer" />
+      <DocumentTitleSegment segment={`${nlb.label} | Network Load Balancer`} />
       <LandingHeader
         breadcrumbProps={{
           labelOptions: { noCap: true },
@@ -64,6 +65,7 @@ const NetworkLoadBalancersDetail = () => {
         header={<NetworkLoadBalancerDetailHeader status={nlb.status} />}
         noBodyBottomBorder={true}
       />
+      <NetworkLoadBalancersListenerTable nlbId={nlb.id} />
     </>
   );
 };
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetail.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetail.tsx
new file mode 100644
index 00000000000..3f14c9067a4
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetail.tsx
@@ -0,0 +1,69 @@
+import {
+  useNetworkLoadBalancerListenerQuery,
+  useNetworkLoadBalancerQuery,
+} from '@linode/queries';
+import { CircleProgress, ErrorState, Notice } from '@linode/ui';
+import { useParams } from '@tanstack/react-router';
+import * as React from 'react';
+
+import { LandingHeader } from 'src/components/LandingHeader';
+
+export const NetworkLoadBalancersListenerDetail = () => {
+  const params = useParams({ strict: false });
+  const { id: nlbId, listenerId } = params;
+
+  const {
+    data: nlb,
+    error,
+    isLoading,
+  } = useNetworkLoadBalancerQuery(Number(nlbId) || -1, true);
+
+  const {
+    data: listener,
+    error: listenerError,
+    isLoading: listenerLoading,
+  } = useNetworkLoadBalancerListenerQuery(
+    Number(nlbId) || -1,
+    Number(listenerId) || -1,
+    true
+  );
+
+  if (isLoading || listenerLoading) {
+    return <CircleProgress />;
+  }
+
+  if (!nlb || error || !listener || listenerError) {
+    return (
+      <ErrorState errorText="There was a problem retrieving your NLB. Please try again." />
+    );
+  }
+
+  return (
+    <>
+      <LandingHeader
+        breadcrumbProps={{
+          labelOptions: { noCap: true },
+          crumbOverrides: [
+            {
+              label: 'Network Load Balancer',
+              position: 1,
+            },
+            {
+              label: nlb.label,
+              position: 2,
+              linkTo: `/netloadbalancers/$id/listeners`,
+              noCap: true,
+            },
+          ],
+          pathname: `/netloadbalancers/${nlbId}/${listenerId}`,
+        }}
+        docsLabel="Docs"
+        docsLink={
+          'https://techdocs.akamai.com/linode-api/changelog/network-load-balancers'
+        }
+        title={listener.label}
+      />
+      <Notice variant="info">Listener Detail is coming soon...</Notice>
+    </>
+  );
+};
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetailLazyRoutes.ts b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetailLazyRoutes.ts
new file mode 100644
index 00000000000..76b0835e345
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetailLazyRoutes.ts
@@ -0,0 +1,9 @@
+import { createLazyRoute } from '@tanstack/react-router';
+
+import { NetworkLoadBalancersListenerDetail } from './NetworkLoadBalancersListenerDetail';
+
+export const NetworkLoadBalancersListenerDetailLazyRoute = createLazyRoute(
+  '/netloadbalancers/$id/listeners/$listenerId'
+)({
+  component: NetworkLoadBalancersListenerDetail,
+});
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerTable.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerTable.tsx
new file mode 100644
index 00000000000..d590fe397b2
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerTable.tsx
@@ -0,0 +1,110 @@
+import { useNetworkLoadBalancerListenersQuery } from '@linode/queries';
+import { CircleProgress, Stack, Typography, useTheme } from '@linode/ui';
+import * as React from 'react';
+
+import { Link } from 'src/components/Link';
+import { PaginationFooter } from 'src/components/PaginationFooter/PaginationFooter';
+import { Table } from 'src/components/Table';
+import { TableBody } from 'src/components/TableBody';
+import { TableCell } from 'src/components/TableCell';
+import { TableHead } from 'src/components/TableHead';
+import { TableRow } from 'src/components/TableRow';
+import { TableRowEmpty } from 'src/components/TableRowEmpty/TableRowEmpty';
+import { TableRowError } from 'src/components/TableRowError/TableRowError';
+import { usePaginationV2 } from 'src/hooks/usePaginationV2';
+
+interface ListenersTableProps {
+  nlbId: number;
+}
+
+export const NetworkLoadBalancersListenerTable = (
+  props: ListenersTableProps
+) => {
+  const { nlbId } = props;
+  const theme = useTheme();
+
+  const pagination = usePaginationV2({
+    currentRoute: '/netloadbalancers/$id/listeners',
+    preferenceKey: 'netloadbalancers-listeners',
+  });
+
+  const {
+    data: nlbListeners,
+    error,
+    isLoading,
+  } = useNetworkLoadBalancerListenersQuery(nlbId, {
+    page: pagination.page,
+    page_size: pagination.pageSize,
+  });
+
+  if (isLoading) {
+    return <CircleProgress />;
+  }
+
+  return (
+    <Stack>
+      <Stack
+        direction="row"
+        gap={theme.spacingFunction(20)}
+        paddingBottom={theme.spacingFunction(20)}
+        paddingTop={theme.spacingFunction(40)}
+        sx={(theme) => ({
+          [theme.breakpoints.up('lg')]: {
+            paddingLeft: 0,
+          },
+        })}
+      >
+        <Typography
+          sx={{
+            alignItems: 'center',
+            display: 'inline-flex',
+          }}
+          variant="h3"
+        >
+          Listeners ({nlbListeners?.results ?? 0})
+        </Typography>
+      </Stack>
+      <Table data-testid="nlb-listeners-table">
+        <TableHead>
+          <TableRow>
+            <TableCell>Listener Label</TableCell>
+            <TableCell>Port</TableCell>
+            <TableCell>Protocol</TableCell>
+            <TableCell>ID</TableCell>
+          </TableRow>
+        </TableHead>
+        <TableBody>
+          {error && <TableRowError colSpan={4} message={error[0].reason} />}
+          {nlbListeners?.data.length === 0 && (
+            <TableRowEmpty
+              colSpan={4}
+              message="No Listeners are defined for this Network Load Balancer"
+            />
+          )}
+          {nlbListeners?.data.map(({ id, label, port, protocol }) => (
+            <TableRow data-testid={`nlb-listener-row-${id}`} key={id}>
+              <TableCell>
+                <Link
+                  accessibleAriaLabel={label}
+                  to={`/netloadbalancers/${nlbId}/listeners/${id}`}
+                >
+                  {label}
+                </Link>
+              </TableCell>
+              <TableCell>{port}</TableCell>
+              <TableCell>{protocol.toUpperCase()}</TableCell>
+              <TableCell>{id}</TableCell>
+            </TableRow>
+          ))}
+        </TableBody>
+      </Table>
+      <PaginationFooter
+        count={nlbListeners?.results || 0}
+        handlePageChange={pagination.handlePageChange}
+        handleSizeChange={pagination.handlePageSizeChange}
+        page={pagination.page}
+        pageSize={pagination.pageSize}
+      />
+    </Stack>
+  );
+};
diff --git a/packages/manager/src/routes/networkLoadBalancer/index.ts b/packages/manager/src/routes/networkLoadBalancer/index.ts
index d98ed4848eb..b2a21d0b55e 100644
--- a/packages/manager/src/routes/networkLoadBalancer/index.ts
+++ b/packages/manager/src/routes/networkLoadBalancer/index.ts
@@ -22,32 +22,63 @@ const networkLoadBalancerDetailRoute = createRoute({
   beforeLoad: async ({ params }) => {
     throw redirect({
       params: {
-        id: params.id,
+        id: Number(params.id),
       },
       to: '/netloadbalancers/$id/listeners',
     });
   },
   getParentRoute: () => networkLoadBalancersRoute,
   path: '$id',
+});
+
+const networkLoadBalancerListenersRoute = createRoute({
+  getParentRoute: () => networkLoadBalancersRoute,
+  path: '$id/listeners',
+  params: {
+    parse: ({ id }) => ({
+      id: Number(id),
+    }),
+  },
 }).lazy(() =>
   import(
     'src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerDetailLazyRoute'
   ).then((m) => m.networkLoadBalancerDetailLazyRoute)
 );
 
-const networkLoadBalancerListenersRoute = createRoute({
+const networkLoadBalancerListenerDetailRoute = createRoute({
+  beforeLoad: async ({ params }) => {
+    throw redirect({
+      params: {
+        id: Number(params.id),
+        listenerId: Number(params.listenerId),
+      },
+      to: '/netloadbalancers/$id/listeners/$listenerId/nodes',
+    });
+  },
   getParentRoute: () => networkLoadBalancersRoute,
-  path: '$id/listeners',
+  path: '$id/listeners/$listenerId',
+});
+
+const networkLoadBalancerNodesRoute = createRoute({
+  getParentRoute: () => networkLoadBalancersRoute,
+  params: {
+    parse: ({ id, listenerId }) => ({
+      id: Number(id),
+      listenerId: Number(listenerId),
+    }),
+  },
+  path: '$id/listeners/$listenerId/nodes',
 }).lazy(() =>
   import(
-    'src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerDetailLazyRoute'
-  ).then((m) => m.networkLoadBalancerDetailLazyRoute)
+    'src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetailLazyRoutes'
+  ).then((m) => m.NetworkLoadBalancersListenerDetailLazyRoute)
 );
 
 export const networkLoadBalancersRouteTree =
   networkLoadBalancersRoute.addChildren([
     networkLoadBalancersIndexRoute,
-    networkLoadBalancerDetailRoute.addChildren([
-      networkLoadBalancerListenersRoute,
-    ]),
+    networkLoadBalancerDetailRoute,
+    networkLoadBalancerListenersRoute,
+    networkLoadBalancerListenerDetailRoute,
+    networkLoadBalancerNodesRoute,
   ]);

From a28d980fa68a42027719ff79d75bfc75de18cbee Mon Sep 17 00:00:00 2001
From: aaleksee-akamai <aaleksee@akamai.com>
Date: Mon, 1 Dec 2025 14:40:34 +0100
Subject: [PATCH 56/91] feat: [UIE-9722] - IAM: disable cards for linode create
 (#13142)

* feat: [UIE-9722] - IAM: disable cards

* Added changeset: IAM: disable/enable fields based on create_linode permission
---
 .../pr-13142-fixed-1764342267912.md           |  5 +++
 .../Tabs/Marketplace/AppSelect.tsx            |  7 ++-
 .../Marketplace/AppSelectionCard.test.tsx     | 45 +++++++++++++++++++
 .../Tabs/Marketplace/AppSelectionCard.tsx     |  4 ++
 4 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13142-fixed-1764342267912.md

diff --git a/packages/manager/.changeset/pr-13142-fixed-1764342267912.md b/packages/manager/.changeset/pr-13142-fixed-1764342267912.md
new file mode 100644
index 00000000000..5cff2a9d457
--- /dev/null
+++ b/packages/manager/.changeset/pr-13142-fixed-1764342267912.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+IAM: disable/enable fields based on create_linode permission ([#13142](https://github.com/linode/manager/pull/13142))
diff --git a/packages/manager/src/features/Linodes/LinodeCreate/Tabs/Marketplace/AppSelect.tsx b/packages/manager/src/features/Linodes/LinodeCreate/Tabs/Marketplace/AppSelect.tsx
index d1e507bda8e..eeed153ea35 100644
--- a/packages/manager/src/features/Linodes/LinodeCreate/Tabs/Marketplace/AppSelect.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreate/Tabs/Marketplace/AppSelect.tsx
@@ -11,6 +11,7 @@ import React, { useState } from 'react';
 import { useFormContext } from 'react-hook-form';
 
 import { DebouncedSearchTextField } from 'src/components/DebouncedSearchTextField';
+import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
 
 import { AppsList } from './AppsList';
 import { categoryOptions } from './utilities';
@@ -37,6 +38,8 @@ export const AppSelect = (props: Props) => {
   const [query, setQuery] = useState('');
   const [category, setCategory] = useState<AppCategory>();
 
+  const { data: permissions } = usePermissions('account', ['create_linode']);
+
   return (
     <Paper>
       <Stack spacing={2}>
@@ -47,7 +50,7 @@ export const AppSelect = (props: Props) => {
         <Stack direction="row" flexWrap="wrap" gap={1}>
           <DebouncedSearchTextField
             containerProps={{ flexGrow: 1 }}
-            disabled={isLoading}
+            disabled={isLoading || !permissions?.create_linode}
             fullWidth
             hideLabel
             inputSlotProps={{ sx: { maxWidth: 'unset !important' } }}
@@ -59,7 +62,7 @@ export const AppSelect = (props: Props) => {
             value={query}
           />
           <Autocomplete
-            disabled={isLoading}
+            disabled={isLoading || !permissions?.create_linode}
             label="Select category"
             onChange={(e, value) => setCategory(value?.label)}
             options={categoryOptions}
diff --git a/packages/manager/src/features/Linodes/LinodeCreate/Tabs/Marketplace/AppSelectionCard.test.tsx b/packages/manager/src/features/Linodes/LinodeCreate/Tabs/Marketplace/AppSelectionCard.test.tsx
index 5ad40876cd1..e52b9cc99f4 100644
--- a/packages/manager/src/features/Linodes/LinodeCreate/Tabs/Marketplace/AppSelectionCard.test.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreate/Tabs/Marketplace/AppSelectionCard.test.tsx
@@ -5,6 +5,17 @@ import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { AppSelectionCard } from './AppSelectionCard';
 
+const queryMocks = vi.hoisted(() => ({
+  userPermissions: vi.fn(() => ({
+    data: {
+      create_linode: true,
+    },
+  })),
+}));
+vi.mock('src/features/IAM/hooks/usePermissions', () => ({
+  usePermissions: queryMocks.userPermissions,
+}));
+
 describe('AppSelectionCard', () => {
   it('Should render an a label', () => {
     const { getByText } = renderWithTheme(
@@ -56,4 +67,38 @@ describe('AppSelectionCard', () => {
     expect(onOpenDetailsDrawer).toHaveBeenCalled();
     expect(onSelect).not.toHaveBeenCalled();
   });
+
+  it('should enable the card when user has create_linode permission', async () => {
+    const { getByTestId } = renderWithTheme(
+      <AppSelectionCard
+        checked={false}
+        iconUrl={''}
+        label="MySQL"
+        onOpenDetailsDrawer={vi.fn()}
+        onSelect={vi.fn()}
+      />
+    );
+
+    expect(getByTestId('selection-card')).toBeEnabled();
+  });
+
+  it('should disable the card when user does not have create_linode permission', async () => {
+    queryMocks.userPermissions.mockReturnValue({
+      data: {
+        create_linode: false,
+      },
+    });
+
+    const { getByTestId } = renderWithTheme(
+      <AppSelectionCard
+        checked={false}
+        iconUrl={''}
+        label="MySQL"
+        onOpenDetailsDrawer={vi.fn()}
+        onSelect={vi.fn()}
+      />
+    );
+
+    expect(getByTestId('selection-card')).toBeDisabled();
+  });
 });
diff --git a/packages/manager/src/features/Linodes/LinodeCreate/Tabs/Marketplace/AppSelectionCard.tsx b/packages/manager/src/features/Linodes/LinodeCreate/Tabs/Marketplace/AppSelectionCard.tsx
index b0565b1190b..d3eb883104d 100644
--- a/packages/manager/src/features/Linodes/LinodeCreate/Tabs/Marketplace/AppSelectionCard.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreate/Tabs/Marketplace/AppSelectionCard.tsx
@@ -4,6 +4,7 @@ import * as React from 'react';
 
 import Info from 'src/assets/icons/info.svg';
 import { SelectionCard } from 'src/components/SelectionCard/SelectionCard';
+import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
 
 import { getMarketplaceAppLabel } from './utilities';
 
@@ -34,6 +35,8 @@ interface Props {
 export const AppSelectionCard = (props: Props) => {
   const { checked, iconUrl, label, onOpenDetailsDrawer, onSelect } = props;
 
+  const { data: permissions } = usePermissions('account', ['create_linode']);
+
   const handleInfoClick = (e: React.MouseEvent) => {
     e.stopPropagation();
     e.preventDefault();
@@ -73,6 +76,7 @@ export const AppSelectionCard = (props: Props) => {
   return (
     <SelectionCard
       checked={checked}
+      disabled={!permissions?.create_linode}
       heading={displayLabel}
       headingDecoration={headingDecoration}
       onClick={onSelect}

From 814c11ec349b119472dffccb0e947a1af98595bc Mon Sep 17 00:00:00 2001
From: Jaalah Ramos <125309814+jaalah-akamai@users.noreply.github.com>
Date: Mon, 1 Dec 2025 08:59:40 -0500
Subject: [PATCH 57/91] upcoming: [M3-10708] - Display maintenance type and
 config in linode_migrate event messages (#13084)

* upcoming: [M3-10708] - Enhance Linode Migration Event Messages with Maintenance Type and Config Information

* Add two changesets

* Use the  field for upcoming tables start date

* add max reason constant

---------

Co-authored-by: Jaalah Ramos <jaalah.ramos@gmail.com>
Co-authored-by: dmcintyr-akamai <dmcintyr@akamai.com>
---
 .../pr-13084-changed-1762970902694.md         |   5 +
 packages/api-v4/src/account/events.ts         |   6 +-
 ...r-13084-upcoming-features-1762970850861.md |   5 +
 .../components/ExtraPresetEvents.tsx          |  59 ++++++++
 .../components/ExtraPresetMaintenance.tsx     |  37 ++++-
 .../src/dev-tools/components/JsonTextArea.tsx |  19 ++-
 .../Maintenance/MaintenanceTableRow.tsx       |   8 +-
 .../features/Account/Maintenance/utilities.ts |   2 +-
 .../src/features/Events/factories/linode.tsx  | 141 +++++++++++++++---
 9 files changed, 250 insertions(+), 32 deletions(-)
 create mode 100644 packages/api-v4/.changeset/pr-13084-changed-1762970902694.md
 create mode 100644 packages/manager/.changeset/pr-13084-upcoming-features-1762970850861.md

diff --git a/packages/api-v4/.changeset/pr-13084-changed-1762970902694.md b/packages/api-v4/.changeset/pr-13084-changed-1762970902694.md
new file mode 100644
index 00000000000..b3e1bd0b7c7
--- /dev/null
+++ b/packages/api-v4/.changeset/pr-13084-changed-1762970902694.md
@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Changed
+---
+
+Use v4beta endpoints for /events and /events/<eventId> ([#13084](https://github.com/linode/manager/pull/13084))
diff --git a/packages/api-v4/src/account/events.ts b/packages/api-v4/src/account/events.ts
index 4f8c8d21e4b..9f2359d42c3 100644
--- a/packages/api-v4/src/account/events.ts
+++ b/packages/api-v4/src/account/events.ts
@@ -1,4 +1,4 @@
-import { API_ROOT } from '../constants';
+import { API_ROOT, BETA_API_ROOT } from '../constants';
 import Request, { setMethod, setParams, setURL, setXFilter } from '../request';
 
 import type { Filter, Params, ResourcePage } from '../types';
@@ -12,7 +12,7 @@ import type { Event, Notification } from './types';
  */
 export const getEvents = (params: Params = {}, filter: Filter = {}) =>
   Request<ResourcePage<Event>>(
-    setURL(`${API_ROOT}/account/events`),
+    setURL(`${BETA_API_ROOT}/account/events`),
     setMethod('GET'),
     setXFilter(filter),
     setParams(params),
@@ -26,7 +26,7 @@ export const getEvents = (params: Params = {}, filter: Filter = {}) =>
  */
 export const getEvent = (eventId: number) =>
   Request<Event>(
-    setURL(`${API_ROOT}/account/events/${encodeURIComponent(eventId)}`),
+    setURL(`${BETA_API_ROOT}/account/events/${encodeURIComponent(eventId)}`),
     setMethod('GET'),
   );
 
diff --git a/packages/manager/.changeset/pr-13084-upcoming-features-1762970850861.md b/packages/manager/.changeset/pr-13084-upcoming-features-1762970850861.md
new file mode 100644
index 00000000000..894835a1327
--- /dev/null
+++ b/packages/manager/.changeset/pr-13084-upcoming-features-1762970850861.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Display maintenance type (emergency/scheduled) and config information in linode_migrate event messages ([#13084](https://github.com/linode/manager/pull/13084))
diff --git a/packages/manager/src/dev-tools/components/ExtraPresetEvents.tsx b/packages/manager/src/dev-tools/components/ExtraPresetEvents.tsx
index 6ac26ce24fb..8982d6ea2db 100644
--- a/packages/manager/src/dev-tools/components/ExtraPresetEvents.tsx
+++ b/packages/manager/src/dev-tools/components/ExtraPresetEvents.tsx
@@ -287,6 +287,65 @@ const eventTemplates = {
       status: 'finished',
     }),
 
+  'Linode Migration In Progress': () =>
+    eventFactory.build({
+      action: 'linode_migrate',
+      entity: {
+        id: 1,
+        label: 'linode-1',
+        type: 'linode',
+        url: '/v4/linode/instances/1',
+      },
+      message: 'Linode migration in progress.',
+      percent_complete: 45,
+      status: 'started',
+    }),
+
+  'Linode Migration - Emergency': () =>
+    eventFactory.build({
+      action: 'linode_migrate',
+      description: 'emergency',
+      entity: {
+        id: 1,
+        label: 'linode-1',
+        type: 'linode',
+        url: '/v4/linode/instances/1',
+      },
+      message: 'Emergency linode migration in progress.',
+      percent_complete: 30,
+      status: 'started',
+    }),
+
+  'Linode Migration - Scheduled Started': () =>
+    eventFactory.build({
+      action: 'linode_migrate',
+      description: 'scheduled',
+      entity: {
+        id: 1,
+        label: 'linode-1',
+        type: 'linode',
+        url: '/v4/linode/instances/1',
+      },
+      message: 'Scheduled linode migration in progress.',
+      percent_complete: 10,
+      status: 'started',
+    }),
+
+  'Linode Migration - Scheduled': () =>
+    eventFactory.build({
+      action: 'linode_migrate',
+      description: 'scheduled',
+      entity: {
+        id: 1,
+        label: 'linode-1',
+        type: 'linode',
+        url: '/v4/linode/instances/1',
+      },
+      message: 'Scheduled linode migration in progress.',
+      percent_complete: 0,
+      status: 'scheduled',
+    }),
+
   'Completed Event': () =>
     eventFactory.build({
       action: 'account_update',
diff --git a/packages/manager/src/dev-tools/components/ExtraPresetMaintenance.tsx b/packages/manager/src/dev-tools/components/ExtraPresetMaintenance.tsx
index c257d22db49..d1a4eae094b 100644
--- a/packages/manager/src/dev-tools/components/ExtraPresetMaintenance.tsx
+++ b/packages/manager/src/dev-tools/components/ExtraPresetMaintenance.tsx
@@ -210,7 +210,42 @@ const maintenanceTemplates = {
   Canceled: () => accountMaintenanceFactory.build({ status: 'canceled' }),
   Completed: () => accountMaintenanceFactory.build({ status: 'completed' }),
   'In Progress': () =>
-    accountMaintenanceFactory.build({ status: 'in_progress' }),
+    accountMaintenanceFactory.build({
+      status: 'in_progress',
+      entity: {
+        type: 'linode',
+        id: 1,
+        label: 'linode-1',
+        url: '/v4/linode/instances/1',
+      },
+      type: 'migrate',
+    }),
+  'In Progress - Emergency Migration': () =>
+    accountMaintenanceFactory.build({
+      status: 'in_progress',
+      entity: {
+        type: 'linode',
+        id: 1,
+        label: 'linode-1',
+        url: '/v4/linode/instances/1',
+      },
+      type: 'migrate',
+      description: 'emergency',
+      reason: 'Emergency maintenance migration',
+    }),
+  'In Progress - Scheduled Migration': () =>
+    accountMaintenanceFactory.build({
+      status: 'in_progress',
+      entity: {
+        type: 'linode',
+        id: 1,
+        label: 'linode-1',
+        url: '/v4/linode/instances/1',
+      },
+      type: 'migrate',
+      description: 'scheduled',
+      reason: 'Scheduled maintenance migration',
+    }),
   Pending: () => accountMaintenanceFactory.build({ status: 'pending' }),
   Scheduled: () => accountMaintenanceFactory.build({ status: 'scheduled' }),
   Started: () => accountMaintenanceFactory.build({ status: 'started' }),
diff --git a/packages/manager/src/dev-tools/components/JsonTextArea.tsx b/packages/manager/src/dev-tools/components/JsonTextArea.tsx
index 6eb65224f9f..1bc713bb65e 100644
--- a/packages/manager/src/dev-tools/components/JsonTextArea.tsx
+++ b/packages/manager/src/dev-tools/components/JsonTextArea.tsx
@@ -24,6 +24,23 @@ export const JsonTextArea = ({
   const debouncedUpdate = React.useMemo(
     () =>
       debounce((text: string) => {
+        // Handle empty/whitespace text as null
+        if (!text.trim()) {
+          const event = {
+            currentTarget: {
+              name,
+              value: null,
+            },
+            target: {
+              name,
+              value: null,
+            },
+          } as unknown as React.ChangeEvent<HTMLTextAreaElement>;
+
+          onChange(event);
+          return;
+        }
+
         try {
           const parsedJson = JSON.parse(text);
           const event = {
@@ -35,7 +52,7 @@ export const JsonTextArea = ({
               name,
               value: parsedJson,
             },
-          } as React.ChangeEvent<HTMLTextAreaElement>;
+          } as unknown as React.ChangeEvent<HTMLTextAreaElement>;
 
           onChange(event);
         } catch (err) {
diff --git a/packages/manager/src/features/Account/Maintenance/MaintenanceTableRow.tsx b/packages/manager/src/features/Account/Maintenance/MaintenanceTableRow.tsx
index 9645722c188..3fc62a6fb2c 100644
--- a/packages/manager/src/features/Account/Maintenance/MaintenanceTableRow.tsx
+++ b/packages/manager/src/features/Account/Maintenance/MaintenanceTableRow.tsx
@@ -47,6 +47,8 @@ const statusIconMap: Record<AccountMaintenance['status'], Status> = {
   scheduled: 'active',
 };
 
+const MAX_REASON_DISPLAY_LENGTH = 93;
+
 interface MaintenanceTableRowProps {
   maintenance: AccountMaintenance;
   tableType: MaintenanceTableType;
@@ -74,9 +76,11 @@ export const MaintenanceTableRow = (props: MaintenanceTableRowProps) => {
 
   const eventProgress = recentEvent && formatProgressEvent(recentEvent);
 
-  const truncatedReason = truncate(reason, 93);
+  const truncatedReason = reason
+    ? truncate(reason, MAX_REASON_DISPLAY_LENGTH)
+    : '';
 
-  const isTruncated = reason !== truncatedReason;
+  const isTruncated = reason ? reason !== truncatedReason : false;
 
   const dateField = getMaintenanceDateField(tableType);
   const dateValue = props.maintenance[dateField];
diff --git a/packages/manager/src/features/Account/Maintenance/utilities.ts b/packages/manager/src/features/Account/Maintenance/utilities.ts
index bb1c7cbe883..f202f33691d 100644
--- a/packages/manager/src/features/Account/Maintenance/utilities.ts
+++ b/packages/manager/src/features/Account/Maintenance/utilities.ts
@@ -40,7 +40,7 @@ export const maintenanceDateColumnMap: Record<
 > = {
   completed: ['complete_time', 'End Date'],
   'in progress': ['start_time', 'Start Date'],
-  upcoming: ['start_time', 'Start Date'],
+  upcoming: ['when', 'Start Date'],
   pending: ['when', 'Date'],
 };
 
diff --git a/packages/manager/src/features/Events/factories/linode.tsx b/packages/manager/src/features/Events/factories/linode.tsx
index 2d80ed84d26..f65948586e0 100644
--- a/packages/manager/src/features/Events/factories/linode.tsx
+++ b/packages/manager/src/features/Events/factories/linode.tsx
@@ -5,6 +5,23 @@ import { Link } from 'src/components/Link';
 import { EventLink } from '../EventLink';
 
 import type { PartialEventMap } from '../types';
+import type { AccountMaintenance } from '@linode/api-v4';
+
+/**
+ * Normalizes the event description to a valid maintenance type.
+ * Only accepts 'emergency' or 'scheduled' from AccountMaintenance.description,
+ * defaults to 'maintenance' for any other value or null/undefined.
+ */
+type MaintenanceDescription = 'maintenance' | AccountMaintenance['description'];
+
+const getMaintenanceDescription = (
+  description: null | string | undefined
+): MaintenanceDescription => {
+  if (description === 'emergency' || description === 'scheduled') {
+    return description;
+  }
+  return 'maintenance';
+};
 
 export const linode: PartialEventMap<'linode'> = {
   linode_addip: {
@@ -241,30 +258,106 @@ export const linode: PartialEventMap<'linode'> = {
     ),
   },
   linode_migrate: {
-    failed: (e) => (
-      <>
-        Migration <strong>failed</strong> for Linode{' '}
-        <EventLink event={e} to="entity" />.
-      </>
-    ),
-    finished: (e) => (
-      <>
-        Linode <EventLink event={e} to="entity" /> has been{' '}
-        <strong>migrated</strong>.
-      </>
-    ),
-    scheduled: (e) => (
-      <>
-        Linode <EventLink event={e} to="entity" /> is scheduled to be{' '}
-        <strong>migrated</strong>.
-      </>
-    ),
-    started: (e) => (
-      <>
-        Linode <EventLink event={e} to="entity" /> is being{' '}
-        <strong>migrated</strong>.
-      </>
-    ),
+    failed: (e) => {
+      const maintenanceType = getMaintenanceDescription(e.description);
+      return (
+        <>
+          Migration <strong>failed</strong> for Linode{' '}
+          <EventLink event={e} to="entity" /> for{' '}
+          {maintenanceType === 'maintenance' ? (
+            <strong>maintenance</strong>
+          ) : (
+            <>
+              <strong>{maintenanceType}</strong> maintenance
+            </>
+          )}
+          {e.secondary_entity ? (
+            <>
+              {' '}
+              with config <EventLink event={e} to="secondaryEntity" />
+            </>
+          ) : (
+            ''
+          )}
+          .
+        </>
+      );
+    },
+    finished: (e) => {
+      const maintenanceType = getMaintenanceDescription(e.description);
+      return (
+        <>
+          Linode <EventLink event={e} to="entity" /> has been{' '}
+          <strong>migrated</strong> for{' '}
+          {maintenanceType === 'maintenance' ? (
+            <strong>maintenance</strong>
+          ) : (
+            <>
+              <strong>{maintenanceType}</strong> maintenance
+            </>
+          )}
+          {e.secondary_entity ? (
+            <>
+              {' '}
+              with config <EventLink event={e} to="secondaryEntity" />
+            </>
+          ) : (
+            ''
+          )}
+          .
+        </>
+      );
+    },
+    scheduled: (e) => {
+      const maintenanceType = getMaintenanceDescription(e.description);
+      return (
+        <>
+          Linode <EventLink event={e} to="entity" /> is scheduled to be{' '}
+          <strong>migrated</strong> for{' '}
+          {maintenanceType === 'maintenance' ? (
+            <strong>maintenance</strong>
+          ) : (
+            <>
+              <strong>{maintenanceType}</strong> maintenance
+            </>
+          )}
+          {e.secondary_entity ? (
+            <>
+              {' '}
+              with config <EventLink event={e} to="secondaryEntity" />
+            </>
+          ) : (
+            ''
+          )}
+          .
+        </>
+      );
+    },
+    started: (e) => {
+      const maintenanceType = getMaintenanceDescription(e.description);
+      return (
+        <>
+          Linode <EventLink event={e} to="entity" /> is being{' '}
+          <strong>migrated</strong> for{' '}
+          {maintenanceType === 'maintenance' ? (
+            <strong>maintenance</strong>
+          ) : (
+            <>
+              <strong>{maintenanceType}</strong> maintenance
+            </>
+          )}
+          {e.secondary_entity ? (
+            <>
+              {' '}
+              with config <EventLink event={e} to="secondaryEntity" />
+            </>
+          ) : (
+            ''
+          )}
+          .
+        </>
+      );
+    },
   },
   linode_migrate_datacenter: {
     failed: (e) => (

From db0bf58c1c67cfded06e612b2afcd7d80190ce05 Mon Sep 17 00:00:00 2001
From: Harsh Shankar Rao <hrao@akamai.com>
Date: Tue, 2 Dec 2025 13:19:41 +0530
Subject: [PATCH 58/91] change: [UIE-9698] - Add Chip Support to Drawer
 Component Title (#13135)

* upcoming: [UIE-9698] - Add Beta Chip for Drawer

* Add Storybook

* PR feedback

* PR feedback @pmakode-akamai

* Added changeset:  Add Chip Support to Drawer Component Title
---
 .../pr-13135-changed-1764659811788.md         |  5 ++
 .../src/components/Drawer/Drawer.stories.tsx  | 65 +++++++++++++++++++
 .../ui/src/components/Drawer/Drawer.test.tsx  |  9 +++
 packages/ui/src/components/Drawer/Drawer.tsx  | 33 ++++++----
 4 files changed, 100 insertions(+), 12 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13135-changed-1764659811788.md

diff --git a/packages/manager/.changeset/pr-13135-changed-1764659811788.md b/packages/manager/.changeset/pr-13135-changed-1764659811788.md
new file mode 100644
index 00000000000..4055f36aa11
--- /dev/null
+++ b/packages/manager/.changeset/pr-13135-changed-1764659811788.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Changed
+---
+
+ Add Chip Support to Drawer Component Title ([#13135](https://github.com/linode/manager/pull/13135))
diff --git a/packages/ui/src/components/Drawer/Drawer.stories.tsx b/packages/ui/src/components/Drawer/Drawer.stories.tsx
index 779a14e0724..94e0b9646c8 100644
--- a/packages/ui/src/components/Drawer/Drawer.stories.tsx
+++ b/packages/ui/src/components/Drawer/Drawer.stories.tsx
@@ -4,6 +4,7 @@ import { useArgs } from 'storybook/preview-api';
 
 import { ActionsPanel } from '../ActionsPanel';
 import { Button } from '../Button';
+import { Chip } from '../Chip';
 import { TextField } from '../TextField';
 import { Typography } from '../Typography';
 import { Drawer } from './Drawer';
@@ -182,4 +183,68 @@ export const WithError: Story = {
   },
 };
 
+export const WithTitleSuffix: Story = {
+  args: {
+    isFetching: false,
+    open: false,
+    title: 'My Drawer',
+  },
+  render: (args) => {
+    const DrawerExampleWrapper = () => {
+      const [open, setOpen] = React.useState(args.open);
+
+      return (
+        <>
+          <Button
+            buttonType="primary"
+            onClick={() => setOpen(true)}
+            sx={{ m: 4 }}
+          >
+            Click to open Drawer
+          </Button>
+          <Drawer
+            {...args}
+            onClose={() => setOpen(true)}
+            open={open}
+            titleSuffix={<Chip label="suffix" />}
+          >
+            <Typography sx={{ mb: 2 }}>
+              I smirked at their Kale chips banh-mi fingerstache brunch in
+              Williamsburg.
+            </Typography>
+            <Typography sx={{ mb: 2 }}>
+              Meanwhile in my closet-style flat in Red-Hook, my pour-over coffee
+              glitched on my vinyl record player while I styled the bottom left
+              corner of my beard. Those artisan tacos I ordered were infused
+              with turmeric and locally sourced honey, a true farm-to-table
+              vibe. Pabst Blue Ribbon in hand, I sat on my reclaimed wood bench
+              next to the macramé plant holder.
+            </Typography>
+            <Typography sx={{ mb: 2 }}>
+              Narwhal selfies dominated my Instagram feed, hashtagged with "slow
+              living" and "normcore aesthetics". My kombucha brewing kit arrived
+              just in time for me to ferment my own chai-infused blend. As I
+              adjusted my vintage round glasses, a tiny house documentary
+              started playing softly in the background. The retro typewriter
+              clacked as I typed out my minimalist poetry on sustainably sourced
+              paper. The sun glowed through the window, shining light on the
+              delightful cracks of my Apple watch.
+            </Typography>
+            <Typography sx={{ mb: 2 }}>It was Saturday.</Typography>
+            <ActionsPanel
+              primaryButtonProps={{ label: 'Save' }}
+              secondaryButtonProps={{
+                label: 'Cancel',
+                onClick: () => setOpen(false),
+              }}
+            />
+          </Drawer>
+        </>
+      );
+    };
+
+    return DrawerExampleWrapper();
+  },
+};
+
 export default meta;
diff --git a/packages/ui/src/components/Drawer/Drawer.test.tsx b/packages/ui/src/components/Drawer/Drawer.test.tsx
index ca8e2023a01..c5abbcf7033 100644
--- a/packages/ui/src/components/Drawer/Drawer.test.tsx
+++ b/packages/ui/src/components/Drawer/Drawer.test.tsx
@@ -3,6 +3,7 @@ import * as React from 'react';
 import { describe, expect, it, vi } from 'vitest';
 
 import { renderWithTheme } from '../../utilities/testHelpers';
+import { BetaChip } from '../BetaChip';
 import { Button } from '../Button';
 import { Drawer } from './Drawer';
 
@@ -74,4 +75,12 @@ describe('Drawer', () => {
 
     expect(getByRole('progressbar')).toBeVisible();
   });
+
+  it('should render a Dailog with beta chip if titleSuffix is set to betaChip', () => {
+    const { getByText } = renderWithTheme(
+      <Drawer {...defaultArgs} open={true} titleSuffix={<BetaChip />} />,
+    );
+
+    expect(getByText('beta')).toBeVisible();
+  });
 });
diff --git a/packages/ui/src/components/Drawer/Drawer.tsx b/packages/ui/src/components/Drawer/Drawer.tsx
index 70f1ac85a06..8caad7bdd8a 100644
--- a/packages/ui/src/components/Drawer/Drawer.tsx
+++ b/packages/ui/src/components/Drawer/Drawer.tsx
@@ -33,6 +33,12 @@ export interface DrawerProps extends _DrawerProps {
    * Title that appears at the top of the drawer
    */
   title: string;
+  /**
+   * Adds a suffix element to the drawer.
+   *
+   * Can be used to indicate special states, such as `BetaChip`, `NewFeatureChip`, or other UI elements next to the title.
+   */
+  titleSuffix?: React.JSX.Element;
   /**
    * Increases the Drawers width from 480px to 700px on desktop-sized viewports
    * @default false
@@ -56,6 +62,7 @@ export const Drawer = React.forwardRef<HTMLDivElement, DrawerProps>(
     const {
       children,
       error,
+      titleSuffix,
       isFetching,
       onClose,
       open,
@@ -147,18 +154,20 @@ export const Drawer = React.forwardRef<HTMLDivElement, DrawerProps>(
         >
           <Grid>
             {isFetching ? null : (
-              <Typography
-                data-qa-drawer-title={lastTitleRef.current}
-                data-testid="drawer-title"
-                id={titleID}
-                sx={(theme) => ({
-                  marginRight: theme.spacing(2),
-                  wordBreak: 'break-word',
-                })}
-                variant="h2"
-              >
-                {lastTitleRef.current}
-              </Typography>
+              <Box alignItems="center" display="flex">
+                <Typography
+                  data-qa-drawer-title={lastTitleRef.current}
+                  data-testid="drawer-title"
+                  id={titleID}
+                  sx={{
+                    wordBreak: 'break-word',
+                  }}
+                  variant="h2"
+                >
+                  {lastTitleRef.current}
+                </Typography>
+                {titleSuffix && <span>{titleSuffix}</span>}
+              </Box>
             )}
           </Grid>
           <Grid>

From 545e47653c6cceac4577c0a3ddafb3bfd99b4c33 Mon Sep 17 00:00:00 2001
From: Harsh Shankar Rao <hrao@akamai.com>
Date: Tue, 2 Dec 2025 18:23:27 +0530
Subject: [PATCH 59/91] upcoming: [UIE-9565] - Implement Empty Landing State
 for Network Load Balancers (#13132)

* upcoming: [UIE-9565] - Implement Empty Landing State for Network Load Balancers

* Added changeset:  Implement Empty Landing State for Network Load Balancers

* switched the description variant from one-off h3 variant to subtitle1
---
 ...r-13132-upcoming-features-1764056438332.md |  5 +++
 .../NetworkLoadBalancersLandingEmptyState.tsx | 33 +++++++++++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13132-upcoming-features-1764056438332.md

diff --git a/packages/manager/.changeset/pr-13132-upcoming-features-1764056438332.md b/packages/manager/.changeset/pr-13132-upcoming-features-1764056438332.md
new file mode 100644
index 00000000000..5f5fea86ba1
--- /dev/null
+++ b/packages/manager/.changeset/pr-13132-upcoming-features-1764056438332.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+ Implement Empty Landing State for Network Load Balancers ([#13132](https://github.com/linode/manager/pull/13132))
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancersLandingEmptyState.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancersLandingEmptyState.tsx
index 8238a8c8282..7a9e6cacc19 100644
--- a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancersLandingEmptyState.tsx
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersLanding/NetworkLoadBalancersLandingEmptyState.tsx
@@ -1,14 +1,43 @@
+import { Typography } from '@linode/ui';
 import * as React from 'react';
 
+import DocsIcon from 'src/assets/icons/docs.svg';
+import NetworkIcon from 'src/assets/icons/entityIcons/networking.svg';
 import { DocumentTitleSegment } from 'src/components/DocumentTitle';
 import { Placeholder } from 'src/components/Placeholder/Placeholder';
 
-// This will be implemented as part of a different story.
+import { NLB_API_DOCS_LINK } from '../constants';
+
 export const NetworkLoadBalancersLandingEmptyState = () => {
   return (
     <React.Fragment>
       <DocumentTitleSegment segment="Network Load Balancer" />
-      <Placeholder isEntity title="Network Load Balancer"></Placeholder>
+      <Placeholder
+        buttonProps={[
+          {
+            buttonType: 'outlined',
+            startIcon: <DocsIcon />,
+            children: 'Learn More',
+            href: NLB_API_DOCS_LINK,
+            target: '_blank',
+            sx: {
+              '&:hover, &:focus': {
+                textDecoration: 'none',
+              },
+            },
+            rel: 'noopener noreferrer',
+          },
+        ]}
+        icon={NetworkIcon}
+        isEntity
+        subtitle="High Capacity load balancing service"
+        title="Network Load Balancer"
+      >
+        <Typography variant="subtitle1">
+          Deliver real-time, high-volume traffic management for your most
+          demanding workloads.
+        </Typography>
+      </Placeholder>
     </React.Fragment>
   );
 };

From 02e82e6b2a98fd2411e7a2279c35f14bf584f8ef Mon Sep 17 00:00:00 2001
From: Purvesh Makode <pmakode@akamai.com>
Date: Tue, 2 Dec 2025 18:30:02 +0530
Subject: [PATCH 60/91] upcoming: [UIE-9511, UIE-9513, UIE-9632] - Add and
 Integrate Prefix List Details Drawer (#13146)

* Add and integrate PL details drawer

* Update comment

* Update some old references

* Added changeset: Add and Integrate Prefix List Details Drawer

* Added changeset: Add `deleted` property to `FirewallPrefixList` type after API update

* Some refactor and clean up

* Some refactor and update button text from cancel to close

* Rename the 'reference' to 'context' prop for clarity and update all related instances
---
 ...r-13146-upcoming-features-1764600095421.md |   5 +
 packages/api-v4/src/firewalls/types.ts        |   1 +
 ...r-13146-upcoming-features-1764599840190.md |   5 +
 .../manager/src/assets/icons/arrow-left.svg   |   3 +
 packages/manager/src/factories/firewalls.ts   |  15 +-
 .../Rules/FirewallPrefixListDrawer.test.tsx   | 366 +++++++++++++++++
 .../Rules/FirewallPrefixListDrawer.tsx        | 369 ++++++++++++++++++
 .../Rules/FirewallRuleDrawer.test.tsx         |   2 +
 .../Rules/FirewallRuleDrawer.tsx              |  22 +-
 .../Rules/FirewallRuleDrawer.types.ts         |  12 +-
 .../Rules/FirewallRuleSetDetailsView.tsx      |   8 +-
 .../Rules/FirewallRuleSetForm.tsx             |   2 +
 .../Rules/FirewallRuleTable.tsx               |  24 +-
 .../Rules/FirewallRulesLanding.tsx            |  65 +++
 .../Firewalls/FirewallDetail/Rules/shared.ts  |  15 +
 .../src/features/Firewalls/shared.test.tsx    |  24 +-
 .../manager/src/features/Firewalls/shared.tsx |  15 +-
 packages/manager/src/mocks/serverHandlers.ts  |  72 +++-
 18 files changed, 980 insertions(+), 45 deletions(-)
 create mode 100644 packages/api-v4/.changeset/pr-13146-upcoming-features-1764600095421.md
 create mode 100644 packages/manager/.changeset/pr-13146-upcoming-features-1764599840190.md
 create mode 100644 packages/manager/src/assets/icons/arrow-left.svg
 create mode 100644 packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.test.tsx
 create mode 100644 packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx

diff --git a/packages/api-v4/.changeset/pr-13146-upcoming-features-1764600095421.md b/packages/api-v4/.changeset/pr-13146-upcoming-features-1764600095421.md
new file mode 100644
index 00000000000..e0cb2c1aa43
--- /dev/null
+++ b/packages/api-v4/.changeset/pr-13146-upcoming-features-1764600095421.md
@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Upcoming Features
+---
+
+Add `deleted` property to `FirewallPrefixList` type after API update ([#13146](https://github.com/linode/manager/pull/13146))
diff --git a/packages/api-v4/src/firewalls/types.ts b/packages/api-v4/src/firewalls/types.ts
index 8e163648cf9..7f27fbc914a 100644
--- a/packages/api-v4/src/firewalls/types.ts
+++ b/packages/api-v4/src/firewalls/types.ts
@@ -134,6 +134,7 @@ export type FirewallPrefixListVisibility = 'private' | 'public' | 'restricted';
 
 export interface FirewallPrefixList {
   created: string;
+  deleted: null | string;
   description: string;
   id: number;
   ipv4?: null | string[];
diff --git a/packages/manager/.changeset/pr-13146-upcoming-features-1764599840190.md b/packages/manager/.changeset/pr-13146-upcoming-features-1764599840190.md
new file mode 100644
index 00000000000..ebf9b5fe305
--- /dev/null
+++ b/packages/manager/.changeset/pr-13146-upcoming-features-1764599840190.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Add and Integrate Prefix List Details Drawer ([#13146](https://github.com/linode/manager/pull/13146))
diff --git a/packages/manager/src/assets/icons/arrow-left.svg b/packages/manager/src/assets/icons/arrow-left.svg
new file mode 100644
index 00000000000..12643a41986
--- /dev/null
+++ b/packages/manager/src/assets/icons/arrow-left.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.92263 5.24408C9.24807 5.56951 9.24807 6.09715 8.92263 6.42259L6.17855 9.16667H15.8334C16.2936 9.16667 16.6667 9.53976 16.6667 10C16.6667 10.4602 16.2936 10.8333 15.8334 10.8333H6.17855L8.92263 13.5774C9.24807 13.9028 9.24807 14.4305 8.92263 14.7559C8.59719 15.0814 8.06955 15.0814 7.74412 14.7559L3.57745 10.5893C3.25201 10.2638 3.25201 9.73618 3.57745 9.41074L7.74412 5.24408C8.06955 4.91864 8.59719 4.91864 8.92263 5.24408Z" fill="currentColor"/>
+</svg>
diff --git a/packages/manager/src/factories/firewalls.ts b/packages/manager/src/factories/firewalls.ts
index b77dfedde1e..4399e48663c 100644
--- a/packages/manager/src/factories/firewalls.ts
+++ b/packages/manager/src/factories/firewalls.ts
@@ -107,11 +107,11 @@ export const firewallRuleSetFactory = Factory.Sync.makeFactory<FirewallRuleSet>(
     created: '2025-11-05T00:00:00',
     deleted: null,
     description: Factory.each((i) => `firewall-ruleset-${i} description`),
-    label: Factory.each((i) => `firewall-ruleset-${i}`),
-    is_service_defined: false,
     id: Factory.each((i) => i),
-    type: 'inbound',
+    is_service_defined: false,
+    label: Factory.each((i) => `firewall-ruleset-${i}`),
     rules: firewallRuleFactory.buildList(3),
+    type: 'inbound',
     updated: '2025-11-05T00:00:00',
     version: 1,
   }
@@ -120,16 +120,17 @@ export const firewallRuleSetFactory = Factory.Sync.makeFactory<FirewallRuleSet>(
 export const firewallPrefixListFactory =
   Factory.Sync.makeFactory<FirewallPrefixList>({
     created: '2025-11-05T00:00:00',
-    updated: '2025-11-05T00:00:00',
+    deleted: null,
     description: Factory.each((i) => `firewall-prefixlist-${i} description`),
     id: Factory.each((i) => i),
-    name: Factory.each((i) => `pl:system:resolvers:test-${i}`),
-    version: 1,
-    visibility: 'public',
     ipv4: Factory.each((i) =>
       Array.from({ length: 5 }, (_, j) => `139.144.${i}.${j}`)
     ),
     ipv6: Factory.each((i) =>
       Array.from({ length: 5 }, (_, j) => `2600:3c05:e001:bc::${i}${j}`)
     ),
+    name: Factory.each((i) => `pl:system:resolvers:test-${i}`),
+    updated: '2025-11-05T00:00:00',
+    version: 1,
+    visibility: 'public',
   });
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.test.tsx
new file mode 100644
index 00000000000..118f52b8154
--- /dev/null
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.test.tsx
@@ -0,0 +1,366 @@
+import { capitalize } from '@linode/utilities';
+import { within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { firewallPrefixListFactory } from 'src/factories';
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import * as shared from '../../shared';
+import { FirewallPrefixListDrawer } from './FirewallPrefixListDrawer';
+import { PREFIXLIST_MARKED_FOR_DELETION_TEXT } from './shared';
+
+import type { FirewallPrefixListDrawerProps } from './FirewallPrefixListDrawer';
+import type { FirewallPrefixList } from '@linode/api-v4';
+
+const queryMocks = vi.hoisted(() => ({
+  useAllFirewallPrefixListsQuery: vi.fn().mockReturnValue({}),
+}));
+
+vi.mock('@linode/queries', async () => {
+  const actual = await vi.importActual('@linode/queries');
+  return {
+    ...actual,
+    useAllFirewallPrefixListsQuery: queryMocks.useAllFirewallPrefixListsQuery,
+  };
+});
+
+vi.mock('@linode/utilities', async () => {
+  const actual = await vi.importActual('@linode/utilities');
+  return {
+    ...actual,
+    getUserTimezone: vi.fn().mockReturnValue('utc'),
+  };
+});
+
+const spy = vi.spyOn(shared, 'useIsFirewallRulesetsPrefixlistsEnabled');
+
+//
+// Helper to compute expected UI values/text
+//
+const computeExpectedElements = (
+  category: 'inbound' | 'outbound',
+  context: FirewallPrefixListDrawerProps['context']
+) => {
+  let title = 'Prefix List details';
+  let button = 'Close';
+  let label = 'Name:';
+
+  if (context?.type === 'ruleset' && context.modeViewedFrom === 'create') {
+    title = `Add an ${capitalize(category)} Rule or Rule Set`;
+    button = `Back to ${capitalize(category)} Rule Set`;
+    label = 'Prefix List Name:';
+  }
+
+  if (context?.type === 'ruleset' && context.modeViewedFrom === 'view') {
+    title = `${capitalize(category)} Rule Set details`;
+    button = 'Back to the Rule Set';
+    label = 'Prefix List Name:';
+  }
+
+  if (context?.type === 'rule' && context.modeViewedFrom === 'edit') {
+    title = 'Edit Rule';
+    button = 'Back to Rule';
+    label = 'Prefix List Name:';
+  }
+
+  // Default values when there is no specific drawer context
+  // (e.g., type === 'rule' and modeViewedFrom === undefined,
+  // meaning the drawer is opened directly from the Firewall Table row)
+  return { title, button, label };
+};
+
+describe('PrefixListDrawer', () => {
+  beforeEach(() => {
+    spy.mockReturnValue({
+      isFirewallRulesetsPrefixlistsFeatureEnabled: true,
+      isFirewallRulesetsPrefixListsBetaEnabled: false,
+      isFirewallRulesetsPrefixListsLAEnabled: false,
+      isFirewallRulesetsPrefixListsGAEnabled: false,
+    });
+  });
+
+  // Default/base props
+  const baseProps: Omit<FirewallPrefixListDrawerProps, 'category' | 'context'> =
+    {
+      isOpen: true,
+      onClose: () => {},
+      selectedPrefixListLabel: 'pl-test',
+    };
+
+  const drawerProps: FirewallPrefixListDrawerProps[] = [
+    {
+      ...baseProps,
+      category: 'inbound',
+      context: {
+        type: 'ruleset',
+        modeViewedFrom: 'create',
+        plRuleRef: { inIPv4Rule: true, inIPv6Rule: true },
+      },
+    },
+    {
+      ...baseProps,
+      category: 'outbound',
+      context: {
+        type: 'ruleset',
+        modeViewedFrom: 'view',
+        plRuleRef: { inIPv4Rule: true, inIPv6Rule: false },
+      },
+    },
+    {
+      ...baseProps,
+      category: 'inbound',
+      context: {
+        type: 'rule',
+        modeViewedFrom: 'edit',
+        plRuleRef: { inIPv4Rule: false, inIPv6Rule: true },
+      },
+    },
+    {
+      ...baseProps,
+      category: 'outbound',
+      context: {
+        type: 'rule',
+        plRuleRef: { inIPv4Rule: true, inIPv6Rule: true },
+      },
+    },
+  ];
+
+  it.each(drawerProps)(
+    'renders correct UI for category:$category, contextType:$context.type and modeViewedFrom:$context.modeViewedFrom',
+    ({ category, context }) => {
+      queryMocks.useAllFirewallPrefixListsQuery.mockReturnValue({
+        data: [firewallPrefixListFactory.build()],
+      });
+
+      const { getByText, getByRole } = renderWithTheme(
+        <FirewallPrefixListDrawer
+          category={category}
+          context={context}
+          isOpen={true}
+          onClose={vi.fn()}
+          selectedPrefixListLabel="pl-test"
+        />
+      );
+
+      // Compute expectations
+      const { title, button, label } = computeExpectedElements(
+        category,
+        context
+      );
+
+      // Title
+      expect(getByText(title)).toBeVisible();
+
+      // First label (Prefix List Name: OR Name:)
+      expect(getByText(label)).toBeVisible();
+
+      // Static detail labels
+      [
+        'ID:',
+        'Description:',
+        'Type:',
+        'Visibility:',
+        'Version:',
+        'Created:',
+        'Updated:',
+      ].forEach((l) => expect(getByText(l)).toBeVisible());
+
+      // Back or Cancel button
+      expect(getByRole('button', { name: button })).toBeVisible();
+    }
+  );
+
+  // Marked for deletion tests
+  const deletionTestCases = [
+    [
+      'should not display "Marked for deletion" when prefix list is active',
+      null,
+    ],
+    [
+      'should display "Marked for deletion" when prefix list is deleted',
+      '2025-07-24T04:23:17',
+    ],
+  ];
+
+  it.each(deletionTestCases)('%s', async (_, deletedTimeStamp) => {
+    const mockPrefixList = firewallPrefixListFactory.build({
+      deleted: deletedTimeStamp,
+    });
+
+    queryMocks.useAllFirewallPrefixListsQuery.mockReturnValue({
+      data: [mockPrefixList],
+    });
+
+    const { getByText, getByTestId, findByText, queryByText } = renderWithTheme(
+      <FirewallPrefixListDrawer
+        category="inbound"
+        context={{
+          type: 'rule',
+          plRuleRef: { inIPv4Rule: false, inIPv6Rule: true },
+        }}
+        isOpen={true}
+        onClose={vi.fn()}
+        selectedPrefixListLabel="pl-test"
+      />
+    );
+
+    if (deletedTimeStamp) {
+      expect(getByText('Marked for deletion:')).toBeVisible();
+      const tooltip = getByTestId('tooltip-info-icon');
+      await userEvent.hover(tooltip);
+      expect(
+        await findByText(PREFIXLIST_MARKED_FOR_DELETION_TEXT)
+      ).toBeVisible();
+    } else {
+      expect(queryByText('Marked for deletion:')).not.toBeInTheDocument();
+    }
+  });
+
+  const prefixListVariants: Partial<FirewallPrefixList>[] = [
+    { name: 'pl::supports-both', ipv4: ['1.1.1.0/24'], ipv6: ['::1/128'] },
+    { name: 'pl::supports-only-ipv4', ipv4: ['1.1.1.0/24'], ipv6: null },
+    { name: 'pl::supports-only-ipv6', ipv4: null, ipv6: ['::1/128'] },
+    { name: 'pl::supports-both-but-ipv4-empty', ipv4: [], ipv6: ['::1/128'] },
+    {
+      name: 'pl::supports-both-but-ipv6-empty',
+      ipv4: ['1.1.1.0/24'],
+      ipv6: [],
+    },
+    { name: 'pl::supports-both-but-both-empty', ipv4: [], ipv6: [] },
+  ];
+
+  const ruleReferences: FirewallPrefixListDrawerProps['context'][] = [
+    { plRuleRef: { inIPv4Rule: true, inIPv6Rule: false }, type: 'rule' },
+    { plRuleRef: { inIPv4Rule: false, inIPv6Rule: true }, type: 'rule' },
+    { plRuleRef: { inIPv4Rule: true, inIPv6Rule: true }, type: 'rule' },
+    { plRuleRef: { inIPv4Rule: true, inIPv6Rule: true }, type: 'ruleset' },
+  ];
+
+  const ipSectionTestCases = [
+    // PL supports both
+    {
+      prefixList: prefixListVariants[0],
+      context: ruleReferences[0],
+      expectedIPv4: 'in use',
+      expectedIPv6: 'not in use',
+    },
+    {
+      prefixList: prefixListVariants[0],
+      context: ruleReferences[1],
+      expectedIPv4: 'not in use',
+      expectedIPv6: 'in use',
+    },
+    {
+      prefixList: prefixListVariants[0],
+      context: ruleReferences[2],
+      expectedIPv4: 'in use',
+      expectedIPv6: 'in use',
+    },
+    {
+      prefixList: prefixListVariants[0],
+      context: ruleReferences[3],
+      expectedIPv4: 'in use',
+      expectedIPv6: 'in use',
+    },
+    // PL supports only IPv4
+    {
+      prefixList: prefixListVariants[1],
+      context: ruleReferences[0],
+      expectedIPv4: 'in use',
+    },
+    // PL supports only IPv6
+    {
+      prefixList: prefixListVariants[2],
+      context: ruleReferences[1],
+      expectedIPv6: 'in use',
+    },
+    // PL IPv4 empty
+    {
+      prefixList: prefixListVariants[3],
+      context: ruleReferences[0],
+      expectedIPv4: 'in use',
+      expectedIPv6: 'not in use',
+    },
+    {
+      prefixList: prefixListVariants[3],
+      context: ruleReferences[1],
+      expectedIPv4: 'not in use',
+      expectedIPv6: 'in use',
+    },
+    // PL IPv6 empty
+    {
+      prefixList: prefixListVariants[4],
+      context: ruleReferences[0],
+      expectedIPv4: 'in use',
+      expectedIPv6: 'not in use',
+    },
+    {
+      prefixList: prefixListVariants[4],
+      context: ruleReferences[1],
+      expectedIPv4: 'not in use',
+      expectedIPv6: 'in use',
+    },
+    // PL both empty
+    {
+      prefixList: prefixListVariants[5],
+      context: ruleReferences[0],
+      expectedIPv4: 'in use',
+      expectedIPv6: 'not in use',
+    },
+    {
+      prefixList: prefixListVariants[5],
+      context: ruleReferences[1],
+      expectedIPv4: 'not in use',
+      expectedIPv6: 'in use',
+    },
+  ];
+
+  it.each(ipSectionTestCases)(
+    'renders correct chip and IP addresses for Prefix List $prefixList.name with reference $context.plRuleRef',
+    ({ prefixList, context, expectedIPv4, expectedIPv6 }) => {
+      const selectedPrefixList = prefixList.name;
+
+      const mockPrefixList = firewallPrefixListFactory.build({ ...prefixList });
+      queryMocks.useAllFirewallPrefixListsQuery.mockReturnValue({
+        data: [mockPrefixList],
+      });
+
+      const { getByTestId } = renderWithTheme(
+        <FirewallPrefixListDrawer
+          category="inbound"
+          context={context}
+          isOpen={true}
+          onClose={vi.fn()}
+          selectedPrefixListLabel={selectedPrefixList}
+        />
+      );
+
+      if (prefixList.ipv4 && expectedIPv4) {
+        const ipv4Chip = getByTestId('ipv4-chip');
+        expect(ipv4Chip).toBeVisible();
+        expect(ipv4Chip).toHaveTextContent(expectedIPv4);
+
+        // Check IPv4 addresses
+        const ipv4Section = getByTestId('ipv4-section');
+        const ipv4Content = prefixList.ipv4.length
+          ? prefixList.ipv4.join(', ')
+          : 'no IP addresses';
+        expect(within(ipv4Section).getByText(ipv4Content)).toBeVisible();
+      }
+
+      if (prefixList.ipv6 && expectedIPv6) {
+        const ipv6Chip = getByTestId('ipv6-chip');
+        expect(ipv6Chip).toBeVisible();
+        expect(ipv6Chip).toHaveTextContent(expectedIPv6);
+
+        // Check IPv6 addresses
+        const ipv6Section = getByTestId('ipv6-section');
+        const ipv6Content = prefixList.ipv6.length
+          ? prefixList.ipv6.join(', ')
+          : 'no IP addresses';
+        expect(within(ipv6Section).getByText(ipv6Content)).toBeVisible();
+      }
+    }
+  );
+});
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx
new file mode 100644
index 00000000000..37e9f464242
--- /dev/null
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx
@@ -0,0 +1,369 @@
+import { useAllFirewallPrefixListsQuery } from '@linode/queries';
+import { Box, Button, Chip, Drawer, Paper, TooltipIcon } from '@linode/ui';
+import { capitalize } from '@linode/utilities';
+import * as React from 'react';
+
+import ArrowLeftIcon from 'src/assets/icons/arrow-left.svg';
+import { CopyTooltip } from 'src/components/CopyTooltip/CopyTooltip';
+import { DateTimeDisplay } from 'src/components/DateTimeDisplay';
+
+import { useIsFirewallRulesetsPrefixlistsEnabled } from '../../shared';
+import {
+  getPrefixListType,
+  PREFIXLIST_MARKED_FOR_DELETION_TEXT,
+} from './shared';
+import {
+  StyledLabel,
+  StyledListItem,
+  StyledWarningIcon,
+  useStyles,
+} from './shared.styles';
+
+import type { PrefixListRuleReference } from '../../shared';
+import type { FirewallRuleDrawerMode } from './FirewallRuleDrawer.types';
+import type { Category } from './shared';
+
+export interface PrefixListDrawerContext {
+  modeViewedFrom?: FirewallRuleDrawerMode; // Optional in the case of normal rules
+  plRuleRef: PrefixListRuleReference;
+  type: 'rule' | 'ruleset';
+}
+
+export interface FirewallPrefixListDrawerProps {
+  category: Category;
+  context: PrefixListDrawerContext | undefined;
+  isOpen: boolean;
+  onClose: (options?: { closeAll: boolean }) => void;
+  selectedPrefixListLabel: string | undefined;
+}
+
+export const FirewallPrefixListDrawer = React.memo(
+  (props: FirewallPrefixListDrawerProps) => {
+    const { category, context, onClose, isOpen, selectedPrefixListLabel } =
+      props;
+
+    const { isFirewallRulesetsPrefixlistsFeatureEnabled } =
+      useIsFirewallRulesetsPrefixlistsEnabled();
+    const { classes } = useStyles();
+
+    const { data, error, isFetching } = useAllFirewallPrefixListsQuery(
+      isFirewallRulesetsPrefixlistsFeatureEnabled,
+      {},
+      { name: selectedPrefixListLabel }
+    );
+
+    const prefixListDetails = data?.[0];
+
+    const isIPv4Supported =
+      prefixListDetails?.ipv4 !== null && prefixListDetails?.ipv4 !== undefined;
+    const isIPv6Supported =
+      prefixListDetails?.ipv6 !== null && prefixListDetails?.ipv6 !== undefined;
+
+    const isIPv4InUse = context?.plRuleRef.inIPv4Rule;
+    const isIPv6InUse = context?.plRuleRef.inIPv6Rule;
+
+    // Returns Prefix List drawer title and back button text based on category and reference
+    const getDrawerTexts = (
+      category: Category,
+      context?: PrefixListDrawerContext
+    ) => {
+      const defaultTexts = { title: 'Prefix List details', backButton: null };
+
+      if (!context) return defaultTexts;
+
+      const { type, modeViewedFrom } = context;
+
+      if (type === 'ruleset' && modeViewedFrom === 'create') {
+        return {
+          title: `Add an ${capitalize(category)} Rule or Rule Set`,
+          backButton: `Back to ${capitalize(category)} Rule Set`,
+        };
+      }
+
+      if (type === 'ruleset' && modeViewedFrom === 'view') {
+        return {
+          title: `${capitalize(category)} Rule Set details`,
+          backButton: 'Back to the Rule Set',
+        };
+      }
+
+      if (type === 'rule' && modeViewedFrom === 'edit') {
+        return { title: 'Edit Rule', backButton: 'Back to Rule' };
+      }
+
+      return defaultTexts;
+    };
+
+    const { title: titleText, backButton: backButtonText } = getDrawerTexts(
+      category,
+      context
+    );
+
+    const plFieldLabel =
+      context?.type === 'rule' && context.modeViewedFrom === undefined
+        ? 'Name'
+        : 'Prefix List Name';
+
+    return (
+      <Drawer
+        error={error}
+        isFetching={isFetching}
+        onClose={() => onClose({ closeAll: true })}
+        open={isOpen}
+        title={titleText}
+      >
+        <Box mt={2}>
+          {prefixListDetails && (
+            <>
+              {[
+                {
+                  label: plFieldLabel,
+                  value: prefixListDetails.name,
+                },
+                {
+                  label: 'ID',
+                  value: prefixListDetails.id,
+                  copy: true,
+                },
+                {
+                  label: 'Description',
+                  value: prefixListDetails.description,
+                  column: true,
+                },
+                {
+                  label: 'Type',
+                  value: getPrefixListType(prefixListDetails.name),
+                },
+                {
+                  label: 'Visibility',
+                  value: capitalize(prefixListDetails.visibility),
+                },
+                {
+                  label: 'Version',
+                  value: prefixListDetails.version,
+                },
+                {
+                  label: 'Created',
+                  value: <DateTimeDisplay value={prefixListDetails.created} />,
+                },
+                {
+                  label: 'Updated',
+                  value: <DateTimeDisplay value={prefixListDetails.updated} />,
+                },
+              ].map((item, idx) => (
+                <StyledListItem
+                  key={`item-${idx}`}
+                  paddingMultiplier={2}
+                  sx={
+                    item.column
+                      ? { flexDirection: 'column', alignItems: 'flex-start' }
+                      : {}
+                  }
+                >
+                  {item.label && (
+                    <StyledLabel component="span">{item.label}: </StyledLabel>
+                  )}
+
+                  {item.value}
+
+                  {item.copy && (
+                    <CopyTooltip
+                      className={classes.copyIcon}
+                      text={String(item.value)}
+                    />
+                  )}
+                </StyledListItem>
+              ))}
+
+              {prefixListDetails.deleted && (
+                <StyledListItem paddingMultiplier={2}>
+                  <StyledWarningIcon />
+                  <StyledLabel
+                    component="span"
+                    sx={(theme) => ({
+                      color: theme.tokens.alias.Content.Text.Negative,
+                    })}
+                  >
+                    Marked for deletion:
+                  </StyledLabel>
+                  <DateTimeDisplay
+                    sx={(theme) => ({
+                      color: theme.tokens.alias.Content.Text.Negative,
+                      marginRight: theme.spacingFunction(4),
+                    })}
+                    value={prefixListDetails.deleted}
+                  />
+                  <TooltipIcon
+                    status="info"
+                    sxTooltipIcon={{
+                      '& svg': { width: '16px', height: '16px' },
+                      padding: 0,
+                      mb: 0.1,
+                    }}
+                    text={PREFIXLIST_MARKED_FOR_DELETION_TEXT}
+                  />
+                </StyledListItem>
+              )}
+
+              {isIPv4Supported && (
+                <Paper
+                  data-testid="ipv4-section"
+                  sx={(theme) => ({
+                    backgroundColor: theme.tokens.alias.Background.Neutral,
+                    padding: theme.spacingFunction(12),
+                    marginTop: theme.spacingFunction(8),
+                    ...(isIPv4InUse
+                      ? {
+                          border: `1px solid ${theme.tokens.alias.Border.Positive}`,
+                        }
+                      : {}),
+                  })}
+                >
+                  <StyledLabel
+                    sx={(theme) => ({
+                      display: 'flex',
+                      justifyContent: 'space-between',
+                      marginBottom: theme.spacingFunction(4),
+                      ...(!isIPv4InUse
+                        ? {
+                            color:
+                              theme.tokens.alias.Content.Text.Primary.Disabled,
+                          }
+                        : {}),
+                    })}
+                  >
+                    IPv4
+                    <Chip
+                      data-testid="ipv4-chip"
+                      label={isIPv4InUse ? 'in use' : 'not in use'}
+                      sx={(theme) => ({
+                        background: isIPv4InUse
+                          ? theme.tokens.component.Badge.Positive.Subtle
+                              .Background
+                          : theme.tokens.component.Badge.Neutral.Subtle
+                              .Background,
+                        color: isIPv4InUse
+                          ? theme.tokens.component.Badge.Positive.Subtle.Text
+                          : theme.tokens.component.Badge.Neutral.Subtle.Text,
+                        font: theme.font.bold,
+                        fontSize: theme.tokens.font.FontSize.Xxxs,
+                        marginRight: theme.spacingFunction(6),
+                        flexShrink: 0,
+                      })}
+                    />
+                  </StyledLabel>
+
+                  <StyledListItem
+                    component="span"
+                    sx={(theme) => ({
+                      ...(!isIPv4InUse
+                        ? {
+                            color:
+                              theme.tokens.alias.Content.Text.Primary.Disabled,
+                          }
+                        : {}),
+                    })}
+                  >
+                    {prefixListDetails.ipv4!.length > 0 ? (
+                      prefixListDetails.ipv4!.join(', ')
+                    ) : (
+                      <i>no IP addresses</i>
+                    )}
+                  </StyledListItem>
+                </Paper>
+              )}
+
+              {isIPv6Supported && (
+                <Paper
+                  data-testid="ipv6-section"
+                  sx={(theme) => ({
+                    backgroundColor: theme.tokens.alias.Background.Neutral,
+                    padding: theme.spacingFunction(12),
+                    marginTop: theme.spacingFunction(8),
+                    ...(isIPv6InUse
+                      ? {
+                          border: `1px solid ${theme.tokens.alias.Border.Positive}`,
+                        }
+                      : {}),
+                  })}
+                >
+                  <StyledLabel
+                    sx={(theme) => ({
+                      display: 'flex',
+                      justifyContent: 'space-between',
+                      marginBottom: theme.spacingFunction(4),
+                      ...(!isIPv6InUse
+                        ? {
+                            color:
+                              theme.tokens.alias.Content.Text.Primary.Disabled,
+                          }
+                        : {}),
+                    })}
+                  >
+                    IPv6
+                    <Chip
+                      data-testid="ipv6-chip"
+                      label={isIPv6InUse ? 'in use' : 'not in use'}
+                      sx={(theme) => ({
+                        background: isIPv6InUse
+                          ? theme.tokens.component.Badge.Positive.Subtle
+                              .Background
+                          : theme.tokens.component.Badge.Neutral.Subtle
+                              .Background,
+                        color: isIPv6InUse
+                          ? theme.tokens.component.Badge.Positive.Subtle.Text
+                          : theme.tokens.component.Badge.Neutral.Subtle.Text,
+                        font: theme.font.bold,
+                        fontSize: theme.tokens.font.FontSize.Xxxs,
+                        marginRight: theme.spacingFunction(6),
+                        flexShrink: 0,
+                      })}
+                    />
+                  </StyledLabel>
+                  <StyledListItem
+                    component="span"
+                    sx={(theme) => ({
+                      ...(!isIPv6InUse
+                        ? {
+                            color:
+                              theme.tokens.alias.Content.Text.Primary.Disabled,
+                          }
+                        : {}),
+                    })}
+                  >
+                    {prefixListDetails.ipv6!.length > 0 ? (
+                      prefixListDetails.ipv6!.join(', ')
+                    ) : (
+                      <i>no IP addresses</i>
+                    )}
+                  </StyledListItem>
+                </Paper>
+              )}
+            </>
+          )}
+
+          <Box
+            sx={(theme) => ({
+              marginTop: theme.spacingFunction(16),
+              display: 'flex',
+              justifyContent: backButtonText ? 'flex-start' : 'flex-end',
+            })}
+          >
+            <Button
+              buttonType={backButtonText ? 'outlined' : 'secondary'}
+              onClick={() => onClose({ closeAll: false })}
+              startIcon={backButtonText ? <ArrowLeftIcon /> : undefined}
+              sx={{
+                ...(backButtonText && {
+                  textTransform: 'none',
+                }),
+              }}
+            >
+              {backButtonText ?? 'Close'}
+            </Button>
+          </Box>
+        </Box>
+      </Drawer>
+    );
+  }
+);
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
index 09719c261a7..f0d23ec98e3 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
@@ -50,6 +50,7 @@ vi.mock('@linode/utilities', async () => {
   };
 });
 
+const mockHandleOpenPrefixListDrawer = vi.fn();
 const mockOnClose = vi.fn();
 const mockOnSubmit = vi.fn();
 
@@ -59,6 +60,7 @@ const props: FirewallRuleDrawerProps = {
   category: 'inbound',
   isOpen: true,
   mode: 'create',
+  handleOpenPrefixListDrawer: mockHandleOpenPrefixListDrawer,
   onClose: mockOnClose,
   onSubmit: mockOnSubmit,
 };
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
index 10c16eef62a..cdd97596b06 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
@@ -39,7 +39,14 @@ import type { ExtendedIP } from 'src/utilities/ipUtils';
 // =============================================================================
 export const FirewallRuleDrawer = React.memo(
   (props: FirewallRuleDrawerProps) => {
-    const { category, isOpen, mode, onClose, ruleToModifyOrView } = props;
+    const {
+      category,
+      handleOpenPrefixListDrawer,
+      isOpen,
+      mode,
+      onClose,
+      ruleToModifyOrView,
+    } = props;
 
     const { isFirewallRulesetsPrefixlistsFeatureEnabled } =
       useIsFirewallRulesetsPrefixlistsEnabled();
@@ -253,6 +260,16 @@ export const FirewallRuleDrawer = React.memo(
                   <FirewallRuleSetForm
                     category={category}
                     closeDrawer={onClose}
+                    handleOpenPrefixListDrawer={(
+                      prefixListLabel,
+                      plRuleRef
+                    ) => {
+                      handleOpenPrefixListDrawer(
+                        prefixListLabel,
+                        plRuleRef,
+                        'ruleset'
+                      );
+                    }}
                     ruleErrors={ruleToModifyOrView?.errors}
                     {...formikProps}
                   />
@@ -265,6 +282,9 @@ export const FirewallRuleDrawer = React.memo(
           <FirewallRuleSetDetailsView
             category={category}
             closeDrawer={onClose}
+            handleOpenPrefixListDrawer={(prefixListLabel, plRuleRef) => {
+              handleOpenPrefixListDrawer(prefixListLabel, plRuleRef, 'ruleset');
+            }}
             ruleset={ruleToModifyOrView?.ruleset}
           />
         )}
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts
index c48ff4a91a6..e0cfdfd8067 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts
@@ -1,4 +1,5 @@
-import type { FirewallOptionItem } from '../../shared';
+import type { FirewallOptionItem, PrefixListRuleReference } from '../../shared';
+import type { PrefixListDrawerContext } from './FirewallPrefixListDrawer';
 import type { ExtendedFirewallRule } from './firewallRuleEditor';
 import type { Category, FirewallRuleError } from './shared';
 import type {
@@ -12,6 +13,11 @@ export type FirewallRuleDrawerMode = 'create' | 'edit' | 'view';
 
 export interface FirewallRuleDrawerProps {
   category: Category;
+  handleOpenPrefixListDrawer: (
+    prefixListLabel: string,
+    plRuleRef: PrefixListRuleReference,
+    contextType: PrefixListDrawerContext['type']
+  ) => void;
   isOpen: boolean;
   mode: FirewallRuleDrawerMode;
   onClose: () => void;
@@ -51,5 +57,9 @@ export interface FirewallRuleSetFormProps
   extends FormikProps<FormRuleSetState> {
   category: Category;
   closeDrawer: () => void;
+  handleOpenPrefixListDrawer: (
+    prefixListLabel: string,
+    plRuleRef: PrefixListRuleReference
+  ) => void;
   ruleErrors?: FirewallRuleError[];
 }
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetDetailsView.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetDetailsView.tsx
index 8efe636bb6b..f7a2ff5c33f 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetDetailsView.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetDetailsView.tsx
@@ -27,19 +27,24 @@ import {
   useStyles,
 } from './shared.styles';
 
+import type { PrefixListRuleReference } from '../../shared';
 import type { Category } from './shared';
 import type { FirewallRuleType } from '@linode/api-v4';
 
 interface FirewallRuleSetDetailsViewProps {
   category: Category;
   closeDrawer: () => void;
+  handleOpenPrefixListDrawer: (
+    prefixListLabel: string,
+    plRuleRef: PrefixListRuleReference
+  ) => void;
   ruleset: FirewallRuleType['ruleset'];
 }
 
 export const FirewallRuleSetDetailsView = (
   props: FirewallRuleSetDetailsViewProps
 ) => {
-  const { category, closeDrawer, ruleset } = props;
+  const { category, closeDrawer, handleOpenPrefixListDrawer, ruleset } = props;
 
   const { isFirewallRulesetsPrefixlistsFeatureEnabled } =
     useIsFirewallRulesetsPrefixlistsEnabled();
@@ -181,6 +186,7 @@ export const FirewallRuleSetDetailsView = (
               {rule.protocol};&nbsp;{rule.ports};&nbsp;
               {generateAddressesLabelV2({
                 addresses: rule.addresses,
+                onPrefixListClick: handleOpenPrefixListDrawer,
                 showTruncateChip: false,
               })}
             </Box>
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx
index f49756695c3..eda6435e4f0 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx
@@ -28,6 +28,7 @@ export const FirewallRuleSetForm = React.memo(
     const {
       category,
       errors,
+      handleOpenPrefixListDrawer,
       handleSubmit,
       setFieldTouched,
       setFieldValue,
@@ -213,6 +214,7 @@ export const FirewallRuleSetForm = React.memo(
                       {rule.protocol};&nbsp;{rule.ports};&nbsp;
                       {generateAddressesLabelV2({
                         addresses: rule.addresses,
+                        onPrefixListClick: handleOpenPrefixListDrawer,
                         showTruncateChip: false,
                       })}
                     </Box>
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
index c4c55f4ada1..ebeff8eec5b 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
@@ -62,7 +62,10 @@ import type { ExtendedFirewallRule, RuleStatus } from './firewallRuleEditor';
 import type { Category, FirewallRuleError } from './shared';
 import type { DragEndEvent } from '@dnd-kit/core';
 import type { FirewallPolicyType } from '@linode/api-v4/lib/firewalls/types';
-import type { FirewallOptionItem } from 'src/features/Firewalls/shared';
+import type {
+  FirewallOptionItem,
+  PrefixListRuleReference,
+} from 'src/features/Firewalls/shared';
 
 interface RuleRow {
   action?: null | string;
@@ -96,6 +99,10 @@ interface RowActionHandlers {
 interface FirewallRuleTableProps extends RowActionHandlers {
   category: Category;
   disabled: boolean;
+  handleOpenPrefixListDrawer: (
+    prefixListLabel: string,
+    plRuleRef: PrefixListRuleReference
+  ) => void;
   handlePolicyChange: (
     category: Category,
     newPolicy: FirewallPolicyType
@@ -113,6 +120,7 @@ export const FirewallRuleTable = (props: FirewallRuleTableProps) => {
     handleDeleteFirewallRule,
     handleOpenRuleDrawerForEditing,
     handleOpenRuleSetDrawerForViewing,
+    handleOpenPrefixListDrawer,
     handlePolicyChange,
     handleReorder,
     handleUndo,
@@ -133,7 +141,8 @@ export const FirewallRuleTable = (props: FirewallRuleTableProps) => {
 
   const rowData = firewallRuleToRowData(
     rulesWithStatus,
-    isFirewallRulesetsPrefixlistsFeatureEnabled
+    isFirewallRulesetsPrefixlistsFeatureEnabled,
+    handleOpenPrefixListDrawer
   );
 
   const openDrawerForCreating = React.useCallback(() => {
@@ -638,7 +647,11 @@ export const ConditionalError = React.memo((props: ConditionalErrorProps) => {
  */
 export const firewallRuleToRowData = (
   firewallRules: ExtendedFirewallRule[],
-  isFirewallRulesetsPrefixlistsEnabled?: boolean
+  isFirewallRulesetsPrefixlistsEnabled?: boolean,
+  handleOpenPrefixListDrawer?: (
+    prefixListLabel: string,
+    plRuleRef: PrefixListRuleReference
+  ) => void
 ): RuleRow[] => {
   return firewallRules.map((thisRule, idx) => {
     const ruleType = ruleToPredefinedFirewall(thisRule);
@@ -646,7 +659,10 @@ export const firewallRuleToRowData = (
     return {
       ...thisRule,
       addresses: isFirewallRulesetsPrefixlistsEnabled
-        ? generateAddressesLabelV2({ addresses: thisRule.addresses })
+        ? generateAddressesLabelV2({
+            addresses: thisRule.addresses,
+            onPrefixListClick: handleOpenPrefixListDrawer,
+          })
         : generateAddressesLabel(thisRule.addresses),
       id: idx + 1, // ids are 1-indexed, as id given to the useSortable hook cannot be 0
       index: idx,
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRulesLanding.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRulesLanding.tsx
index ae20a00fcb7..f72ac14d99c 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRulesLanding.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRulesLanding.tsx
@@ -19,6 +19,7 @@ import * as React from 'react';
 import { ConfirmationDialog } from 'src/components/ConfirmationDialog/ConfirmationDialog';
 import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
 
+import { FirewallPrefixListDrawer } from './FirewallPrefixListDrawer';
 import { FirewallRuleDrawer } from './FirewallRuleDrawer';
 import {
   hasModified as _hasModified,
@@ -31,6 +32,7 @@ import {
 import { FirewallRuleTable } from './FirewallRuleTable';
 import { parseFirewallRuleError } from './shared';
 
+import type { PrefixListDrawerContext } from './FirewallPrefixListDrawer';
 import type { FirewallRuleDrawerMode } from './FirewallRuleDrawer.types';
 import type { Category } from './shared';
 import type {
@@ -116,6 +118,15 @@ export const FirewallRulesLanding = React.memo((props: Props) => {
   };
 
   const [ruleDrawer, setRuleDrawer] = React.useState<Drawer>(initialDrawer);
+  const [prefixListDrawer, setPrefixListDrawer] = React.useState<{
+    category: Category;
+    context: PrefixListDrawerContext | undefined;
+    selectedPrefixListLabel: string | undefined;
+  }>({
+    category: 'inbound',
+    selectedPrefixListLabel: undefined,
+    context: undefined,
+  });
   const [submitting, setSubmitting] = React.useState<boolean>(false);
   // @todo fine-grained error handling.
   const [generalErrors, setGeneralErrors] = React.useState<
@@ -165,6 +176,30 @@ export const FirewallRulesLanding = React.memo((props: Props) => {
     });
   };
 
+  const openPrefixListDrawer = (
+    category: Category,
+    prefixListLabel: string,
+    context: PrefixListDrawerContext
+  ) => {
+    setPrefixListDrawer({
+      category,
+      selectedPrefixListLabel: prefixListLabel,
+      context,
+    });
+  };
+
+  const closePrefixListDrawer = (options?: { closeAll?: boolean }) => {
+    setPrefixListDrawer({
+      selectedPrefixListLabel: undefined,
+      context: undefined,
+      category: prefixListDrawer.category,
+    });
+
+    if (options?.closeAll) {
+      closeRuleDrawer();
+    }
+  };
+
   /**
    * Rule Editor state hand handlers
    */
@@ -423,6 +458,12 @@ export const FirewallRulesLanding = React.memo((props: Props) => {
             handleCloneRule('inbound', idx)
           }
           handleDeleteFirewallRule={(idx) => handleDeleteRule('inbound', idx)}
+          handleOpenPrefixListDrawer={(prefixListLabel, plRuleRef) => {
+            openPrefixListDrawer('inbound', prefixListLabel, {
+              type: 'rule',
+              plRuleRef,
+            });
+          }}
           handleOpenRuleDrawerForEditing={(idx: number) =>
             openRuleDrawer({
               category: 'inbound',
@@ -459,6 +500,12 @@ export const FirewallRulesLanding = React.memo((props: Props) => {
             handleCloneRule('outbound', idx)
           }
           handleDeleteFirewallRule={(idx) => handleDeleteRule('outbound', idx)}
+          handleOpenPrefixListDrawer={(prefixListLabel, plRuleRef) => {
+            openPrefixListDrawer('outbound', prefixListLabel, {
+              type: 'rule',
+              plRuleRef,
+            });
+          }}
           handleOpenRuleDrawerForEditing={(idx: number) =>
             openRuleDrawer({
               category: 'outbound',
@@ -489,6 +536,17 @@ export const FirewallRulesLanding = React.memo((props: Props) => {
       </StyledDiv>
       <FirewallRuleDrawer
         category={ruleDrawer.category}
+        handleOpenPrefixListDrawer={(
+          prefixListLabel,
+          plRuleRef,
+          contextType
+        ) => {
+          openPrefixListDrawer(ruleDrawer.category, prefixListLabel, {
+            plRuleRef,
+            type: contextType,
+            modeViewedFrom: ruleDrawer.mode,
+          });
+        }}
         isOpen={
           location.pathname.endsWith('add/inbound') ||
           location.pathname.endsWith('add/outbound') ||
@@ -506,6 +564,13 @@ export const FirewallRulesLanding = React.memo((props: Props) => {
         onSubmit={ruleDrawer.mode === 'create' ? handleAddRule : handleEditRule}
         ruleToModifyOrView={ruleToModifyOrView}
       />
+      <FirewallPrefixListDrawer
+        category={prefixListDrawer.category}
+        context={prefixListDrawer.context}
+        isOpen={Boolean(prefixListDrawer.selectedPrefixListLabel?.length)}
+        onClose={closePrefixListDrawer}
+        selectedPrefixListLabel={prefixListDrawer.selectedPrefixListLabel}
+      />
       <StyledActionsPanel
         primaryButtonProps={{
           disabled: !hasUnsavedChanges || disabled,
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.ts b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.ts
index 58cfe9f0a0c..bdf38531fd0 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.ts
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.ts
@@ -35,6 +35,9 @@ export const PORT_PRESETS_ITEMS = sortBy(
 export const RULESET_MARKED_FOR_DELETION_TEXT =
   'This rule set will be automatically deleted when it’s no longer referenced by other firewalls.';
 
+export const PREFIXLIST_MARKED_FOR_DELETION_TEXT =
+  'This Prefix List will be automatically deleted when it’s no longer referenced by other firewalls.';
+
 /**
  * The API returns very good Firewall error messages that look like this:
  *
@@ -129,3 +132,15 @@ export const firewallRuleCreateOptions = [
     value: 'ruleset',
   },
 ] as const;
+
+type PrefixListGroup = 'Account' | 'Other' | 'System';
+
+export const getPrefixListType = (name: string): PrefixListGroup => {
+  if (name.startsWith('pl::')) {
+    return 'Account';
+  }
+  if (name.startsWith('pl:system:')) {
+    return 'System';
+  }
+  return 'Other'; // Safe fallback
+};
diff --git a/packages/manager/src/features/Firewalls/shared.test.tsx b/packages/manager/src/features/Firewalls/shared.test.tsx
index 3264d4cd59c..76ea95c6fe5 100644
--- a/packages/manager/src/features/Firewalls/shared.test.tsx
+++ b/packages/manager/src/features/Firewalls/shared.test.tsx
@@ -273,17 +273,23 @@ describe('generateAddressesLabelV2', () => {
     });
     const { getByText } = renderWithTheme(<>{result}</>);
 
-    await userEvent.click(getByText(/pl:system:test-1/));
-    expect(onPrefixListClick).toHaveBeenCalledWith(
-      'pl:system:test-1',
-      '(IPv4, IPv6)'
-    );
+    await userEvent.click(getByText('pl:system:test-1 (IPv4, IPv6)'));
+    expect(onPrefixListClick).toHaveBeenCalledWith('pl:system:test-1', {
+      inIPv4Rule: true,
+      inIPv6Rule: true,
+    });
 
-    await userEvent.click(getByText(/pl::test-2/));
-    expect(onPrefixListClick).toHaveBeenCalledWith('pl::test-2', '(IPv4)');
+    await userEvent.click(getByText('pl::test-2 (IPv4)'));
+    expect(onPrefixListClick).toHaveBeenCalledWith('pl::test-2', {
+      inIPv4Rule: true,
+      inIPv6Rule: false,
+    });
 
-    await userEvent.click(getByText(/pl::test-3/));
-    expect(onPrefixListClick).toHaveBeenCalledWith('pl::test-3', '(IPv6)');
+    await userEvent.click(getByText('pl::test-3 (IPv6)'));
+    expect(onPrefixListClick).toHaveBeenCalledWith('pl::test-3', {
+      inIPv4Rule: false,
+      inIPv6Rule: true,
+    });
   });
 
   it('renders None if no addresses are provided', () => {
diff --git a/packages/manager/src/features/Firewalls/shared.tsx b/packages/manager/src/features/Firewalls/shared.tsx
index 13460cba613..675683ad504 100644
--- a/packages/manager/src/features/Firewalls/shared.tsx
+++ b/packages/manager/src/features/Firewalls/shared.tsx
@@ -251,8 +251,11 @@ export const generateAddressesLabel = (
   return 'None';
 };
 
-export type PrefixListReference = { inIPv4Rule: boolean; inIPv6Rule: boolean };
-export type PrefixListReferenceMap = Record<string, PrefixListReference>;
+export type PrefixListRuleReference = {
+  inIPv4Rule: boolean;
+  inIPv6Rule: boolean;
+};
+export type PrefixListReferenceMap = Record<string, PrefixListRuleReference>;
 
 const isPrefixList = (ip: string) => ip.startsWith('pl:');
 
@@ -309,7 +312,7 @@ export const buildPrefixListReferenceMap = (addresses: {
 /**
  * Represents the Firewall Rule IP families to which a Prefix List (PL) is attached or referenced.
  *
- * Used for display and logic purposes, e.g., appending to a PL label in the UI as:
+ * Used to display a suffix next to the Prefix List label in the UI, e.g.,:
  * "pl:system:example (IPv4)", "pl:system:example (IPv6)", or "pl:system:example (IPv4, IPv6)".
  *
  * The value indicates which firewall IPs the PL applies to:
@@ -331,11 +334,11 @@ interface GenerateAddressesLabelV2Options {
    * Optional callback invoked when a prefix list label is clicked.
    *
    * @param prefixListLabel - The label of the clicked prefix list (e.g., "pl:system:test")
-   * @param plRuleRefTag - Indicates which firewall rule IP family(s) this PL belongs to: `(IPv4)`, `(IPv6)`, or `(IPv4, IPv6)`
+   * @param plRuleRef - Indicates whether the PL is referenced in the IPv4 and/or IPv6 firewall rule
    */
   onPrefixListClick?: (
     prefixListLabel: string,
-    plRuleRefTag: FirewallRulePrefixListReferenceTag
+    plRuleRef: PrefixListRuleReference
   ) => void;
   /**
    * Whether to show the truncation "+N" chip with a scrollable tooltip
@@ -416,7 +419,7 @@ export const generateAddressesLabelV2 = (
         key={pl}
         onClick={(e) => {
           e.preventDefault();
-          onPrefixListClick?.(pl, plRuleRefTag);
+          onPrefixListClick?.(pl, reference);
         }}
       >
         {`${pl} ${plRuleRefTag}`}
diff --git a/packages/manager/src/mocks/serverHandlers.ts b/packages/manager/src/mocks/serverHandlers.ts
index 6e185699fc8..48a10019344 100644
--- a/packages/manager/src/mocks/serverHandlers.ts
+++ b/packages/manager/src/mocks/serverHandlers.ts
@@ -1323,8 +1323,8 @@ export const handlers = [
         label: 'firewall with rule and ruleset reference',
         rules: firewallRulesFactory.build({
           inbound: [
-            firewallRuleFactory.build({ ruleset: 123 }), // Referenced Ruleset to the Firewall (ID 123)
-            firewallRuleFactory.build({ ruleset: 123456789 }), // Referenced Ruleset to the Firewall (ID 123456789)
+            { ruleset: 123 }, // Referenced Ruleset to the Firewall (ID 123)
+            { ruleset: 123456789 }, // Referenced Ruleset to the Firewall (ID 123456789)
             ...firewallRuleFactory.buildList(1),
           ],
         }),
@@ -1361,8 +1361,46 @@ export const handlers = [
     ];
     return HttpResponse.json(makeResourcePage(rulesets));
   }),
-  http.get('*/v4beta/networking/prefixlists', () => {
-    const prefixlists = firewallPrefixListFactory.buildList(10);
+  http.get('*/v4beta/networking/prefixlists', ({ request }) => {
+    const prefixlists = [
+      ...firewallPrefixListFactory.buildList(10),
+      ...Array.from({ length: 2 }, (_, i) =>
+        firewallPrefixListFactory.build({
+          name: `pl::vpcs:supports-both-${i + 1}`,
+          description: `pl::vpcs:supports-both-${i + 1} description`,
+        })
+      ),
+      // Prefix List variants / cases
+      ...[
+        { name: 'pl::supports-both' },
+        { name: 'pl:system:supports-only-ipv4', ipv6: null },
+        { name: 'pl::supports-only-ipv6', ipv4: null },
+        { name: 'pl::supports-both-but-ipv6-empty', ipv6: [] },
+        { name: 'pl::supports-both-but-empty-both', ipv4: [], ipv6: [] },
+        { name: 'pl::marked-for-deletion', deleted: '2025-11-18T18:51:11' },
+        { name: 'pl::not-supported', ipv4: null, ipv6: null },
+      ].map((variant) =>
+        firewallPrefixListFactory.build({
+          ...variant,
+          description: `${variant.name} description`,
+        })
+      ),
+    ];
+
+    if (request.headers.get('x-filter')) {
+      const filter = JSON.parse(request.headers.get('x-filter') || '{}');
+
+      if (filter['name']) {
+        const match =
+          prefixlists.find((pl) => pl.name === filter.name) ??
+          firewallPrefixListFactory.build({
+            name: filter['name'],
+            description: `${filter['name']} description`,
+          }); // fallback if not found
+
+        return HttpResponse.json(makeResourcePage([match]));
+      }
+    }
     return HttpResponse.json(makeResourcePage(prefixlists));
   }),
   http.get(
@@ -1416,28 +1454,30 @@ export const handlers = [
             label: 'firewall with rule and ruleset reference',
             rules: firewallRulesFactory.build({
               inbound: [
-                firewallRuleFactory.build({ ruleset: 123 }), // Referenced Ruleset to the Firewall (ID 123)
-                firewallRuleFactory.build({ ruleset: 123456789 }), // Referenced Ruleset to the Firewall (ID 123456789)
+                { ruleset: 123 }, // Referenced Ruleset to the Firewall (ID 123)
+                { ruleset: 123456789 }, // Referenced Ruleset to the Firewall (ID 123456789)
                 ...firewallRuleFactory.buildList(1, {
                   addresses: {
                     ipv4: [
-                      'pl:system:test-1',
-                      'pl::vpcs:test-1',
+                      'pl::supports-both',
+                      'pl:system:supports-only-ipv4',
                       '192.168.1.213',
                       '192.168.1.214',
-                      '192.168.1.215',
-                      '192.168.1.216',
-                      'pl::vpcs:test-2',
+                      'pl::vpcs:supports-both-1',
+                      'pl::supports-both-but-empty-both',
                       '172.31.255.255',
+                      'pl::marked-for-deletion',
                     ],
                     ipv6: [
-                      'pl:system:test-1',
-                      'pl::vpcs:test-3',
+                      'pl::supports-both',
+                      'pl::supports-only-ipv6',
+                      'pl::supports-both-but-ipv6-empty',
+                      'pl::vpcs:supports-both-2',
                       '2001:db8:85a3::8a2e:370:7334/128',
                       '2001:db8:85a3::8a2e:371:7335/128',
-                      'pl::vpcs:test-3',
-                      'pl::vpcs:test-4',
-                      'pl::vpcs:test-5',
+                      // Duplicate PrefixList entries like the below one, may not appear, but if they do,
+                      // our logic will treat them as a single entity within the ipv4 or ipv6 array.
+                      'pl::vpcs:supports-both-2',
                       '2001:db8:85a3::8a2e:372:7336/128',
                     ],
                   },

From debff9e79bebc888e1b9db43fc1beec278ef71b0 Mon Sep 17 00:00:00 2001
From: kagora-akamai <kagora@akamai.com>
Date: Tue, 2 Dec 2025 15:13:13 +0100
Subject: [PATCH 61/91] change: [DPS-35759] - Fix UI/Copy issues after UX
 review (#13140)

* change: [DPS-35759] - Fix UI/Copy issues after UX review

* revert spacing change - point 2
---
 .../pr-13140-changed-1764317364992.md         |   5 +
 .../Destinations/DestinationTableRow.tsx      |   3 +
 .../Destinations/DestinationsLanding.tsx      |  18 ++-
 .../features/Delivery/Shared/LabelValue.tsx   |  23 +++-
 .../Clusters/StreamFormClusters.tsx           | 123 +++++++++++++-----
 ...AkamaiObjectStorageDetailsSummary.test.tsx |   4 +-
 ...ationAkamaiObjectStorageDetailsSummary.tsx |  26 +---
 .../StreamForm/StreamFormGeneralInfo.tsx      |   5 +-
 .../Delivery/Streams/StreamTableRow.tsx       |   5 +-
 .../Delivery/Streams/StreamsLanding.test.tsx  |   3 +-
 .../Delivery/Streams/StreamsLanding.tsx       |  24 +++-
 .../features/Delivery/Streams/constants.ts    |   2 +-
 12 files changed, 167 insertions(+), 74 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13140-changed-1764317364992.md

diff --git a/packages/manager/.changeset/pr-13140-changed-1764317364992.md b/packages/manager/.changeset/pr-13140-changed-1764317364992.md
new file mode 100644
index 00000000000..c983c60cbca
--- /dev/null
+++ b/packages/manager/.changeset/pr-13140-changed-1764317364992.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Changed
+---
+
+Logs Delivery UI changes after review ([#13140](https://github.com/linode/manager/pull/13140))
diff --git a/packages/manager/src/features/Delivery/Destinations/DestinationTableRow.tsx b/packages/manager/src/features/Delivery/Destinations/DestinationTableRow.tsx
index 8ef54400dda..4c6a850a217 100644
--- a/packages/manager/src/features/Delivery/Destinations/DestinationTableRow.tsx
+++ b/packages/manager/src/features/Delivery/Destinations/DestinationTableRow.tsx
@@ -42,6 +42,9 @@ export const DestinationTableRow = React.memo(
         <TableCell>
           <DateTimeDisplay value={destination.updated} />
         </TableCell>
+        <Hidden lgDown>
+          <TableCell>{destination.updated_by}</TableCell>
+        </Hidden>
         <TableCell actionCell>
           <DestinationActionMenu
             destination={destination}
diff --git a/packages/manager/src/features/Delivery/Destinations/DestinationsLanding.tsx b/packages/manager/src/features/Delivery/Destinations/DestinationsLanding.tsx
index 6012361be59..78fa105b513 100644
--- a/packages/manager/src/features/Delivery/Destinations/DestinationsLanding.tsx
+++ b/packages/manager/src/features/Delivery/Destinations/DestinationsLanding.tsx
@@ -1,5 +1,5 @@
 import { useDestinationsQuery } from '@linode/queries';
-import { CircleProgress, ErrorState, Hidden } from '@linode/ui';
+import { CircleProgress, ErrorState, Hidden, Paper } from '@linode/ui';
 import { TableBody, TableHead, TableRow } from '@mui/material';
 import Table from '@mui/material/Table';
 import { useNavigate, useSearch } from '@tanstack/react-router';
@@ -119,7 +119,7 @@ export const DestinationsLanding = () => {
   };
 
   return (
-    <>
+    <Paper>
       <DeliveryTabHeader
         entity="Destination"
         isSearching={isFetching}
@@ -177,6 +177,16 @@ export const DestinationsLanding = () => {
                 >
                   Last Modified
                 </TableSortCell>
+                <Hidden lgDown>
+                  <TableSortCell
+                    active={orderBy === 'updated_by'}
+                    direction={order}
+                    handleClick={handleOrderChange}
+                    label="updated_by"
+                  >
+                    Last Modified By
+                  </TableSortCell>
+                </Hidden>
                 <TableCell sx={{ width: '5%' }} />
               </TableRow>
             </TableHead>
@@ -188,7 +198,7 @@ export const DestinationsLanding = () => {
                   {...handlers}
                 />
               ))}
-              {destinations?.results === 0 && <TableRowEmpty colSpan={6} />}
+              {destinations?.results === 0 && <TableRowEmpty colSpan={7} />}
             </TableBody>
           </Table>
           <PaginationFooter
@@ -206,6 +216,6 @@ export const DestinationsLanding = () => {
           />
         </>
       )}
-    </>
+    </Paper>
   );
 };
diff --git a/packages/manager/src/features/Delivery/Shared/LabelValue.tsx b/packages/manager/src/features/Delivery/Shared/LabelValue.tsx
index da41143ffc3..87bfb5323e2 100644
--- a/packages/manager/src/features/Delivery/Shared/LabelValue.tsx
+++ b/packages/manager/src/features/Delivery/Shared/LabelValue.tsx
@@ -1,5 +1,6 @@
-import { Box, Typography } from '@linode/ui';
+import { Box, Tooltip, Typography } from '@linode/ui';
 import { styled, useTheme } from '@mui/material/styles';
+import useMediaQuery from '@mui/material/useMediaQuery';
 import * as React from 'react';
 
 interface LabelValueProps {
@@ -7,6 +8,7 @@ interface LabelValueProps {
   compact?: boolean;
   'data-testid'?: string;
   label: string;
+  smHideTooltip?: boolean;
   value: string;
 }
 
@@ -17,8 +19,10 @@ export const LabelValue = (props: LabelValueProps) => {
     value,
     'data-testid': dataTestId,
     children,
+    smHideTooltip,
   } = props;
   const theme = useTheme();
+  const matchesSmDown = useMediaQuery(theme.breakpoints.down('sm'));
 
   return (
     <Box
@@ -35,13 +39,18 @@ export const LabelValue = (props: LabelValueProps) => {
       >
         {label}:
       </Typography>
-      <StyledValue data-testid={dataTestId}>{value}</StyledValue>
+      <StyledValue
+        data-testid={dataTestId}
+        title={!smHideTooltip && matchesSmDown ? value : undefined}
+      >
+        <Typography>{value}</Typography>
+      </StyledValue>
       {children}
     </Box>
   );
 };
 
-const StyledValue = styled(Box, {
+const StyledValue = styled(Tooltip, {
   label: 'StyledValue',
 })(({ theme }) => ({
   alignItems: 'center',
@@ -51,4 +60,12 @@ const StyledValue = styled(Box, {
   display: 'flex',
   height: theme.spacingFunction(24),
   padding: theme.spacingFunction(4, 8),
+  [theme.breakpoints.down('sm')]: {
+    display: 'block',
+    maxWidth: '174px',
+    textOverflow: 'ellipsis',
+    overflow: 'hidden',
+    whiteSpace: 'nowrap',
+    padding: theme.spacingFunction(1, 8),
+  },
 }));
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClusters.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClusters.tsx
index 60384dfd948..c2d69760dd8 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClusters.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClusters.tsx
@@ -1,3 +1,5 @@
+import { useRegionsQuery } from '@linode/queries';
+import { useIsGeckoEnabled } from '@linode/shared';
 import {
   Box,
   Checkbox,
@@ -8,6 +10,10 @@ import {
   Typography,
 } from '@linode/ui';
 import { capitalize } from '@linode/utilities';
+import Grid from '@mui/material/Grid';
+import { styled, type Theme } from '@mui/material/styles';
+import useMediaQuery from '@mui/material/useMediaQuery';
+import { useFlags } from 'launchdarkly-react-client-sdk';
 import { enqueueSnackbar } from 'notistack';
 import React, { useEffect, useMemo, useState } from 'react';
 import { useWatch } from 'react-hook-form';
@@ -17,6 +23,7 @@ import { DebouncedSearchTextField } from 'src/components/DebouncedSearchTextFiel
 import { sortData } from 'src/components/OrderBy';
 import { PaginationFooter } from 'src/components/PaginationFooter/PaginationFooter';
 import { MIN_PAGE_SIZE } from 'src/components/PaginationFooter/PaginationFooter.constants';
+import { RegionSelect } from 'src/components/RegionSelect/RegionSelect';
 import { Table } from 'src/components/Table';
 import { StreamFormClusterTableContent } from 'src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClustersTableContent';
 import { useAllKubernetesClustersQuery } from 'src/queries/kubernetes';
@@ -41,11 +48,17 @@ export const StreamFormClusters = (props: StreamFormClustersProps) => {
   const { control, setValue, formState, trigger } =
     useFormContext<StreamAndDestinationFormType>();
 
+  const xsDown = useMediaQuery((theme: Theme) => theme.breakpoints.down('sm'));
+  const { gecko2 } = useFlags();
+  const { isGeckoLAEnabled } = useIsGeckoEnabled(gecko2?.enabled, gecko2?.la);
+  const { data: regions } = useRegionsQuery();
+
   const [order, setOrder] = useState<'asc' | 'desc'>('asc');
   const [orderBy, setOrderBy] = useState<OrderByKeys>('label');
   const [page, setPage] = useState<number>(1);
   const [pageSize, setPageSize] = useState<number>(MIN_PAGE_SIZE);
   const [searchText, setSearchText] = useState<string>('');
+  const [regionFilter, setRegionFilter] = useState<string>('');
 
   const {
     data: clusters = [],
@@ -119,20 +132,30 @@ export const StreamFormClusters = (props: StreamFormClustersProps) => {
     }
   };
 
-  const filteredClusters = !searchText
-    ? clusters
-    : clusters.filter((cluster) => {
-        const lowerSearch = searchText.toLowerCase();
+  const filteredClusters =
+    !searchText && !regionFilter
+      ? clusters
+      : clusters.filter((cluster) => {
+          const lowerSearch = searchText.toLowerCase();
 
-        return (
-          cluster.label.toLowerCase().includes(lowerSearch) ||
-          cluster.region.toLowerCase().includes(lowerSearch) ||
-          (cluster.control_plane.audit_logs_enabled
-            ? 'enabled'
-            : 'disabled'
-          ).includes(lowerSearch)
-        );
-      });
+          let result = true;
+
+          if (searchText) {
+            result =
+              cluster.label.toLowerCase().includes(lowerSearch) ||
+              cluster.region.toLowerCase().includes(lowerSearch) ||
+              (cluster.control_plane.audit_logs_enabled
+                ? 'enabled'
+                : 'disabled'
+              ).includes(lowerSearch);
+          }
+
+          if (result && regionFilter) {
+            return cluster.region === regionFilter;
+          }
+
+          return result;
+        });
 
   const sortedAndFilteredClusters = sortData<KubernetesCluster>(
     orderBy,
@@ -201,24 +224,49 @@ export const StreamFormClusters = (props: StreamFormClustersProps) => {
               )}
             />
           </div>
-          <DebouncedSearchTextField
-            clearable
-            containerProps={{
-              sx: {
-                width: '40%',
-                mt: 2,
-              },
-            }}
-            debounceTime={250}
-            hideLabel
-            inputProps={{
-              'data-pendo-id': `Logs Delivery Streams ${capitalize(mode)}-Clusters-Search`,
+          <StyledGrid
+            sx={{
+              alignItems: 'center',
+              display: 'flex',
+              flexWrap: xsDown ? 'wrap' : 'nowrap',
+              gap: 3,
+              justifyContent: 'space-between',
+              flex: '1 1 auto',
+              mt: 2,
             }}
-            label="Search"
-            onSearch={(value) => setSearchText(value)}
-            placeholder="Search"
-            value={searchText}
-          />
+          >
+            <DebouncedSearchTextField
+              clearable
+              containerProps={{
+                sx: {
+                  width: '40%',
+                },
+              }}
+              debounceTime={250}
+              hideLabel
+              inputProps={{
+                'data-pendo-id': `Logs Delivery Streams ${capitalize(mode)}-Clusters-Search`,
+              }}
+              label="Search"
+              onSearch={(value) => setSearchText(value)}
+              placeholder="Search"
+              value={searchText}
+            />
+            <RegionSelect
+              currentCapability="Object Storage"
+              isGeckoLAEnabled={isGeckoLAEnabled}
+              label="Region"
+              onChange={(_, region) => {
+                setRegionFilter(region?.id ?? '');
+              }}
+              regionFilter="core"
+              regions={regions ?? []}
+              sx={{
+                width: '280px !important',
+              }}
+              value={regionFilter}
+            />
+          </StyledGrid>
           <Box sx={{ mt: 2 }}>
             {!isAutoAddAllClustersEnabled &&
               formState.errors.stream?.details?.cluster_ids?.message && (
@@ -258,3 +306,18 @@ export const StreamFormClusters = (props: StreamFormClustersProps) => {
     </Paper>
   );
 };
+
+const StyledGrid = styled(Grid)(({ theme }) => ({
+  '& .MuiAutocomplete-root > .MuiBox-root': {
+    display: 'flex',
+
+    '& > .MuiBox-root': {
+      margin: '0',
+
+      '& > .MuiInputLabel-root': {
+        margin: 0,
+        marginRight: theme.spacingFunction(12),
+      },
+    },
+  },
+}));
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/DestinationAkamaiObjectStorageDetailsSummary.test.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/DestinationAkamaiObjectStorageDetailsSummary.test.tsx
index 930cc8aae30..968e97568f3 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/DestinationAkamaiObjectStorageDetailsSummary.test.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/DestinationAkamaiObjectStorageDetailsSummary.test.tsx
@@ -37,7 +37,7 @@ describe('DestinationAkamaiObjectStorageDetailsSummary', () => {
     );
   });
 
-  it('renders info icon next to path when it is empty', async () => {
+  it('does not render log path when it is empty', async () => {
     const details = {
       bucket_name: 'test bucket',
       host: 'test host',
@@ -49,6 +49,6 @@ describe('DestinationAkamaiObjectStorageDetailsSummary', () => {
     );
 
     // Log Path info icon:
-    expect(screen.getByTestId('tooltip-info-icon')).toBeVisible();
+    expect(screen.queryByText('tooltip-info-icon')).not.toBeInTheDocument();
   });
 });
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/DestinationAkamaiObjectStorageDetailsSummary.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/DestinationAkamaiObjectStorageDetailsSummary.tsx
index d9b1eba72ae..cd016649a83 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/DestinationAkamaiObjectStorageDetailsSummary.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/DestinationAkamaiObjectStorageDetailsSummary.tsx
@@ -1,17 +1,9 @@
-import { streamType } from '@linode/api-v4';
-import { Stack, TooltipIcon, Typography } from '@linode/ui';
 import React from 'react';
 
-import { getStreamTypeOption } from 'src/features/Delivery/deliveryUtils';
 import { LabelValue } from 'src/features/Delivery/Shared/LabelValue';
 
 import type { AkamaiObjectStorageDetails } from '@linode/api-v4';
 
-const sxTooltipIcon = {
-  marginLeft: '4px',
-  padding: '0px',
-};
-
 export const DestinationAkamaiObjectStorageDetailsSummary = (
   props: AkamaiObjectStorageDetails
 ) => {
@@ -24,28 +16,16 @@ export const DestinationAkamaiObjectStorageDetailsSummary = (
       <LabelValue
         data-testid="access-key-id"
         label="Access Key ID"
+        smHideTooltip={true}
         value="*****************"
       />
       <LabelValue
         data-testid="secret-access-key"
         label="Secret Access Key"
+        smHideTooltip={true}
         value="*****************"
       />
-      <LabelValue label="Log Path" value={path}>
-        {!path && (
-          <TooltipIcon
-            status="info"
-            sxTooltipIcon={sxTooltipIcon}
-            text={
-              <Stack spacing={2}>
-                <Typography>Default paths:</Typography>
-                <Typography>{`${getStreamTypeOption(streamType.LKEAuditLogs)?.label} - {stream_type}/{log_type}/ {account}/{partition}/ {%Y/%m/%d/}`}</Typography>
-                <Typography>{`${getStreamTypeOption(streamType.AuditLogs)?.label} - {stream_type}/{log_type}/ {account}/{%Y/%m/%d/}`}</Typography>
-              </Stack>
-            }
-          />
-        )}
-      </LabelValue>
+      {!!path && <LabelValue label="Log Path" value={path} />}
     </>
   );
 };
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamFormGeneralInfo.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamFormGeneralInfo.tsx
index bc586e7d8d4..f2e511450f3 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamFormGeneralInfo.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamFormGeneralInfo.tsx
@@ -39,9 +39,9 @@ export const StreamFormGeneralInfo = (props: StreamFormGeneralInfoProps) => {
   const capitalizedMode = capitalize(mode);
   const description = {
     audit_logs:
-      'Configuration and authentication audit logs that capture state-changing operations (mutations) on Linode cloud infrastructure resources and IAM authentication events. Delivered in cloudevents.io JSON format.',
+      'Audit logs record state-changing operations on cloud resources and authentication events, delivered in CloudEvents JSON format.',
     lke_audit_logs:
-      'Kubernetes API server audit logs that capture state-changing operations (mutations) on LKE-E cluster resources.',
+      'Kubernetes API server audit logs capture state-changing operations on LKE-E cluster resources.',
   };
   const pendoIds = {
     audit_logs: `Logs Delivery Streams ${capitalizedMode}-Audit Logs`,
@@ -136,6 +136,7 @@ export const StreamFormGeneralInfo = (props: StreamFormGeneralInfoProps) => {
         sx={{
           mt: theme.spacingFunction(16),
           maxWidth: 480,
+          whiteSpace: 'preserve-spaces',
         }}
       >
         {description[selectedStreamType]}
diff --git a/packages/manager/src/features/Delivery/Streams/StreamTableRow.tsx b/packages/manager/src/features/Delivery/Streams/StreamTableRow.tsx
index 891c62cd830..91ebdd2e986 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamTableRow.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamTableRow.tsx
@@ -46,9 +46,12 @@ export const StreamTableRow = React.memo((props: StreamTableRowProps) => {
       </Hidden>
       <Hidden lgDown>
         <TableCell>
-          <DateTimeDisplay value={stream.created} />
+          <DateTimeDisplay value={stream.updated} />
         </TableCell>
       </Hidden>
+      <Hidden lgDown>
+        <TableCell>{stream.updated_by}</TableCell>
+      </Hidden>
       <TableCell actionCell>
         <StreamActionMenu
           onDelete={onDelete}
diff --git a/packages/manager/src/features/Delivery/Streams/StreamsLanding.test.tsx b/packages/manager/src/features/Delivery/Streams/StreamsLanding.test.tsx
index fd776993df5..30f2a794027 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamsLanding.test.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamsLanding.test.tsx
@@ -80,7 +80,8 @@ describe('Streams Landing Table', () => {
     within(screen.getByRole('table')).getByText('Status');
     screen.getByText('ID');
     screen.getByText('Destination Type');
-    screen.getByText('Creation Time');
+    screen.getByText('Last Modified');
+    screen.getByText('Last Modified By');
 
     // PaginationFooter
     const paginationFooterSelectPageSizeInput = screen.getAllByTestId(
diff --git a/packages/manager/src/features/Delivery/Streams/StreamsLanding.tsx b/packages/manager/src/features/Delivery/Streams/StreamsLanding.tsx
index ce0ade7b71c..8316af51819 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamsLanding.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamsLanding.tsx
@@ -1,6 +1,6 @@
 import { streamStatus } from '@linode/api-v4';
 import { useStreamsQuery, useUpdateStreamMutation } from '@linode/queries';
-import { CircleProgress, ErrorState, Hidden } from '@linode/ui';
+import { CircleProgress, ErrorState, Hidden, Paper } from '@linode/ui';
 import { TableBody, TableCell, TableHead, TableRow } from '@mui/material';
 import Table from '@mui/material/Table';
 import { useNavigate, useSearch } from '@tanstack/react-router';
@@ -177,7 +177,7 @@ export const StreamsLanding = () => {
   };
 
   return (
-    <>
+    <Paper>
       <DeliveryTabHeader
         entity="Stream"
         isSearching={isFetching}
@@ -234,12 +234,22 @@ export const StreamsLanding = () => {
                 </Hidden>
                 <Hidden lgDown>
                   <TableSortCell
-                    active={orderBy === 'created'}
+                    active={orderBy === 'updated'}
                     direction={order}
                     handleClick={handleOrderChange}
-                    label="created"
+                    label="updated"
                   >
-                    Creation Time
+                    Last Modified
+                  </TableSortCell>
+                </Hidden>
+                <Hidden lgDown>
+                  <TableSortCell
+                    active={orderBy === 'updated_by'}
+                    direction={order}
+                    handleClick={handleOrderChange}
+                    label="updated_by"
+                  >
+                    Last Modified By
                   </TableSortCell>
                 </Hidden>
                 <TableCell sx={{ width: '5%' }} />
@@ -249,7 +259,7 @@ export const StreamsLanding = () => {
               {streams?.data.map((stream) => (
                 <StreamTableRow key={stream.id} stream={stream} {...handlers} />
               ))}
-              {streams?.results === 0 && <TableRowEmpty colSpan={7} />}
+              {streams?.results === 0 && <TableRowEmpty colSpan={8} />}
             </TableBody>
           </Table>
           <PaginationFooter
@@ -267,6 +277,6 @@ export const StreamsLanding = () => {
           />
         </>
       )}
-    </>
+    </Paper>
   );
 };
diff --git a/packages/manager/src/features/Delivery/Streams/constants.ts b/packages/manager/src/features/Delivery/Streams/constants.ts
index e5035a18049..28d6f37de2c 100644
--- a/packages/manager/src/features/Delivery/Streams/constants.ts
+++ b/packages/manager/src/features/Delivery/Streams/constants.ts
@@ -1,3 +1,3 @@
 export const STREAMS_TABLE_DEFAULT_ORDER = 'desc';
-export const STREAMS_TABLE_DEFAULT_ORDER_BY = 'created';
+export const STREAMS_TABLE_DEFAULT_ORDER_BY = 'updated';
 export const STREAMS_TABLE_PREFERENCE_KEY = 'streams';

From 23aa45d77dbf6e389af0bb0b2f5d274e9291b721 Mon Sep 17 00:00:00 2001
From: Dmytro Chyrva <dchyrva@akamai.com>
Date: Tue, 2 Dec 2025 22:07:24 +0100
Subject: [PATCH 62/91] new: STORIF-172 - Create bucket button removed from OBJ
 summary page. (#13144)

---
 .../src/features/ObjectStorage/ObjectStorageLanding.tsx        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/manager/src/features/ObjectStorage/ObjectStorageLanding.tsx b/packages/manager/src/features/ObjectStorage/ObjectStorageLanding.tsx
index 44abde6e8b1..e54bd60784a 100644
--- a/packages/manager/src/features/ObjectStorage/ObjectStorageLanding.tsx
+++ b/packages/manager/src/features/ObjectStorage/ObjectStorageLanding.tsx
@@ -120,6 +120,7 @@ export const ObjectStorageLanding = () => {
     }
   };
 
+  const isSummaryOpened = match.routeId === '/object-storage/summary';
   const isCreateBucketOpen = match.routeId === '/object-storage/buckets/create';
   const isCreateAccessKeyOpen =
     match.routeId === '/object-storage/access-keys/create';
@@ -151,7 +152,7 @@ export const ObjectStorageLanding = () => {
         disabledCreateButton={isRestrictedUser}
         docsLink="https://www.linode.com/docs/platform/object-storage/"
         entity="Object Storage"
-        onButtonClick={createButtonAction}
+        onButtonClick={isSummaryOpened ? undefined : createButtonAction}
         removeCrumbX={1}
         shouldHideDocsAndCreateButtons={shouldHideDocsAndCreateButtons}
         spacingBottom={4}

From b89d5f34bdcb5fcd35ada85d5757cf04eff50e79 Mon Sep 17 00:00:00 2001
From: Hana Xu <115299789+hana-akamai@users.noreply.github.com>
Date: Tue, 2 Dec 2025 16:56:54 -0500
Subject: [PATCH 63/91] feat: [UIE-9384] - Add Connection Pool
 types/endpoints/queries (#13148)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description 📝

Add Connection Pool types, endpoints, queries, validation for the upcoming PG Bouncer work

## How to test 🧪

### Verification steps

(How to verify changes)

- [ ] Nothing to test in the UI yet, so we just need to make sure the types match the API spec and that the logic looks good
---
 ...r-13148-upcoming-features-1764600387228.md |  5 ++
 packages/api-v4/src/databases/databases.ts    | 73 +++++++++++++++++
 packages/api-v4/src/databases/types.ts        | 11 +++
 packages/manager/src/factories/databases.ts   | 12 +++
 ...r-13148-upcoming-features-1764600420579.md |  5 ++
 packages/queries/src/databases/databases.ts   | 78 +++++++++++++++++++
 packages/queries/src/databases/keys.ts        | 15 ++++
 ...r-13148-upcoming-features-1764600446107.md |  5 ++
 packages/validation/src/databases.schema.ts   | 19 +++++
 9 files changed, 223 insertions(+)
 create mode 100644 packages/api-v4/.changeset/pr-13148-upcoming-features-1764600387228.md
 create mode 100644 packages/queries/.changeset/pr-13148-upcoming-features-1764600420579.md
 create mode 100644 packages/validation/.changeset/pr-13148-upcoming-features-1764600446107.md

diff --git a/packages/api-v4/.changeset/pr-13148-upcoming-features-1764600387228.md b/packages/api-v4/.changeset/pr-13148-upcoming-features-1764600387228.md
new file mode 100644
index 00000000000..545cf23d859
--- /dev/null
+++ b/packages/api-v4/.changeset/pr-13148-upcoming-features-1764600387228.md
@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Upcoming Features
+---
+
+Added Database Connection Pool types and endpoints ([#13148](https://github.com/linode/manager/pull/13148))
diff --git a/packages/api-v4/src/databases/databases.ts b/packages/api-v4/src/databases/databases.ts
index 181fbb4a0a0..e23f1ac3536 100644
--- a/packages/api-v4/src/databases/databases.ts
+++ b/packages/api-v4/src/databases/databases.ts
@@ -1,5 +1,7 @@
 import {
+  createDatabaseConnectionPoolSchema,
   createDatabaseSchema,
+  updateDatabaseConnectionPoolSchema,
   updateDatabaseSchema,
 } from '@linode/validation/lib/databases.schema';
 
@@ -14,6 +16,7 @@ import Request, {
 
 import type { Filter, ResourcePage as Page, Params } from '../types';
 import type {
+  ConnectionPool,
   CreateDatabasePayload,
   Database,
   DatabaseBackup,
@@ -364,3 +367,73 @@ export const getDatabaseEngineConfig = (engine: Engine) =>
     setURL(`${API_ROOT}/databases/${encodeURIComponent(engine)}/config`),
     setMethod('GET'),
   );
+
+/**
+ * Get a paginated list of connection pools for a database
+ */
+export const getDatabaseConnectionPools = (databaseID: number) =>
+  Request<Page<ConnectionPool>>(
+    setURL(
+      `${API_ROOT}/databases/postgresql/instances/${encodeURIComponent(databaseID)}/connection-pools`,
+    ),
+    setMethod('GET'),
+  );
+
+/**
+ * Get a connection pool for a database
+ */
+export const getDatabaseConnectionPool = (
+  databaseID: number,
+  poolName: string,
+) =>
+  Request<ConnectionPool>(
+    setURL(
+      `${API_ROOT}/databases/postgresql/instances/${encodeURIComponent(databaseID)}/connection-pools/${encodeURIComponent(poolName)}`,
+    ),
+    setMethod('GET'),
+  );
+
+/**
+ * Create a new connection pool for a database. Connection pools can only be created on active clusters
+ */
+export const createDatabaseConnectionPool = (
+  databaseID: number,
+  data: ConnectionPool,
+) =>
+  Request<ConnectionPool>(
+    setURL(
+      `${API_ROOT}/databases/postgresql/instances/${encodeURIComponent(databaseID)}/connection-pools`,
+    ),
+    setMethod('POST'),
+    setData(data, createDatabaseConnectionPoolSchema),
+  );
+
+/**
+ * Update an existing connection pool. This may cause sudden closure of an in-use connection pool
+ */
+export const updateDatabaseConnectionPool = (
+  databaseID: number,
+  poolName: string,
+  data: Omit<ConnectionPool, 'label'>,
+) =>
+  Request<ConnectionPool>(
+    setURL(
+      `${API_ROOT}/databases/postgresql/instances/${encodeURIComponent(databaseID)}/connection-pools/${encodeURIComponent(poolName)}`,
+    ),
+    setMethod('PUT'),
+    setData(data, updateDatabaseConnectionPoolSchema),
+  );
+
+/**
+ * Delete an existing connection pool. This may cause sudden closure of an in-use connection pool
+ */
+export const deleteDatabaseConnectionPool = (
+  databaseID: number,
+  poolName: string,
+) =>
+  Request<{}>(
+    setURL(
+      `${API_ROOT}/databases/postgresql/instances/${encodeURIComponent(databaseID)}/connection-pools/${encodeURIComponent(poolName)}`,
+    ),
+    setMethod('DELETE'),
+  );
diff --git a/packages/api-v4/src/databases/types.ts b/packages/api-v4/src/databases/types.ts
index 3a07d9aadf6..984cb63e279 100644
--- a/packages/api-v4/src/databases/types.ts
+++ b/packages/api-v4/src/databases/types.ts
@@ -105,6 +105,7 @@ type MemberType = 'failover' | 'primary';
 export interface DatabaseInstance {
   allow_list: string[];
   cluster_size: ClusterSize;
+  connection_pool_port: null | number;
   connection_strings: ConnectionStrings[];
   created: string;
   /** @Deprecated used by rdbms-legacy only, rdbms-default always encrypts */
@@ -249,3 +250,13 @@ export interface UpdateDatabasePayload {
   updates?: UpdatesSchedule;
   version?: string;
 }
+
+export type PoolMode = 'session' | 'statement' | 'transaction';
+
+export interface ConnectionPool {
+  database: string;
+  label: string;
+  mode: PoolMode;
+  size: number;
+  username: null | string;
+}
diff --git a/packages/manager/src/factories/databases.ts b/packages/manager/src/factories/databases.ts
index ff326fd2722..ac10c20c467 100644
--- a/packages/manager/src/factories/databases.ts
+++ b/packages/manager/src/factories/databases.ts
@@ -1,5 +1,6 @@
 import {
   type ClusterSize,
+  type ConnectionPool,
   type Database,
   type DatabaseBackup,
   type DatabaseEngine,
@@ -160,6 +161,7 @@ export const databaseInstanceFactory =
         ? ([1, 3][i % 2] as ClusterSize)
         : ([1, 2, 3][i % 3] as ClusterSize)
     ),
+    connection_pool_port: null,
     connection_strings: [],
     created: '2021-12-09T17:15:12',
     encrypted: false,
@@ -211,6 +213,7 @@ export const databaseInstanceFactory =
 export const databaseFactory = Factory.Sync.makeFactory<Database>({
   allow_list: [...IPv4List],
   cluster_size: Factory.each(() => pickRandom([1, 3])),
+  connection_pool_port: null,
   connection_strings: [
     {
       driver: 'python',
@@ -285,6 +288,15 @@ export const databaseEngineFactory = Factory.Sync.makeFactory<DatabaseEngine>({
   version: Factory.each((i) => `${i}`),
 });
 
+export const databaseConnectionPoolFactory =
+  Factory.Sync.makeFactory<ConnectionPool>({
+    database: 'defaultdb',
+    mode: 'transaction',
+    label: Factory.each((i) => `pool/${i}`),
+    size: 10,
+    username: null,
+  });
+
 export const mysqlConfigResponse = {
   binlog_retention_period: {
     description:
diff --git a/packages/queries/.changeset/pr-13148-upcoming-features-1764600420579.md b/packages/queries/.changeset/pr-13148-upcoming-features-1764600420579.md
new file mode 100644
index 00000000000..782b19cc762
--- /dev/null
+++ b/packages/queries/.changeset/pr-13148-upcoming-features-1764600420579.md
@@ -0,0 +1,5 @@
+---
+"@linode/queries": Upcoming Features
+---
+
+Added Database Connection Pool queries ([#13148](https://github.com/linode/manager/pull/13148))
diff --git a/packages/queries/src/databases/databases.ts b/packages/queries/src/databases/databases.ts
index 867ab791ba9..505955d11fd 100644
--- a/packages/queries/src/databases/databases.ts
+++ b/packages/queries/src/databases/databases.ts
@@ -1,6 +1,8 @@
 import {
   createDatabase,
+  createDatabaseConnectionPool,
   deleteDatabase,
+  deleteDatabaseConnectionPool,
   legacyRestoreWithBackup,
   patchDatabase,
   resetDatabaseCredentials,
@@ -8,6 +10,7 @@ import {
   resumeDatabase,
   suspendDatabase,
   updateDatabase,
+  updateDatabaseConnectionPool,
 } from '@linode/api-v4/lib/databases';
 import { profileQueries, queryPresets } from '@linode/queries';
 import {
@@ -22,6 +25,7 @@ import { databaseQueries } from './keys';
 
 import type {
   APIError,
+  ConnectionPool,
   CreateDatabasePayload,
   Database,
   DatabaseBackup,
@@ -194,6 +198,80 @@ export const useDatabaseBackupsQuery = (
     enabled,
   });
 
+export const useDatabaseConnectionPool = (
+  databaseId: number,
+  poolName: string,
+  enabled: boolean = false,
+) =>
+  useQuery<ConnectionPool, APIError[]>({
+    ...databaseQueries
+      .database('postgresql', databaseId)
+      ._ctx.connectionPools._ctx.pool(poolName),
+    enabled,
+  });
+
+export const useDatabaseConnectionPools = (
+  databaseId: number,
+  enabled: boolean = false,
+) =>
+  useQuery<ResourcePage<ConnectionPool>, APIError[]>({
+    ...databaseQueries.database('postgresql', databaseId)._ctx.connectionPools
+      ._ctx.pools,
+    enabled,
+  });
+
+export const useCreateDatabaseConnectionPoolMutation = (databaseId: number) => {
+  const queryClient = useQueryClient();
+  return useMutation<ConnectionPool, APIError[], ConnectionPool>({
+    mutationFn: (data) => createDatabaseConnectionPool(databaseId, data),
+    onSuccess() {
+      queryClient.invalidateQueries(
+        databaseQueries.database('postgresql', databaseId)._ctx.connectionPools,
+      );
+    },
+  });
+};
+
+export const useUpdateDatabaseConnectionPoolMutation = (
+  databaseId: number,
+  poolName: string,
+) => {
+  const queryClient = useQueryClient();
+  return useMutation<ConnectionPool, APIError[], Omit<ConnectionPool, 'label'>>(
+    {
+      mutationFn: (data) =>
+        updateDatabaseConnectionPool(databaseId, poolName, data),
+      onSuccess(connectionPool) {
+        queryClient.setQueryData<ConnectionPool>(
+          databaseQueries
+            .database('postgresql', databaseId)
+            ._ctx.connectionPools._ctx.pool(connectionPool.label).queryKey,
+          connectionPool,
+        );
+      },
+    },
+  );
+};
+
+export const useDeleteDatabaseConnectionPoolMutation = (
+  databaseId: number,
+  poolName: string,
+) => {
+  const queryClient = useQueryClient();
+  return useMutation<{}, APIError[]>({
+    mutationFn: () => deleteDatabaseConnectionPool(databaseId, poolName),
+    onSuccess() {
+      queryClient.invalidateQueries(
+        databaseQueries.database('postgresql', databaseId)._ctx.connectionPools,
+      );
+      queryClient.removeQueries({
+        queryKey: databaseQueries.database('postgresql', databaseId)._ctx
+          .connectionPools.queryKey,
+      });
+    },
+  });
+};
+
 export const useDatabaseEnginesQuery = (enabled: boolean = false) =>
   useQuery<DatabaseEngine[], APIError[]>({
     ...databaseQueries.engines,
diff --git a/packages/queries/src/databases/keys.ts b/packages/queries/src/databases/keys.ts
index 62a3db02864..a4dc7de6168 100644
--- a/packages/queries/src/databases/keys.ts
+++ b/packages/queries/src/databases/keys.ts
@@ -1,5 +1,7 @@
 import {
   getDatabaseBackups,
+  getDatabaseConnectionPool,
+  getDatabaseConnectionPools,
   getDatabaseCredentials,
   getDatabaseEngineConfig,
   getDatabases,
@@ -30,6 +32,19 @@ export const databaseQueries = createQueryKeys('databases', {
         queryFn: () => getDatabaseCredentials(engine, id),
         queryKey: null,
       },
+      connectionPools: {
+        contextQueries: {
+          pool: (poolName: string) => ({
+            queryFn: () => getDatabaseConnectionPool(id, poolName),
+            queryKey: [poolName],
+          }),
+          pools: {
+            queryFn: () => getDatabaseConnectionPools(id),
+            queryKey: null,
+          },
+        },
+        queryKey: null,
+      },
     },
     queryFn: () => getEngineDatabase(engine, id),
     queryKey: [engine, id],
diff --git a/packages/validation/.changeset/pr-13148-upcoming-features-1764600446107.md b/packages/validation/.changeset/pr-13148-upcoming-features-1764600446107.md
new file mode 100644
index 00000000000..0e428fea296
--- /dev/null
+++ b/packages/validation/.changeset/pr-13148-upcoming-features-1764600446107.md
@@ -0,0 +1,5 @@
+---
+"@linode/validation": Upcoming Features
+---
+
+Added Database Connection Pool schemas ([#13148](https://github.com/linode/manager/pull/13148))
diff --git a/packages/validation/src/databases.schema.ts b/packages/validation/src/databases.schema.ts
index 5cbead4508d..4c764f68f72 100644
--- a/packages/validation/src/databases.schema.ts
+++ b/packages/validation/src/databases.schema.ts
@@ -217,3 +217,22 @@ export const createDynamicAdvancedConfigSchema = (allConfigurations: any[]) => {
     ),
   });
 };
+
+export const createDatabaseConnectionPoolSchema = object({
+  database: string().required('Database is required'),
+  mode: string()
+    .oneOf(['transaction', 'session', 'statement'], 'Pool mode is required')
+    .required('Pool mode is required'),
+  label: string()
+    .required('Name is required')
+    .max(63, 'Name must not exceed 63 characters'),
+  size: number().required('Size is required'),
+  username: string().nullable().required('Username is required'),
+});
+
+export const updateDatabaseConnectionPoolSchema = object({
+  database: string().optional(),
+  mode: string().oneOf(['transaction', 'session', 'statement']).optional(),
+  size: number().optional(),
+  username: string().nullable().optional(),
+});

From 533c629daec1524917cee66f08e5f9ec80911bcf Mon Sep 17 00:00:00 2001
From: Tanushree Bhattacharji <tbhattac@akamai.com>
Date: Wed, 3 Dec 2025 11:22:05 +0530
Subject: [PATCH 64/91] upcoming: [UIE-9563] - Implement Listener detail paper
 (#13130)

* upcoming: [UIE-9563] - Implement Listener detail paper.

* Added changeset: Add a Network Load Balancer Listener detail page (EntityDetail paper) with breadcrumbs

* Addressed review comments.

* Address review comments from Harsh.

* Address review comments.

* Address review comments.
---
 ...r-13130-upcoming-features-1763993150579.md |   5 +
 .../EditAlert/EditAlertDefinition.test.tsx    |  16 +-
 .../NetworkLoadBalancerListenersLazyRoute.ts  |   9 ++
 ...etworkLoadBalancersListenerDetail.test.tsx | 138 ++++++++++++++++++
 .../NetworkLoadBalancersListenerDetail.tsx    |  71 +++++----
 ...NetworkLoadBalancersListenerDetailBody.tsx |  73 +++++++++
 ...tworkLoadBalancersListenerDetailHeader.tsx |  25 ++++
 ...rkLoadBalancersListenerDetailLazyRoutes.ts |   6 +-
 packages/manager/src/mocks/serverHandlers.ts  |  14 +-
 .../src/routes/networkLoadBalancer/index.ts   |   2 +-
 10 files changed, 313 insertions(+), 46 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13130-upcoming-features-1763993150579.md
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerListenersLazyRoute.ts
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetail.test.tsx
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetailBody.tsx
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetailHeader.tsx

diff --git a/packages/manager/.changeset/pr-13130-upcoming-features-1763993150579.md b/packages/manager/.changeset/pr-13130-upcoming-features-1763993150579.md
new file mode 100644
index 00000000000..6a8e6659ad0
--- /dev/null
+++ b/packages/manager/.changeset/pr-13130-upcoming-features-1763993150579.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Add a Network Load Balancer Listener detail page (EntityDetail paper) with breadcrumbs ([#13130](https://github.com/linode/manager/pull/13130))
diff --git a/packages/manager/src/features/CloudPulse/Alerts/EditAlert/EditAlertDefinition.test.tsx b/packages/manager/src/features/CloudPulse/Alerts/EditAlert/EditAlertDefinition.test.tsx
index a7f93ac3bb7..45132bfa387 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/EditAlert/EditAlertDefinition.test.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/EditAlert/EditAlertDefinition.test.tsx
@@ -104,15 +104,15 @@ describe('EditAlertDefinition component', () => {
 
     await waitFor(() => expect(mutateAsyncSpy).toHaveBeenCalledTimes(1));
 
-      expect(navigate).toHaveBeenLastCalledWith({
-        to: '/alerts/definitions',
-      });
-      await waitFor(() => {
-        expect(
-          getByText(UPDATE_ALERT_SUCCESS_MESSAGE) // validate whether snackbar is displayed properly
-        ).toBeInTheDocument();
-      });
+    expect(navigate).toHaveBeenLastCalledWith({
+      to: '/alerts/definitions',
     });
+    await waitFor(() => {
+      expect(
+        getByText(UPDATE_ALERT_SUCCESS_MESSAGE) // validate whether snackbar is displayed properly
+      ).toBeInTheDocument();
+    });
+  });
 
   it('should render EntityTypeSelect for firewall with Linode entity type', () => {
     const linodeFirewallAlertDetails = alertFactory.build({
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerListenersLazyRoute.ts b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerListenersLazyRoute.ts
new file mode 100644
index 00000000000..7b5b623f346
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancerListenersLazyRoute.ts
@@ -0,0 +1,9 @@
+import { createLazyRoute } from '@tanstack/react-router';
+
+import NetworkLoadBalancersDetail from './NetworkLoadBalancersDetail';
+
+export const networkLoadBalancerListenersLazyRoute = createLazyRoute(
+  '/netloadbalancers/$id/listeners'
+)({
+  component: NetworkLoadBalancersDetail,
+});
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetail.test.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetail.test.tsx
new file mode 100644
index 00000000000..80d5882bc0d
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetail.test.tsx
@@ -0,0 +1,138 @@
+import * as React from 'react';
+
+import {
+  networkLoadBalancerFactory,
+  networkLoadBalancerListenerFactory,
+} from 'src/factories/networkLoadBalancer';
+import { mockMatchMedia, renderWithTheme } from 'src/utilities/testHelpers';
+
+import NetworkLoadBalancersListenerDetail from './NetworkLoadBalancersListenerDetail';
+
+const queryMocks = vi.hoisted(() => ({
+  useNetworkLoadBalancerQuery: vi.fn().mockReturnValue({}),
+  useNetworkLoadBalancerNodesQuery: vi.fn().mockReturnValue({}),
+  useParams: vi.fn().mockReturnValue({ id: 1, listenerId: 1 }),
+}));
+
+vi.mock('@linode/queries', async () => {
+  const actual = await vi.importActual('@linode/queries');
+  return {
+    ...actual,
+    useNetworkLoadBalancerQuery: queryMocks.useNetworkLoadBalancerQuery,
+    useNetworkLoadBalancerNodesQuery:
+      queryMocks.useNetworkLoadBalancerNodesQuery,
+  };
+});
+
+vi.mock('@tanstack/react-router', async () => {
+  const actual = await vi.importActual('@tanstack/react-router');
+  return {
+    ...actual,
+    useParams: queryMocks.useParams,
+  };
+});
+
+beforeAll(() => mockMatchMedia());
+
+describe('NetworkLoadBalancersListenerDetail', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    queryMocks.useParams.mockReturnValue({ id: 1, listenerId: 1 });
+  });
+
+  it('renders a loading state', () => {
+    queryMocks.useNetworkLoadBalancerQuery.mockReturnValue({
+      isLoading: true,
+    });
+
+    const { getByTestId } = renderWithTheme(
+      <NetworkLoadBalancersListenerDetail />
+    );
+    expect(getByTestId('circle-progress')).toBeVisible();
+  });
+
+  it('renders an error state when NLB is not found', () => {
+    queryMocks.useNetworkLoadBalancerQuery.mockReturnValue({
+      isLoading: false,
+      data: null,
+    });
+
+    const { getByText } = renderWithTheme(
+      <NetworkLoadBalancersListenerDetail />
+    );
+
+    expect(
+      getByText(
+        'There was a problem retrieving your listener. Please try again.'
+      )
+    ).toBeVisible();
+  });
+
+  it('renders an error state when there is an error', () => {
+    queryMocks.useNetworkLoadBalancerQuery.mockReturnValue({
+      isLoading: false,
+      error: new Error('Test error'),
+    });
+
+    const { getByText } = renderWithTheme(
+      <NetworkLoadBalancersListenerDetail />
+    );
+
+    expect(
+      getByText(
+        'There was a problem retrieving your listener. Please try again.'
+      )
+    ).toBeVisible();
+  });
+
+  it('renders an error state when listener is not found', () => {
+    const nlbFactory = networkLoadBalancerFactory.build({
+      listeners: [],
+    });
+    queryMocks.useNetworkLoadBalancerQuery.mockReturnValue({
+      isLoading: false,
+      data: nlbFactory,
+    });
+
+    const { getByText } = renderWithTheme(
+      <NetworkLoadBalancersListenerDetail />
+    );
+    expect(
+      getByText(
+        'There was a problem retrieving your listener. Please try again.'
+      )
+    ).toBeVisible();
+  });
+
+  it('renders the listener details', () => {
+    // Build listener with ID '1' as a string to match the route param
+    const listener = networkLoadBalancerListenerFactory.build({ id: 1 });
+    const nlbFactory = networkLoadBalancerFactory.build({
+      listeners: [listener],
+    });
+
+    queryMocks.useNetworkLoadBalancerQuery.mockReturnValue({
+      isLoading: false,
+      data: nlbFactory,
+    });
+    queryMocks.useNetworkLoadBalancerNodesQuery.mockReturnValue({
+      data: { results: 5 },
+      isLoading: false,
+    });
+
+    const { getByText } = renderWithTheme(
+      <NetworkLoadBalancersListenerDetail />,
+      {
+        initialRoute: '/netloadbalancers/$id/listeners/$listenerId',
+        initialEntries: ['/netloadbalancers/2/listeners/1'],
+      }
+    );
+
+    expect(getByText('Port')).toBeVisible();
+    expect(getByText(listener.port.toString())).toBeVisible();
+    expect(getByText('Protocol')).toBeVisible();
+    expect(getByText(new RegExp(listener.protocol, 'i'))).toBeVisible();
+    expect(getByText('Nodes')).toBeVisible();
+    expect(getByText('5')).toBeVisible();
+  });
+});
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetail.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetail.tsx
index 3f14c9067a4..8434b1afd94 100644
--- a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetail.tsx
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetail.tsx
@@ -1,45 +1,44 @@
 import {
-  useNetworkLoadBalancerListenerQuery,
+  useNetworkLoadBalancerNodesQuery,
   useNetworkLoadBalancerQuery,
 } from '@linode/queries';
-import { CircleProgress, ErrorState, Notice } from '@linode/ui';
+import { CircleProgress, ErrorState } from '@linode/ui';
 import { useParams } from '@tanstack/react-router';
 import * as React from 'react';
 
+import { DocumentTitleSegment } from 'src/components/DocumentTitle';
+import { EntityDetail } from 'src/components/EntityDetail/EntityDetail';
 import { LandingHeader } from 'src/components/LandingHeader';
 
-export const NetworkLoadBalancersListenerDetail = () => {
-  const params = useParams({ strict: false });
-  const { id: nlbId, listenerId } = params;
+import { NetworkLoadBalancersListenerDetailBody } from './NetworkLoadBalancersListenerDetailBody';
+import { NetworkLoadBalancersListenerDetailHeader } from './NetworkLoadBalancersListenerDetailHeader';
 
-  const {
-    data: nlb,
-    error,
-    isLoading,
-  } = useNetworkLoadBalancerQuery(Number(nlbId) || -1, true);
+const NetworkLoadBalancersListenerDetail = () => {
+  const { id, listenerId } = useParams({
+    from: '/netloadbalancers/$id/listeners/$listenerId/nodes',
+  });
 
-  const {
-    data: listener,
-    error: listenerError,
-    isLoading: listenerLoading,
-  } = useNetworkLoadBalancerListenerQuery(
-    Number(nlbId) || -1,
-    Number(listenerId) || -1,
-    true
-  );
+  const { data: nlb, error, isLoading } = useNetworkLoadBalancerQuery(id);
+
+  // Fetch nodes for this listener
+  const { data: nodesData, isLoading: nodesLoading } =
+    useNetworkLoadBalancerNodesQuery(id, listenerId);
+
+  const listener = nlb?.listeners?.find((l) => l.id === listenerId);
 
-  if (isLoading || listenerLoading) {
+  if (isLoading) {
     return <CircleProgress />;
   }
 
-  if (!nlb || error || !listener || listenerError) {
+  if (!nlb || error || !listener) {
     return (
-      <ErrorState errorText="There was a problem retrieving your NLB. Please try again." />
+      <ErrorState errorText="There was a problem retrieving your listener. Please try again." />
     );
   }
 
   return (
     <>
+      <DocumentTitleSegment segment={`Listener ${listener.label}`} />
       <LandingHeader
         breadcrumbProps={{
           labelOptions: { noCap: true },
@@ -51,19 +50,33 @@ export const NetworkLoadBalancersListenerDetail = () => {
             {
               label: nlb.label,
               position: 2,
-              linkTo: `/netloadbalancers/$id/listeners`,
-              noCap: true,
             },
           ],
-          pathname: `/netloadbalancers/${nlbId}/${listenerId}`,
+          pathname: `/netloadbalancers/${id}/listeners/${listenerId}`,
         }}
         docsLabel="Docs"
-        docsLink={
-          'https://techdocs.akamai.com/linode-api/changelog/network-load-balancers'
+        docsLink="https://techdocs.akamai.com/linode-api/changelog/network-load-balancers"
+        removeCrumbX={2}
+        title={`${listener.label}`}
+      />
+      <EntityDetail
+        body={
+          <NetworkLoadBalancersListenerDetailBody
+            created={listener.created}
+            nodes={nodesData?.results ?? 0}
+            nodesLoading={nodesLoading}
+            port={listener.port}
+            protocol={listener.protocol}
+            updated={listener.updated}
+          />
+        }
+        header={
+          <NetworkLoadBalancersListenerDetailHeader label={listener.label} />
         }
-        title={listener.label}
+        noBodyBottomBorder={true}
       />
-      <Notice variant="info">Listener Detail is coming soon...</Notice>
     </>
   );
 };
+
+export default NetworkLoadBalancersListenerDetail;
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetailBody.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetailBody.tsx
new file mode 100644
index 00000000000..f7cdc400ff6
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetailBody.tsx
@@ -0,0 +1,73 @@
+import { Box, Paper, Stack, Typography } from '@linode/ui';
+import { Grid, styled } from '@mui/material';
+import * as React from 'react';
+
+import { DateTimeDisplay } from 'src/components/DateTimeDisplay';
+import { Skeleton } from 'src/components/Skeleton';
+
+import type { NetworkLoadBalancerListener } from '@linode/api-v4';
+
+interface Props
+  extends Pick<
+    NetworkLoadBalancerListener,
+    'created' | 'port' | 'protocol' | 'updated'
+  > {
+  nodes: number;
+  nodesLoading?: boolean;
+}
+
+export const NetworkLoadBalancersListenerDetailBody = ({
+  created,
+  nodes,
+  nodesLoading,
+  port,
+  protocol,
+  updated,
+}: Props) => {
+  return (
+    <Box sx={{ maxWidth: '60%' }}>
+      <Stack>
+        <Paper>
+          <Grid container spacing={2}>
+            <Grid size={{ xs: 12, sm: 6 }}>
+              <Stack>
+                <LabelTypography>Port</LabelTypography>
+                <Typography>{port}</Typography>
+              </Stack>
+            </Grid>
+            <Grid size={{ xs: 12, sm: 6 }}>
+              <Stack>
+                <LabelTypography>Created</LabelTypography>
+                <DateTimeDisplay value={created} />
+              </Stack>
+            </Grid>
+            <Grid size={{ xs: 12, sm: 6 }}>
+              <Stack>
+                <LabelTypography>Protocol</LabelTypography>
+                <Typography sx={{ textTransform: 'uppercase' }}>
+                  {protocol}
+                </Typography>
+              </Stack>
+            </Grid>
+            <Grid size={{ xs: 12, sm: 6 }}>
+              <Stack>
+                <LabelTypography>Updated</LabelTypography>
+                <DateTimeDisplay value={updated} />
+              </Stack>
+            </Grid>
+            <Grid size={{ xs: 12, sm: 6 }}>
+              <Stack>
+                <LabelTypography>Nodes</LabelTypography>
+                <Typography>{nodesLoading ? <Skeleton /> : nodes}</Typography>
+              </Stack>
+            </Grid>
+          </Grid>
+        </Paper>
+      </Stack>
+    </Box>
+  );
+};
+
+const LabelTypography = styled(Typography)(({ theme }) => ({
+  font: theme.font.bold,
+}));
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetailHeader.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetailHeader.tsx
new file mode 100644
index 00000000000..e19e1a787a8
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetailHeader.tsx
@@ -0,0 +1,25 @@
+import { Box, Typography } from '@linode/ui';
+import * as React from 'react';
+
+import { EntityHeader } from 'src/components/EntityHeader/EntityHeader';
+
+interface Props {
+  label: string;
+}
+
+export const NetworkLoadBalancersListenerDetailHeader = ({ label }: Props) => {
+  return (
+    <EntityHeader>
+      <Box>
+        <Typography
+          sx={(theme) => ({
+            font: theme.font.bold,
+            padding: '13px 16px',
+          })}
+        >
+          Listener: {label}
+        </Typography>
+      </Box>
+    </EntityHeader>
+  );
+};
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetailLazyRoutes.ts b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetailLazyRoutes.ts
index 76b0835e345..502f1de0841 100644
--- a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetailLazyRoutes.ts
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetailLazyRoutes.ts
@@ -1,9 +1,9 @@
 import { createLazyRoute } from '@tanstack/react-router';
 
-import { NetworkLoadBalancersListenerDetail } from './NetworkLoadBalancersListenerDetail';
+import NetworkLoadBalancersListenerDetail from './NetworkLoadBalancersListenerDetail';
 
-export const NetworkLoadBalancersListenerDetailLazyRoute = createLazyRoute(
-  '/netloadbalancers/$id/listeners/$listenerId'
+export const networkLoadBalancersListenerDetailLazyRoute = createLazyRoute(
+  '/netloadbalancers/$id/listeners/$listenerId/nodes'
 )({
   component: NetworkLoadBalancersListenerDetail,
 });
diff --git a/packages/manager/src/mocks/serverHandlers.ts b/packages/manager/src/mocks/serverHandlers.ts
index 48a10019344..86110139cd0 100644
--- a/packages/manager/src/mocks/serverHandlers.ts
+++ b/packages/manager/src/mocks/serverHandlers.ts
@@ -595,11 +595,15 @@ const netLoadBalancers = [
   http.get('*/v4beta/netloadbalancers/:id/listeners/:listenerId', () => {
     return HttpResponse.json(networkLoadBalancerListenerFactory.build());
   }),
-  http.get('*/v4beta/netloadbalancers/:id/listeners/:listenerId/nodes', () => {
-    return HttpResponse.json(
-      makeResourcePage(networkLoadBalancerNodeFactory.buildList(30))
-    );
-  }),
+  http.get(
+    '*/v4beta/netloadbalancers/:id/listeners/:listenerId/nodes',
+    async () => {
+      await sleep(1000);
+      return HttpResponse.json(
+        makeResourcePage(networkLoadBalancerNodeFactory.buildList(30))
+      );
+    }
+  ),
 ];
 
 const nanodeType = linodeTypeFactory.build({ id: 'g6-nanode-1' });
diff --git a/packages/manager/src/routes/networkLoadBalancer/index.ts b/packages/manager/src/routes/networkLoadBalancer/index.ts
index b2a21d0b55e..5f5245e0207 100644
--- a/packages/manager/src/routes/networkLoadBalancer/index.ts
+++ b/packages/manager/src/routes/networkLoadBalancer/index.ts
@@ -71,7 +71,7 @@ const networkLoadBalancerNodesRoute = createRoute({
 }).lazy(() =>
   import(
     'src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetailLazyRoutes'
-  ).then((m) => m.NetworkLoadBalancersListenerDetailLazyRoute)
+  ).then((m) => m.networkLoadBalancersListenerDetailLazyRoute)
 );
 
 export const networkLoadBalancersRouteTree =

From 40958c2e965cb89dd0fbb52cb6dbcec3867d7894 Mon Sep 17 00:00:00 2001
From: Purvesh Makode <pmakode@akamai.com>
Date: Wed, 3 Dec 2025 12:31:33 +0530
Subject: [PATCH 65/91] upcoming: [UIE-9515] - Update Firewall Rules Edit & Add
 Drawer to Support Prefix List Selection (#13138)

* Update Rules Edit/Add drawer to support PrefixLists

* Update comment

* Add some mocks for prefixlists

* Update mock data order

* Reset pls state on address change

* Feature-flagged add/edit prefixlists

* Some clean up

* Some changes

* More clean up

* More clean up

* Add code comments and some clean up

* Add key and test ids to the pl rows

* A small fix

* Add unit tests

* More clean up

* Rename component

* Fix one test case

* Few fixes

* Fix type import

* Update mocks for PLs with more possible cases

* Some more changes related to sorting

* Update mocks

* Added changeset: Update Firewall Rules Edit & Add Drawer to Support Prefix List Selection

* Add/update comments
---
 ...r-13138-upcoming-features-1764681439890.md |   5 +
 .../MultipleIPInput/MultipleIPInput.tsx       |  18 +-
 .../Rules/FirewallRuleDrawer.test.tsx         | 209 +++++++---
 .../Rules/FirewallRuleDrawer.tsx              |  56 ++-
 .../Rules/FirewallRuleDrawer.types.ts         |   4 +-
 .../Rules/FirewallRuleDrawer.utils.ts         | 155 ++++++-
 .../FirewallDetail/Rules/FirewallRuleForm.tsx |  82 +++-
 .../Rules/FirewallRuleSetForm.tsx             |   1 +
 .../Rules/MutiplePrefixListSelect.test.tsx    | 389 ++++++++++++++++++
 .../Rules/MutiplePrefixListSelect.tsx         | 328 +++++++++++++++
 .../Firewalls/FirewallDetail/Rules/shared.ts  |   6 +
 .../manager/src/features/Firewalls/shared.tsx |  24 +-
 packages/manager/src/utilities/ipUtils.ts     |   4 +
 13 files changed, 1163 insertions(+), 118 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13138-upcoming-features-1764681439890.md
 create mode 100644 packages/manager/src/features/Firewalls/FirewallDetail/Rules/MutiplePrefixListSelect.test.tsx
 create mode 100644 packages/manager/src/features/Firewalls/FirewallDetail/Rules/MutiplePrefixListSelect.tsx

diff --git a/packages/manager/.changeset/pr-13138-upcoming-features-1764681439890.md b/packages/manager/.changeset/pr-13138-upcoming-features-1764681439890.md
new file mode 100644
index 00000000000..35a420a4964
--- /dev/null
+++ b/packages/manager/.changeset/pr-13138-upcoming-features-1764681439890.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Update Firewall Rules Edit & Add Drawer to Support Prefix List Selection ([#13138](https://github.com/linode/manager/pull/13138))
diff --git a/packages/manager/src/components/MultipleIPInput/MultipleIPInput.tsx b/packages/manager/src/components/MultipleIPInput/MultipleIPInput.tsx
index 6515ff3ee81..f8ca08ba0e9 100644
--- a/packages/manager/src/components/MultipleIPInput/MultipleIPInput.tsx
+++ b/packages/manager/src/components/MultipleIPInput/MultipleIPInput.tsx
@@ -26,7 +26,7 @@ const useStyles = makeStyles()((theme: Theme) => ({
       justifyContent: 'flex-start',
     },
     paddingLeft: 0,
-    paddingTop: theme.spacing(1.5),
+    paddingTop: theme.spacingFunction(12),
   },
   button: {
     '& > span': {
@@ -70,6 +70,12 @@ export interface MultipeIPInputProps {
    */
   buttonText?: string;
 
+  /**
+   * Whether the first input field can be removed.
+   * @default false
+   */
+  canRemoveFirstInput?: boolean;
+
   /**
    * Custom CSS class for additional styling.
    */
@@ -155,6 +161,7 @@ export const MultipleIPInput = React.memo((props: MultipeIPInputProps) => {
   const {
     adjustSpacingForVPCDualStack,
     buttonText,
+    canRemoveFirstInput,
     className,
     disabled,
     error,
@@ -244,8 +251,8 @@ export const MultipleIPInput = React.memo((props: MultipeIPInputProps) => {
           <TooltipIcon
             status="info"
             sxTooltipIcon={{
-              marginLeft: '-4px',
-              marginTop: '-15px',
+              marginTop: '-8px',
+              padding: '4px',
             }}
             text={tooltip}
             tooltipPosition="right"
@@ -304,7 +311,10 @@ export const MultipleIPInput = React.memo((props: MultipeIPInputProps) => {
              * used in DBaaS or for Linode VPC interfaces
              */}
             <Grid size={1}>
-              {(idx > 0 || forDatabaseAccessControls || forVPCIPRanges) && (
+              {(idx > 0 ||
+                forDatabaseAccessControls ||
+                forVPCIPRanges ||
+                canRemoveFirstInput) && (
                 <IconButton
                   aria-disabled={disabled}
                   className={classes.button}
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
index f0d23ec98e3..b4f0b216965 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
@@ -13,7 +13,7 @@ import {
   classifyIPs,
   deriveTypeFromValuesAndIPs,
   formValueToIPs,
-  getInitialIPs,
+  getInitialIPsOrPLs,
   IP_ERROR_MESSAGE,
   itemsToPortString,
   portStringToItems,
@@ -275,17 +275,25 @@ describe('ViewRuleSetDetailsDrawer', () => {
 describe('utilities', () => {
   describe('formValueToIPs', () => {
     it('returns a complete set of IPs given a string form value', () => {
-      expect(formValueToIPs('all', [''].map(stringToExtendedIP))).toEqual(
+      expect(formValueToIPs('all', [''].map(stringToExtendedIP), [])).toEqual(
         allIPs
       );
-      expect(formValueToIPs('allIPv4', [''].map(stringToExtendedIP))).toEqual({
+      expect(
+        formValueToIPs('allIPv4', [''].map(stringToExtendedIP), [])
+      ).toEqual({
         ipv4: ['0.0.0.0/0'],
       });
-      expect(formValueToIPs('allIPv6', [''].map(stringToExtendedIP))).toEqual({
+      expect(
+        formValueToIPs('allIPv6', [''].map(stringToExtendedIP), [])
+      ).toEqual({
         ipv6: ['::/0'],
       });
       expect(
-        formValueToIPs('ip/netmask', ['1.1.1.1'].map(stringToExtendedIP))
+        formValueToIPs(
+          'ip/netmask/prefixlist',
+          ['1.1.1.1'].map(stringToExtendedIP),
+          []
+        )
       ).toEqual({
         ipv4: ['1.1.1.1'],
       });
@@ -304,22 +312,27 @@ describe('utilities', () => {
   });
 
   describe('validateForm', () => {
+    const baseOptions = {
+      validatedIPs: [],
+      validatedPLs: [],
+      isFirewallRulesetsPrefixlistsFeatureEnabled: false,
+    };
+
     it('validates protocol', () => {
-      expect(validateForm({})).toHaveProperty(
+      expect(validateForm({}, baseOptions)).toHaveProperty(
         'protocol',
         'Protocol is required.'
       );
     });
     it('validates ports', () => {
-      expect(validateForm({ ports: '80', protocol: 'ICMP' })).toHaveProperty(
-        'ports',
-        'Ports are not allowed for ICMP protocols.'
-      );
       expect(
-        validateForm({ ports: '443', protocol: 'IPENCAP' })
+        validateForm({ ports: '80', protocol: 'ICMP' }, baseOptions)
+      ).toHaveProperty('ports', 'Ports are not allowed for ICMP protocols.');
+      expect(
+        validateForm({ ports: '443', protocol: 'IPENCAP' }, baseOptions)
       ).toHaveProperty('ports', 'Ports are not allowed for IPENCAP protocols.');
       expect(
-        validateForm({ ports: 'invalid-port', protocol: 'TCP' })
+        validateForm({ ports: 'invalid-port', protocol: 'TCP' }, baseOptions)
       ).toHaveProperty('ports');
     });
     it('validates custom ports', () => {
@@ -328,56 +341,77 @@ describe('utilities', () => {
         label: 'Firewalllabel',
       };
       // SUCCESS CASES
-      expect(validateForm({ ports: '1234', protocol: 'TCP', ...rest })).toEqual(
-        {}
-      );
       expect(
-        validateForm({ ports: '1,2,3,4,5', protocol: 'TCP', ...rest })
+        validateForm({ ports: '1234', protocol: 'TCP', ...rest }, baseOptions)
       ).toEqual({});
       expect(
-        validateForm({ ports: '1, 2, 3, 4, 5', protocol: 'TCP', ...rest })
+        validateForm(
+          { ports: '1,2,3,4,5', protocol: 'TCP', ...rest },
+          baseOptions
+        )
       ).toEqual({});
-      expect(validateForm({ ports: '1-20', protocol: 'TCP', ...rest })).toEqual(
-        {}
-      );
       expect(
-        validateForm({
-          ports: '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15',
-          protocol: 'TCP',
-          ...rest,
-        })
+        validateForm(
+          { ports: '1, 2, 3, 4, 5', protocol: 'TCP', ...rest },
+          baseOptions
+        )
+      ).toEqual({});
+      expect(
+        validateForm({ ports: '1-20', protocol: 'TCP', ...rest }, baseOptions)
+      ).toEqual({});
+      expect(
+        validateForm(
+          {
+            ports: '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15',
+            protocol: 'TCP',
+            ...rest,
+          },
+          baseOptions
+        )
       ).toEqual({});
       expect(
-        validateForm({ ports: '1-2,3-4', protocol: 'TCP', ...rest })
+        validateForm(
+          { ports: '1-2,3-4', protocol: 'TCP', ...rest },
+          baseOptions
+        )
       ).toEqual({});
       expect(
-        validateForm({ ports: '1,5-12', protocol: 'TCP', ...rest })
+        validateForm({ ports: '1,5-12', protocol: 'TCP', ...rest }, baseOptions)
       ).toEqual({});
       // FAILURE CASES
       expect(
-        validateForm({ ports: '1,21-12', protocol: 'TCP', ...rest })
+        validateForm(
+          { ports: '1,21-12', protocol: 'TCP', ...rest },
+          baseOptions
+        )
       ).toHaveProperty(
         'ports',
         'Range must start with a smaller number and end with a larger number'
       );
       expect(
-        validateForm({ ports: '1-21-45', protocol: 'TCP', ...rest })
+        validateForm(
+          { ports: '1-21-45', protocol: 'TCP', ...rest },
+          baseOptions
+        )
       ).toHaveProperty('ports', 'Ranges must have 2 values');
       expect(
-        validateForm({ ports: 'abc', protocol: 'TCP', ...rest })
+        validateForm({ ports: 'abc', protocol: 'TCP', ...rest }, baseOptions)
       ).toHaveProperty('ports', 'Must be 1-65535');
       expect(
-        validateForm({ ports: '1--20', protocol: 'TCP', ...rest })
+        validateForm({ ports: '1--20', protocol: 'TCP', ...rest }, baseOptions)
       ).toHaveProperty('ports', 'Must be 1-65535');
       expect(
-        validateForm({ ports: '-20', protocol: 'TCP', ...rest })
+        validateForm({ ports: '-20', protocol: 'TCP', ...rest }, baseOptions)
       ).toHaveProperty('ports', 'Must be 1-65535');
       expect(
-        validateForm({
-          ports: '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16',
-          protocol: 'TCP',
-          ...rest,
-        })
+        validateForm(
+          {
+            ports: '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16',
+            protocol: 'TCP',
+            ...rest,
+          },
+          baseOptions
+        )
       ).toHaveProperty(
         'ports',
         'Number of ports or port range endpoints exceeded. Max allowed is 15'
@@ -432,11 +466,79 @@ describe('utilities', () => {
           ports: '80',
           protocol: 'TCP',
         };
-        expect(validateForm({ label: value, ...rest })).toEqual(result);
+        expect(validateForm({ label: value, ...rest }, baseOptions)).toEqual(
+          result
+        );
       });
     });
+
+    it('handles addresses field when isFirewallRulesetsPrefixlistsFeatureEnabled is true', () => {
+      // Invalid cases
+      expect(
+        validateForm(
+          {},
+          {
+            ...baseOptions,
+            isFirewallRulesetsPrefixlistsFeatureEnabled: true,
+          }
+        )
+      ).toHaveProperty('addresses', 'Sources is a required field.');
+
+      expect(
+        validateForm(
+          { addresses: 'ip/netmask/prefixlist' },
+          {
+            ...baseOptions,
+            isFirewallRulesetsPrefixlistsFeatureEnabled: true,
+          }
+        )
+      ).toHaveProperty(
+        'addresses',
+        'Add an IP address in IP/mask format, or reference a Prefix List name.'
+      );
+
+      // Valid cases
+      expect(
+        validateForm(
+          { addresses: 'ip/netmask/prefixlist' },
+          {
+            validatedIPs: [
+              { address: '192.268.0.0' },
+              { address: '192.268.0.1' },
+            ],
+            validatedPLs: [
+              { address: 'pl:system:test', inIPv4Rule: true, inIPv6Rule: true },
+            ],
+            isFirewallRulesetsPrefixlistsFeatureEnabled: true,
+          }
+        )
+      ).not.toHaveProperty('addresses');
+      expect(
+        validateForm(
+          { addresses: 'ip/netmask/prefixlist' },
+          {
+            validatedIPs: [{ address: '192.268.0.0' }],
+            validatedPLs: [],
+            isFirewallRulesetsPrefixlistsFeatureEnabled: true,
+          }
+        )
+      ).not.toHaveProperty('addresses');
+      expect(
+        validateForm(
+          { addresses: 'ip/netmask/prefixlist' },
+          {
+            validatedIPs: [],
+            validatedPLs: [
+              { address: 'pl:system:test', inIPv4Rule: true, inIPv6Rule: true },
+            ],
+            isFirewallRulesetsPrefixlistsFeatureEnabled: true,
+          }
+        )
+      ).not.toHaveProperty('addresses');
+    });
+
     it('handles required fields', () => {
-      expect(validateForm({})).toEqual({
+      expect(validateForm({}, baseOptions)).toEqual({
         addresses: 'Sources is a required field.',
         label: 'Label is required.',
         ports: 'Ports is a required field.',
@@ -445,11 +547,11 @@ describe('utilities', () => {
     });
   });
 
-  describe('getInitialIPs', () => {
+  describe('getInitialIPsOrPLs', () => {
     const ruleToModify: ExtendedFirewallRule = {
       action: 'ACCEPT',
       addresses: {
-        ipv4: ['1.2.3.4'],
+        ipv4: ['1.2.3.4', 'pl:system:test'],
         ipv6: ['::0'],
       },
       originalIndex: 0,
@@ -458,10 +560,8 @@ describe('utilities', () => {
       status: 'NEW',
     };
     it('parses the IPs when no errors', () => {
-      expect(getInitialIPs(ruleToModify)).toEqual([
-        { address: '1.2.3.4' },
-        { address: '::0' },
-      ]);
+      const { ips: initalIPs } = getInitialIPsOrPLs(ruleToModify);
+      expect(initalIPs).toEqual([{ address: '1.2.3.4' }, { address: '::0' }]);
     });
     it('parses the IPs with no errors', () => {
       const errors: FirewallRuleError[] = [
@@ -473,13 +573,17 @@ describe('utilities', () => {
           reason: 'Invalid IP',
         },
       ];
-      expect(getInitialIPs({ ...ruleToModify, errors })).toEqual([
+      const { ips: initalIPs } = getInitialIPsOrPLs({
+        ...ruleToModify,
+        errors,
+      });
+      expect(initalIPs).toEqual([
         { address: '1.2.3.4', error: IP_ERROR_MESSAGE },
         { address: '::0' },
       ]);
     });
     it('offsets error indices correctly', () => {
-      const result = getInitialIPs({
+      const { ips: initialIPs } = getInitialIPsOrPLs({
         ...ruleToModify,
         addresses: {
           ipv4: ['1.2.3.4'],
@@ -495,11 +599,17 @@ describe('utilities', () => {
           },
         ],
       });
-      expect(result).toEqual([
+      expect(initialIPs).toEqual([
         { address: '1.2.3.4' },
         { address: 'INVALID_IP', error: IP_ERROR_MESSAGE },
       ]);
     });
+    it('parses the PLs when no errors', () => {
+      const { pls: initalPLs } = getInitialIPsOrPLs(ruleToModify);
+      expect(initalPLs).toEqual([
+        { address: 'pl:system:test', inIPv4Rule: true, inIPv6Rule: false },
+      ]);
+    });
   });
 
   describe('classifyIPs', () => {
@@ -528,12 +638,13 @@ describe('utilities', () => {
     };
 
     it('correctly matches values to their representative type', () => {
-      const result = deriveTypeFromValuesAndIPs(formValues, []);
+      const result = deriveTypeFromValuesAndIPs(formValues, [], []);
       expect(result).toBe('https');
     });
     it('returns "custom" if there is no match', () => {
       const result = deriveTypeFromValuesAndIPs(
         { ...formValues, ports: '22-23' },
+        [],
         []
       );
       expect(result).toBe('custom');
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
index cdd97596b06..61edb9528ca 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
@@ -10,11 +10,12 @@ import { useIsFirewallRulesetsPrefixlistsEnabled } from '../../shared';
 import {
   formValueToIPs,
   getInitialFormValues,
-  getInitialIPs,
+  getInitialIPsOrPLs,
   itemsToPortString,
   portStringToItems,
   validateForm,
   validateIPs,
+  validatePrefixLists,
 } from './FirewallRuleDrawer.utils';
 import { FirewallRuleForm } from './FirewallRuleForm';
 import { FirewallRuleSetDetailsView } from './FirewallRuleSetDetailsView';
@@ -28,11 +29,12 @@ import type {
   FormRuleSetState,
   FormState,
 } from './FirewallRuleDrawer.types';
+import type { ValidateFormOptions } from './FirewallRuleDrawer.utils';
 import type {
   FirewallRuleProtocol,
   FirewallRuleType,
 } from '@linode/api-v4/lib/firewalls';
-import type { ExtendedIP } from 'src/utilities/ipUtils';
+import type { ExtendedIP, ExtendedPL } from 'src/utilities/ipUtils';
 
 // =============================================================================
 // <FirewallRuleDrawer />
@@ -59,12 +61,16 @@ export const FirewallRuleDrawer = React.memo(
     const [createEntityType, setCreateEntityType] =
       React.useState<FirewallCreateEntityType>('rule');
 
-    // Custom IPs are tracked separately from the form. The <MultipleIPs />
+    // Custom IPs or PLs are tracked separately from the form. The <MultipleIPs /> or <MutiplePLs />
     // component consumes this state. We use this on form submission if the
-    // `addresses` form value is "ip/netmask", which indicates the user has
-    // intended to specify custom IPs.
+    // `addresses` form value is "ip/netmask/prefixlist", which indicates the user has
+    // intended to specify custom IPs or PLs.
     const [ips, setIPs] = React.useState<ExtendedIP[]>([{ address: '' }]);
 
+    const [pls, setPLs] = React.useState<ExtendedPL[]>([
+      { address: '', inIPv4Rule: false, inIPv6Rule: false },
+    ]);
+
     // Firewall Ports, like IPs, are tracked separately. The form.values state value
     // tracks the custom user input; the FirewallOptionItem[] array of port presets in the multi-select
     // is stored here.
@@ -76,12 +82,15 @@ export const FirewallRuleDrawer = React.memo(
       // Reset state. If we're in EDIT mode, set IPs to the addresses of the rule we're modifying
       // (along with any errors we may have).
       if (mode === 'edit' && ruleToModifyOrView) {
-        setIPs(getInitialIPs(ruleToModifyOrView));
+        const { ips, pls } = getInitialIPsOrPLs(ruleToModifyOrView);
+        setIPs(ips);
+        setPLs(pls);
         setPresetPorts(portStringToItems(ruleToModifyOrView.ports)[0]);
       } else if (isOpen) {
         setPresetPorts([]);
       } else {
         setIPs([{ address: '' }]);
+        setPLs([]);
       }
 
       // Reset the Create entity selection to 'rule' in two cases:
@@ -116,31 +125,46 @@ export const FirewallRuleDrawer = React.memo(
 
       // The validated IPs may have errors, so set them to state so we see the errors.
       const validatedIPs = validateIPs(ips, {
-        allowEmptyAddress: addresses !== 'ip/netmask',
+        allowEmptyAddress: addresses !== 'ip/netmask/prefixlist',
       });
       setIPs(validatedIPs);
 
+      // The validated PLs may have errors, so set them to state so we see the errors.
+      const validatedPLs = validatePrefixLists(pls);
+      setPLs(validatedPLs);
+
       const _ports = itemsToPortString(presetPorts, ports!);
 
+      const validateFormOptions: ValidateFormOptions = {
+        validatedIPs,
+        validatedPLs,
+        isFirewallRulesetsPrefixlistsFeatureEnabled,
+      };
+
       return {
-        ...validateForm({
-          addresses,
-          description,
-          label,
-          ports: _ports,
-          protocol,
-        }),
+        ...validateForm(
+          {
+            addresses,
+            description,
+            label,
+            ports: _ports,
+            protocol,
+          },
+          validateFormOptions
+        ),
         // This is a bit of a trick. If this function DOES NOT return an empty object, Formik will call
         // `onSubmit()`. If there are IP errors, we add them to the return object so Formik knows there
         // is an issue with the form.
         ...validatedIPs.filter((thisIP) => Boolean(thisIP.error)),
+        // For PrefixLists
+        ...validatedPLs.filter((thisPL) => Boolean(thisPL.error)),
       };
     };
 
     const onSubmitRule = (values: FormState) => {
       const ports = itemsToPortString(presetPorts, values.ports!);
       const protocol = values.protocol as FirewallRuleProtocol;
-      const addresses = formValueToIPs(values.addresses!, ips);
+      const addresses = formValueToIPs(values.addresses!, ips, pls);
 
       const payload: FirewallRuleType = {
         action: values.action,
@@ -223,9 +247,11 @@ export const FirewallRuleDrawer = React.memo(
                   closeDrawer={onClose}
                   ips={ips}
                   mode={mode}
+                  pls={pls}
                   presetPorts={presetPorts}
                   ruleErrors={ruleToModifyOrView?.errors}
                   setIPs={setIPs}
+                  setPLs={setPLs}
                   setPresetPorts={setPresetPorts}
                   {...formikProps}
                 />
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts
index e0cfdfd8067..f942b9af1cb 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts
@@ -7,7 +7,7 @@ import type {
   FirewallRuleType,
 } from '@linode/api-v4/lib/firewalls';
 import type { FormikProps } from 'formik';
-import type { ExtendedIP } from 'src/utilities/ipUtils';
+import type { ExtendedIP, ExtendedPL } from 'src/utilities/ipUtils';
 
 export type FirewallRuleDrawerMode = 'create' | 'edit' | 'view';
 
@@ -47,9 +47,11 @@ export interface FirewallRuleFormProps extends FormikProps<FormState> {
   closeDrawer: () => void;
   ips: ExtendedIP[];
   mode: FirewallRuleDrawerMode;
+  pls: ExtendedPL[];
   presetPorts: FirewallOptionItem<string>[];
   ruleErrors?: FirewallRuleError[];
   setIPs: (ips: ExtendedIP[]) => void;
+  setPLs: (pls: ExtendedPL[]) => void;
   setPresetPorts: (selected: FirewallOptionItem<string>[]) => void;
 }
 
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.utils.ts b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.utils.ts
index 63e046e57a5..0f8aa88f3dd 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.utils.ts
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.utils.ts
@@ -13,6 +13,7 @@ import {
   allowNoneIPv4,
   allowNoneIPv6,
   allowsAllIPs,
+  buildPrefixListReferenceMap,
   predefinedFirewallFromRule,
 } from 'src/features/Firewalls/shared';
 import { stringToExtendedIP } from 'src/utilities/ipUtils';
@@ -26,7 +27,7 @@ import type {
   FirewallRuleType,
 } from '@linode/api-v4/lib/firewalls';
 import type { FirewallOptionItem } from 'src/features/Firewalls/shared';
-import type { ExtendedIP } from 'src/utilities/ipUtils';
+import type { ExtendedIP, ExtendedPL } from 'src/utilities/ipUtils';
 
 export const IP_ERROR_MESSAGE = 'Must be a valid IPv4 or IPv6 range.';
 
@@ -42,7 +43,8 @@ export const IP_ERROR_MESSAGE = 'Must be a valid IPv4 or IPv6 range.';
  */
 export const deriveTypeFromValuesAndIPs = (
   values: FormState,
-  ips: ExtendedIP[]
+  ips: ExtendedIP[],
+  pls: ExtendedPL[]
 ) => {
   if (values.type === 'custom') {
     return 'custom';
@@ -52,7 +54,7 @@ export const deriveTypeFromValuesAndIPs = (
 
   const predefinedFirewall = predefinedFirewallFromRule({
     action: 'ACCEPT',
-    addresses: formValueToIPs(values.addresses!, ips),
+    addresses: formValueToIPs(values.addresses!, ips, pls),
     ports: values.ports,
     protocol,
   });
@@ -74,7 +76,8 @@ export const deriveTypeFromValuesAndIPs = (
  */
 export const formValueToIPs = (
   formValue: string,
-  ips: ExtendedIP[]
+  ips: ExtendedIP[],
+  pls: ExtendedPL[]
 ): FirewallRuleType['addresses'] => {
   switch (formValue) {
     case 'all':
@@ -83,10 +86,34 @@ export const formValueToIPs = (
       return { ipv4: [allIPv4] };
     case 'allIPv6':
       return { ipv6: [allIPv6] };
-    default:
-      // The user has selected "IP / Netmask" and entered custom IPs, so we need
+    default: {
+      // The user has selected "IP / Netmask / Prefix List" and entered custom IPs or selected PLs, so we need
       // to separate those into v4 and v6 addresses.
-      return classifyIPs(ips);
+      const classifiedIPs = classifyIPs(ips);
+      const classifiedPLs = classifyPLs(pls);
+
+      const ruleIPv4 = [
+        ...(classifiedIPs.ipv4 ?? []),
+        ...(classifiedPLs.ipv4 ?? []),
+      ];
+
+      const ruleIPv6 = [
+        ...(classifiedIPs.ipv6 ?? []),
+        ...(classifiedPLs.ipv6 ?? []),
+      ];
+
+      const result: FirewallRuleType['addresses'] = {};
+
+      if (ruleIPv4.length > 0) {
+        result.ipv4 = ruleIPv4;
+      }
+
+      if (ruleIPv6.length > 0) {
+        result.ipv6 = ruleIPv6;
+      }
+
+      return result;
+    }
   }
 };
 
@@ -112,6 +139,34 @@ export const validateIPs = (
   });
 };
 
+export const validatePrefixLists = (pls: ExtendedPL[]): ExtendedPL[] => {
+  const seen = new Set<string>();
+  return pls.map((pl) => {
+    const { address, inIPv4Rule, inIPv6Rule } = pl;
+
+    if (!pl.address) {
+      return { ...pl, error: 'Please select the Prefix List.' };
+    }
+
+    if (pl.inIPv4Rule === false && pl.inIPv6Rule === false) {
+      return {
+        ...pl,
+        error: 'At least one IPv4 or IPv6 option must be selected.',
+      };
+    }
+
+    if (seen.has(pl.address)) {
+      return {
+        ...pl,
+        error: 'This Prefix List is already selected.',
+      };
+    }
+
+    seen.add(pl.address);
+    return { address, inIPv4Rule, inIPv6Rule };
+  });
+};
+
 /**
  * Given an array of IP addresses, filter out invalid addresses and categorize
  * them by "ipv4" and "ipv6."
@@ -138,6 +193,28 @@ export const classifyIPs = (ips: ExtendedIP[]) => {
   );
 };
 
+/**
+ * Given an array of Firewall Rule IP addresses, categorize
+ * Prefix List by "ipv4" and "ipv6."
+ */
+export const classifyPLs = (pls: ExtendedPL[]) => {
+  return pls.reduce<{ ipv4?: string[]; ipv6?: string[] }>((acc, pl) => {
+    if (pl.inIPv4Rule) {
+      if (!acc.ipv4) {
+        acc.ipv4 = [];
+      }
+      acc.ipv4.push(pl.address);
+    }
+    if (pl.inIPv6Rule) {
+      if (!acc.ipv6) {
+        acc.ipv6 = [];
+      }
+      acc.ipv6.push(pl.address);
+    }
+    return acc;
+  }, {});
+};
+
 const initialValues: FormState = {
   action: 'ACCEPT',
   addresses: '',
@@ -181,21 +258,42 @@ export const getInitialAddressFormValue = (
     return 'allIPv6';
   }
 
-  return 'ip/netmask';
+  return 'ip/netmask/prefixlist';
 };
 
-// Get a list of Extended IP from an existing Firewall rule. This is necessary when opening the
+// Get a list of Extended IP or Extended PL from an existing Firewall rule. This is necessary when opening the
 // drawer/form to modify an existing rule.
-export const getInitialIPs = (
+export const getInitialIPsOrPLs = (
   ruleToModify: ExtendedFirewallRule
-): ExtendedIP[] => {
+): {
+  ips: ExtendedIP[];
+  pls: ExtendedPL[];
+} => {
   const { addresses } = ruleToModify;
 
-  const extendedIPv4 = (addresses?.ipv4 ?? []).map(stringToExtendedIP);
-  const extendedIPv6 = (addresses?.ipv6 ?? []).map(stringToExtendedIP);
+  // Exclude all prefix list entries (pl:*) from the FW Rule addresses when building extendedIPv4/extendedIPv6
+  const extendedIPv4 = (addresses?.ipv4 ?? [])
+    .filter((ip) => !ip.startsWith('pl:'))
+    .map(stringToExtendedIP);
+  const extendedIPv6 = (addresses?.ipv6 ?? [])
+    .filter((ip) => !ip.startsWith('pl:'))
+    .map(stringToExtendedIP);
 
   const ips: ExtendedIP[] = [...extendedIPv4, ...extendedIPv6];
 
+  // Build ExtendedPL from the FW Rule addresses
+  const prefixListMap = buildPrefixListReferenceMap({
+    ipv4: addresses?.ipv4 ?? [],
+    ipv6: addresses?.ipv6 ?? [],
+  });
+  const extendedPL = Object.entries(prefixListMap).map(([pl, reference]) => ({
+    address: pl,
+    inIPv4Rule: reference.inIPv4Rule,
+    inIPv6Rule: reference.inIPv6Rule,
+  }));
+  const pls: ExtendedPL[] = extendedPL;
+
+  // Errors
   ruleToModify.errors?.forEach((thisError) => {
     const { formField, ip } = thisError;
 
@@ -223,7 +321,7 @@ export const getInitialIPs = (
     ips[index].error = IP_ERROR_MESSAGE;
   });
 
-  return ips;
+  return { ips, pls };
 };
 
 /**
@@ -305,13 +403,20 @@ export const portStringToItems = (
   return [items, customInput.join(', ')];
 };
 
-export const validateForm = ({
-  addresses,
-  description,
-  label,
-  ports,
-  protocol,
-}: Partial<FormState>) => {
+export interface ValidateFormOptions {
+  isFirewallRulesetsPrefixlistsFeatureEnabled: boolean;
+  validatedIPs: ExtendedIP[];
+  validatedPLs: ExtendedPL[];
+}
+
+export const validateForm = (
+  { addresses, description, label, ports, protocol }: Partial<FormState>,
+  {
+    validatedIPs,
+    validatedPLs,
+    isFirewallRulesetsPrefixlistsFeatureEnabled,
+  }: ValidateFormOptions
+) => {
   const errors: Partial<FormState> = {};
 
   if (label) {
@@ -337,6 +442,14 @@ export const validateForm = ({
 
   if (!addresses) {
     errors.addresses = 'Sources is a required field.';
+  } else if (
+    isFirewallRulesetsPrefixlistsFeatureEnabled &&
+    addresses === 'ip/netmask/prefixlist' &&
+    validatedIPs.length === 0 &&
+    validatedPLs.length === 0
+  ) {
+    errors.addresses =
+      'Add an IP address in IP/mask format, or reference a Prefix List name.';
   }
 
   if (!ports && protocol !== 'ICMP' && protocol !== 'IPENCAP') {
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx
index c94082dd44b..6de74c88677 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx
@@ -1,6 +1,7 @@
 import {
   ActionsPanel,
   Autocomplete,
+  Box,
   FormControlLabel,
   Radio,
   RadioGroup,
@@ -14,14 +15,16 @@ import * as React from 'react';
 
 import { MultipleIPInput } from 'src/components/MultipleIPInput/MultipleIPInput';
 import {
-  addressOptions,
   firewallOptionItemsShort,
   portPresets,
   protocolOptions,
+  useAddressOptions,
+  useIsFirewallRulesetsPrefixlistsEnabled,
 } from 'src/features/Firewalls/shared';
 import { ipFieldPlaceholder } from 'src/utilities/ipUtils';
 
 import { enforceIPMasks } from './FirewallRuleDrawer.utils';
+import { MultiplePrefixListSelect } from './MutiplePrefixListSelect';
 import { PORT_PRESETS, PORT_PRESETS_ITEMS } from './shared';
 
 import type { FirewallRuleFormProps } from './FirewallRuleDrawer.types';
@@ -29,7 +32,7 @@ import type {
   FirewallOptionItem,
   FirewallPreset,
 } from 'src/features/Firewalls/shared';
-import type { ExtendedIP } from 'src/utilities/ipUtils';
+import type { ExtendedIP, ExtendedPL } from 'src/utilities/ipUtils';
 
 const ipNetmaskTooltipText =
   'If you do not specify a mask, /32 will be assumed for IPv4 addresses and /128 will be assumed for IPv6 addresses.';
@@ -44,17 +47,24 @@ export const FirewallRuleForm = React.memo((props: FirewallRuleFormProps) => {
     handleChange,
     handleSubmit,
     ips,
+    pls,
     mode,
     presetPorts,
     ruleErrors,
     setFieldError,
     setFieldValue,
     setIPs,
+    setPLs,
     setPresetPorts,
     touched,
     values,
   } = props;
 
+  const { isFirewallRulesetsPrefixlistsFeatureEnabled } =
+    useIsFirewallRulesetsPrefixlistsEnabled();
+
+  const addressOptions = useAddressOptions();
+
   const hasCustomInput = presetPorts.some(
     (thisPort) => thisPort.value === PORT_PRESETS['CUSTOM'].value
   );
@@ -146,10 +156,17 @@ export const FirewallRuleForm = React.memo((props: FirewallRuleFormProps) => {
   const handleAddressesChange = React.useCallback(
     (item: string) => {
       setFieldValue('addresses', item);
-      // Reset custom IPs
-      setIPs([{ address: '' }]);
+      // Reset custom IPs & PLs
+      if (isFirewallRulesetsPrefixlistsFeatureEnabled) {
+        // For "IP / Netmask / Prefix List": reset both custom IPs and PLs
+        setIPs([]);
+        setPLs([]);
+      } else {
+        // For "IP / Netmask": reset IPs to at least one empty input
+        setIPs([{ address: '' }]);
+      }
     },
-    [setFieldValue, setIPs]
+    [setFieldValue, setIPs, setPLs, isFirewallRulesetsPrefixlistsFeatureEnabled]
   );
 
   const handleActionChange = React.useCallback(
@@ -172,6 +189,13 @@ export const FirewallRuleForm = React.memo((props: FirewallRuleFormProps) => {
     setIPs(_ipsWithMasks);
   };
 
+  const handlePrefixListChange = React.useCallback(
+    (_pls: ExtendedPL[]) => {
+      setPLs(_pls);
+    },
+    [setPLs]
+  );
+
   const handlePortPresetChange = React.useCallback(
     (items: FirewallOptionItem<string>[]) => {
       // If the user is selecting "ALL", it doesn't make sense
@@ -195,7 +219,7 @@ export const FirewallRuleForm = React.memo((props: FirewallRuleFormProps) => {
     return (
       addressOptions.find(
         (thisOption) => thisOption.value === values.addresses
-      ) || undefined
+      ) ?? null
     );
   }, [values]);
 
@@ -294,27 +318,41 @@ export const FirewallRuleForm = React.memo((props: FirewallRuleFormProps) => {
         }}
         options={addressOptions}
         placeholder={`Select ${addressesLabel}s...`}
+        required
         textFieldProps={{
-          InputProps: {
-            required: true,
-          },
           dataAttrs: {
             'data-qa-address-source-select': true,
           },
         }}
         value={addressesValue}
       />
-      {/* Show this field only if "IP / Netmask has been selected." */}
-      {values.addresses === 'ip/netmask' && (
-        <StyledMultipleIPInput
-          aria-label="IP / Netmask for Firewall rule"
-          ips={ips}
-          onBlur={handleIPBlur}
-          onChange={handleIPChange}
-          placeholder={ipFieldPlaceholder}
-          title="IP / Netmask"
-          tooltip={ipNetmaskTooltipText}
-        />
+      {/* Show this field only if "IP / Netmask / Prefix List has been selected." */}
+      {values.addresses === 'ip/netmask/prefixlist' && (
+        <Box
+          marginLeft={(theme) =>
+            isFirewallRulesetsPrefixlistsFeatureEnabled
+              ? theme.spacingFunction(24)
+              : 0
+          }
+        >
+          <StyledMultipleIPInput
+            aria-label="IP / Netmask for Firewall rule"
+            canRemoveFirstInput={isFirewallRulesetsPrefixlistsFeatureEnabled}
+            ips={ips}
+            onBlur={handleIPBlur}
+            onChange={handleIPChange}
+            placeholder={ipFieldPlaceholder}
+            title={ips.length > 0 ? 'IP / Netmask' : ''}
+            tooltip={ipNetmaskTooltipText}
+          />
+          {isFirewallRulesetsPrefixlistsFeatureEnabled && (
+            <MultiplePrefixListSelect
+              aria-label="Prefix List for Firewall rule"
+              onChange={handlePrefixListChange}
+              pls={pls}
+            />
+          )}
+        </Box>
       )}
       <StyledDiv>
         <Typography>
@@ -357,6 +395,6 @@ const StyledDiv = styled('div', { label: 'StyledDiv' })(({ theme }) => ({
 
 const StyledMultipleIPInput = styled(MultipleIPInput, {
   label: 'StyledMultipleIPInput',
-})(({ theme }) => ({
-  marginTop: theme.spacingFunction(16),
+})(({ theme, ips }) => ({
+  ...(ips.length !== 0 ? { marginTop: theme.spacingFunction(16) } : {}),
 }));
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx
index eda6435e4f0..a07f89d38cc 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx
@@ -58,6 +58,7 @@ export const FirewallRuleSetForm = React.memo(
     const ruleSetDropdownOptions = React.useMemo(
       () =>
         ruleSets
+          // TODO: Firewall RuleSets: Remove this client-side filter once the API supports filtering by the 'type' field
           .filter((ruleSet) => ruleSet.type === category) // Display only rule sets applicable to the given category
           .map((ruleSet) => ({
             label: ruleSet.label,
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MutiplePrefixListSelect.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MutiplePrefixListSelect.test.tsx
new file mode 100644
index 00000000000..8df198514e4
--- /dev/null
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MutiplePrefixListSelect.test.tsx
@@ -0,0 +1,389 @@
+import { within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import * as shared from '../../shared';
+import { MultiplePrefixListSelect } from './MutiplePrefixListSelect';
+
+const queryMocks = vi.hoisted(() => ({
+  useAllFirewallPrefixListsQuery: vi.fn().mockReturnValue({}),
+}));
+
+vi.mock('@linode/queries', async () => {
+  const actual = await vi.importActual('@linode/queries');
+  return {
+    ...actual,
+    useAllFirewallPrefixListsQuery: queryMocks.useAllFirewallPrefixListsQuery,
+  };
+});
+
+const spy = vi.spyOn(shared, 'useIsFirewallRulesetsPrefixlistsEnabled');
+
+describe('MultiplePrefixListSelect', () => {
+  beforeEach(() => {
+    spy.mockReturnValue({
+      isFirewallRulesetsPrefixlistsFeatureEnabled: true,
+      isFirewallRulesetsPrefixListsBetaEnabled: false,
+      isFirewallRulesetsPrefixListsLAEnabled: false,
+      isFirewallRulesetsPrefixListsGAEnabled: false,
+    });
+  });
+
+  const onChange = vi.fn();
+
+  const mockPrefixLists = [
+    {
+      name: 'pl::supports-both',
+      ipv4: ['192.168.0.0/24'],
+      ipv6: ['2001:db8::/128'],
+    }, // PL supported (supports both)
+    {
+      name: 'pl::supports-only-ipv6',
+      ipv4: null,
+      ipv6: ['2001:db8:1::/128'],
+    }, // supported (supports only ipv6)
+    {
+      name: 'pl:system:supports-only-ipv4',
+      ipv4: ['10.0.0.0/16'],
+      ipv6: null,
+    }, // supported (supports only ipv4)
+    { name: 'pl:system:supports-both', ipv4: [], ipv6: [] }, // supported (supports both)
+    { name: 'pl:system:not-supported', ipv4: null, ipv6: null }, // unsupported
+  ];
+
+  queryMocks.useAllFirewallPrefixListsQuery.mockReturnValue({
+    data: mockPrefixLists,
+    isFetching: false,
+    error: null,
+  });
+
+  it('should render the title only when at least one PL row is added', () => {
+    const { getByText } = renderWithTheme(
+      <MultiplePrefixListSelect
+        onChange={vi.fn()}
+        pls={[{ address: '', inIPv4Rule: false, inIPv6Rule: false }]}
+      />
+    );
+    expect(getByText('Prefix List')).toBeVisible();
+  });
+
+  it('should not render the title when no PL row is added', () => {
+    const { queryByText } = renderWithTheme(
+      <MultiplePrefixListSelect onChange={vi.fn()} pls={[]} />
+    );
+    expect(queryByText('Prefix List')).not.toBeInTheDocument();
+  });
+
+  it('should add a new PL row (empty state) when clicking "Add a Prefix List"', async () => {
+    const { getByText } = renderWithTheme(
+      <MultiplePrefixListSelect onChange={onChange} pls={[]} />
+    );
+
+    await userEvent.click(getByText('Add a Prefix List'));
+    expect(onChange).toHaveBeenCalledWith([
+      { address: '', inIPv4Rule: false, inIPv6Rule: false },
+    ]);
+  });
+
+  it('should remove a PL row when clicking delete (X)', async () => {
+    const onChange = vi.fn();
+    const pls = [
+      {
+        address: 'pl::supports-both',
+        inIPv4Rule: true,
+        inIPv6Rule: false,
+      },
+    ];
+    const { getByTestId } = renderWithTheme(
+      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+    );
+
+    await userEvent.click(getByTestId('delete-pl-0'));
+    expect(onChange).toHaveBeenCalledWith([]);
+  });
+
+  it('filters out unsupported PLs from dropdown', async () => {
+    const pls = [{ address: '', inIPv4Rule: false, inIPv6Rule: false }];
+    const { getByRole, queryByText } = renderWithTheme(
+      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+    );
+
+    const input = getByRole('combobox');
+    await userEvent.type(input, 'pl:system:not-supported');
+
+    expect(queryByText('pl:system:not-supported')).not.toBeInTheDocument();
+  });
+
+  it('prevents duplicate selection of PLs', async () => {
+    const selectedPLs = [
+      {
+        address: 'pl::supports-both',
+        inIPv4Rule: true,
+        inIPv6Rule: false,
+      },
+      {
+        address: 'pl::supports-only-ipv6',
+        inIPv4Rule: false,
+        inIPv6Rule: true,
+      },
+      { address: '', inIPv4Rule: false, inIPv6Rule: false },
+    ];
+    const { getAllByRole, findByText } = renderWithTheme(
+      <MultiplePrefixListSelect onChange={onChange} pls={selectedPLs} />
+    );
+
+    const inputs = getAllByRole('combobox');
+    const lastEmptyInput = inputs[inputs.length - 1];
+
+    // Try to search already selected Prefix List
+    await userEvent.type(lastEmptyInput, 'pl::supports-only-ipv6');
+
+    // Display no option available message for already selected Prefix List in dropdown
+    const noOptionsMessage = await findByText(
+      'You have no options to choose from'
+    );
+    expect(noOptionsMessage).toBeInTheDocument();
+  });
+
+  it('should render a PL select field for each string in PLs', () => {
+    const pls = [
+      {
+        address: 'pl::supports-both',
+        inIPv4Rule: true,
+        inIPv6Rule: false,
+      },
+      {
+        address: 'pl::supports-only-ipv6',
+        inIPv4Rule: false,
+        inIPv6Rule: true,
+      },
+      {
+        address: 'pl:system:supports-only-ipv4',
+        inIPv6Rule: false,
+        inIPv4Rule: true,
+      },
+    ];
+    const { getByDisplayValue, queryAllByTestId } = renderWithTheme(
+      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+    );
+
+    expect(queryAllByTestId('prefixlist-select')).toHaveLength(3);
+    getByDisplayValue('pl::supports-both');
+    getByDisplayValue('pl::supports-only-ipv6');
+    getByDisplayValue('pl:system:supports-only-ipv4');
+  });
+
+  it('defaults to IPv4 selected and IPv6 unselected when choosing a PL that supports both', async () => {
+    const pls = [{ address: '', inIPv4Rule: false, inIPv6Rule: false }];
+    const { findByText, getByRole } = renderWithTheme(
+      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+    );
+
+    const input = getByRole('combobox');
+
+    // Type the PL name to filter the dropdown
+    await userEvent.type(input, 'pl::supports-both');
+
+    // Select the option from the autocomplete dropdown
+    const option = await findByText('pl::supports-both');
+    await userEvent.click(option);
+
+    expect(onChange).toHaveBeenCalledWith([
+      {
+        address: 'pl::supports-both',
+        inIPv4Rule: true,
+        inIPv6Rule: false,
+      },
+    ]);
+  });
+
+  it('defaults to IPv4 selected and IPv6 unselected when choosing a PL that supports only IPv4', async () => {
+    const pls = [{ address: '', inIPv4Rule: false, inIPv6Rule: false }];
+    const { findByText, getByRole } = renderWithTheme(
+      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+    );
+
+    const input = getByRole('combobox');
+
+    // Type the PL name to filter the dropdown
+    await userEvent.type(input, 'pl:system:supports-only-ipv4');
+
+    // Select the option from the autocomplete dropdown
+    const option = await findByText('pl:system:supports-only-ipv4');
+    await userEvent.click(option);
+
+    expect(onChange).toHaveBeenCalledWith([
+      {
+        address: 'pl:system:supports-only-ipv4',
+        inIPv4Rule: true,
+        inIPv6Rule: false,
+      },
+    ]);
+  });
+
+  it('defaults to IPv4 unselected and IPv6 selected when choosing a PL that supports only IPv6', async () => {
+    const pls = [{ address: '', inIPv4Rule: false, inIPv6Rule: false }];
+    const { findByText, getByRole } = renderWithTheme(
+      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+    );
+
+    const input = getByRole('combobox');
+
+    // Type the PL name to filter the dropdown
+    await userEvent.type(input, 'pl::supports-only-ipv6');
+
+    // Select the option from the autocomplete dropdown
+    const option = await findByText('pl::supports-only-ipv6');
+    await userEvent.click(option);
+
+    expect(onChange).toHaveBeenCalledWith([
+      {
+        address: 'pl::supports-only-ipv6',
+        inIPv4Rule: false,
+        inIPv6Rule: true,
+      },
+    ]);
+  });
+
+  it('renders IPv4 checked + disabled, and IPv6 unchecked + enabled when a prefix list supports both but is only referenced in IPv4 Rule', async () => {
+    const pls = [
+      { address: 'pl::supports-both', inIPv4Rule: true, inIPv6Rule: false },
+    ];
+    const { findByTestId } = renderWithTheme(
+      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+    );
+
+    const ipv4CheckboxWrapper = await findByTestId('ipv4-checkbox-0');
+    const ipv6CheckboxWrapper = await findByTestId('ipv6-checkbox-0');
+
+    const ipv4Checkbox = within(ipv4CheckboxWrapper).getByRole('checkbox');
+    const ipv6Checkbox = within(ipv6CheckboxWrapper).getByRole('checkbox');
+
+    // IPv4 Checked and Disabled
+    expect(ipv4Checkbox).toBeChecked();
+    expect(ipv4Checkbox).toBeDisabled();
+
+    // IPv6 Unchecked and enabled (User can check/select IPv6 since this prefix list supports both IPv4 and IPv6)
+    expect(ipv6Checkbox).not.toBeChecked();
+    expect(ipv6Checkbox).toBeEnabled();
+  });
+
+  it('renders IPv6 checked + disabled, and IPv4 unchecked + enabled when a prefix list supports both but is only referenced in IPv6 Rule', async () => {
+    const pls = [
+      { address: 'pl::supports-both', inIPv4Rule: false, inIPv6Rule: true },
+    ];
+    const { findByTestId } = renderWithTheme(
+      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+    );
+
+    const ipv4CheckboxWrapper = await findByTestId('ipv4-checkbox-0');
+    const ipv6CheckboxWrapper = await findByTestId('ipv6-checkbox-0');
+
+    const ipv4Checkbox = within(ipv4CheckboxWrapper).getByRole('checkbox');
+    const ipv6Checkbox = within(ipv6CheckboxWrapper).getByRole('checkbox');
+
+    // IPv4 Unchecked and Enabled (User can check/select IPv4 since this prefix list supports both IPv4 and IPv6)
+    expect(ipv4Checkbox).not.toBeChecked();
+    expect(ipv4Checkbox).toBeEnabled();
+
+    // IPv6 Checked and Disabled
+    expect(ipv6Checkbox).toBeChecked();
+    expect(ipv6Checkbox).toBeDisabled();
+  });
+
+  it('renders both IPv4 and IPv6 as checked and enabled when the prefix list supports both and is referenced in both IPv4 & IPv6 Rule', async () => {
+    const pls = [
+      { address: 'pl::supports-both', inIPv4Rule: true, inIPv6Rule: true },
+    ];
+    const { findByTestId } = renderWithTheme(
+      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+    );
+
+    const ipv4CheckboxWrapper = await findByTestId('ipv4-checkbox-0');
+    const ipv6CheckboxWrapper = await findByTestId('ipv6-checkbox-0');
+
+    const ipv4Checkbox = within(ipv4CheckboxWrapper).getByRole('checkbox');
+    const ipv6Checkbox = within(ipv6CheckboxWrapper).getByRole('checkbox');
+
+    // IPv4 Checked and Enabled
+    expect(ipv4Checkbox).toBeChecked();
+    expect(ipv4Checkbox).toBeEnabled();
+
+    // IPv6 Checked and Enabled
+    expect(ipv6Checkbox).toBeChecked();
+    expect(ipv6Checkbox).toBeEnabled();
+  });
+
+  it('renders IPv6 unchecked + disabled, and IPv4 checked + disabled when PL only supports IPv4', async () => {
+    const pls = [
+      {
+        address: 'pl:system:supports-only-ipv4',
+        inIPv4Rule: true,
+        inIPv6Rule: false,
+      },
+    ];
+    const { findByTestId } = renderWithTheme(
+      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+    );
+
+    const ipv4CheckboxWrapper = await findByTestId('ipv4-checkbox-0');
+    const ipv6CheckboxWrapper = await findByTestId('ipv6-checkbox-0');
+
+    const ipv4Checkbox = within(ipv4CheckboxWrapper).getByRole('checkbox');
+    const ipv6Checkbox = within(ipv6CheckboxWrapper).getByRole('checkbox');
+
+    // IPv4 Checked and Disabled
+    expect(ipv4Checkbox).toBeChecked();
+    expect(ipv4Checkbox).toBeDisabled();
+
+    // IPV6 Unchecked and Disabled
+    expect(ipv6Checkbox).not.toBeChecked();
+    expect(ipv6Checkbox).toBeDisabled();
+  });
+
+  it('renders IPv4 checkbox unchecked + disabled, and IPv6 checked + disabled when PL only supports IPv6', async () => {
+    const pls = [
+      {
+        address: 'pl::supports-only-ipv6',
+        inIPv4Rule: false,
+        inIPv6Rule: true,
+      },
+    ];
+    const { findByTestId } = renderWithTheme(
+      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+    );
+
+    const ipv4CheckboxWrapper = await findByTestId('ipv4-checkbox-0');
+    const ipv6CheckboxWrapper = await findByTestId('ipv6-checkbox-0');
+
+    const ipv4Checkbox = within(ipv4CheckboxWrapper).getByRole('checkbox');
+    const ipv6Checkbox = within(ipv6CheckboxWrapper).getByRole('checkbox');
+
+    // IPv4 Unchecked and Disabled
+    expect(ipv4Checkbox).not.toBeChecked();
+    expect(ipv4Checkbox).toBeDisabled();
+
+    // IPV6 Checked and Disabled
+    expect(ipv6Checkbox).toBeChecked();
+    expect(ipv6Checkbox).toBeDisabled();
+  });
+
+  // Toggling of Checkbox is allowed only when PL supports both IPv4 & IPv6
+  it('calls onChange with updated values when toggling checkboxes', async () => {
+    const pls = [
+      { address: 'pl::supports-both', inIPv4Rule: true, inIPv6Rule: false },
+    ];
+    const { findByTestId } = renderWithTheme(
+      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+    );
+
+    const ipv6Checkbox = await findByTestId('ipv6-checkbox-0');
+    await userEvent.click(ipv6Checkbox);
+
+    expect(onChange).toHaveBeenCalledWith([
+      { address: 'pl::supports-both', inIPv4Rule: true, inIPv6Rule: true },
+    ]);
+  });
+});
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MutiplePrefixListSelect.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MutiplePrefixListSelect.tsx
new file mode 100644
index 00000000000..b956e1c4075
--- /dev/null
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MutiplePrefixListSelect.tsx
@@ -0,0 +1,328 @@
+import { useAllFirewallPrefixListsQuery } from '@linode/queries';
+import {
+  Autocomplete,
+  BetaChip,
+  Box,
+  Button,
+  Checkbox,
+  CloseIcon,
+  IconButton,
+  InputLabel,
+  Stack,
+} from '@linode/ui';
+import Grid from '@mui/material/Grid';
+import * as React from 'react';
+import { makeStyles } from 'tss-react/mui';
+
+import { Link } from 'src/components/Link';
+import { useIsFirewallRulesetsPrefixlistsEnabled } from 'src/features/Firewalls/shared';
+
+import { getPrefixListType, groupPriority } from './shared';
+
+import type { FirewallPrefixList } from '@linode/api-v4';
+import type { Theme } from '@mui/material/styles';
+import type { ExtendedPL } from 'src/utilities/ipUtils';
+
+const useStyles = makeStyles()((theme: Theme) => ({
+  addPL: {
+    '& span:first-of-type': {
+      justifyContent: 'flex-start',
+    },
+    paddingLeft: 0,
+    paddingTop: theme.spacingFunction(12),
+  },
+  button: {
+    '& > span': {
+      padding: 2,
+    },
+    marginLeft: `-${theme.spacingFunction(8)}`,
+    marginTop: 4,
+    minHeight: 'auto',
+    minWidth: 'auto',
+    padding: 0,
+  },
+  root: {
+    marginTop: theme.spacingFunction(8),
+  },
+}));
+
+const isPrefixListSupported = (pl: FirewallPrefixList) =>
+  (pl.ipv4 !== null && pl.ipv4 !== undefined) ||
+  (pl.ipv6 !== null && pl.ipv6 !== undefined);
+
+const getSupportDetails = (pl: FirewallPrefixList) => ({
+  isPLIPv4Unsupported: pl.ipv4 === null || pl.ipv4 === undefined,
+  isPLIPv6Unsupported: pl.ipv6 === null || pl.ipv6 === undefined,
+});
+
+/**
+ * Default selection state for a newly chosen Prefix List
+ */
+const getDefaultPLReferenceState = (
+  support: ReturnType<typeof getSupportDetails>
+): { inIPv4Rule: boolean; inIPv6Rule: boolean } => {
+  const { isPLIPv4Unsupported, isPLIPv6Unsupported } = support;
+
+  if (!isPLIPv4Unsupported && !isPLIPv6Unsupported)
+    return { inIPv4Rule: true, inIPv6Rule: false };
+
+  if (!isPLIPv4Unsupported && isPLIPv6Unsupported)
+    return { inIPv4Rule: true, inIPv6Rule: false };
+
+  if (isPLIPv4Unsupported && !isPLIPv6Unsupported)
+    return { inIPv4Rule: false, inIPv6Rule: true };
+
+  // Should not happen but safe fallback
+  return { inIPv4Rule: false, inIPv6Rule: false };
+};
+
+export interface MultiplePrefixListSelectProps {
+  /**
+   * Custom CSS class for additional styling.
+   */
+  className?: string;
+
+  /**
+   * Disables the component (non-interactive).
+   * @default false
+   */
+  disabled?: boolean;
+
+  /**
+   * Callback triggered when PLs change, passing updated `pls`.
+   */
+  onChange: (pls: ExtendedPL[]) => void;
+
+  /**
+   * Placeholder text for an empty input field.
+   */
+  placeholder?: string;
+
+  /**
+   * Array of `ExtendedPL` objects representing managed PLs.
+   */
+  pls: ExtendedPL[];
+}
+
+export const MultiplePrefixListSelect = React.memo(
+  (props: MultiplePrefixListSelectProps) => {
+    const { className, disabled, pls, onChange } = props;
+    const { classes, cx } = useStyles();
+    const {
+      isFirewallRulesetsPrefixlistsFeatureEnabled,
+      isFirewallRulesetsPrefixListsBetaEnabled,
+    } = useIsFirewallRulesetsPrefixlistsEnabled();
+    const { data, isLoading } = useAllFirewallPrefixListsQuery(
+      isFirewallRulesetsPrefixlistsFeatureEnabled
+    );
+
+    const prefixLists = data ?? [];
+
+    /**
+     * Filter prefix lists to include those that support IPv4, IPv6, or both,
+     * and map them to options with label, value, and PL IP support details.
+     */
+    const supportedOptions = React.useMemo(
+      () =>
+        prefixLists
+          .filter(isPrefixListSupported)
+          .map((pl) => ({
+            label: pl.name,
+            value: pl.id,
+            support: getSupportDetails(pl),
+          }))
+          // The API does not seem to sort prefix lists by "name" to prioritize certain types.
+          // This sort ensures that Autocomplete's groupBy displays groups correctly without duplicates
+          // and that the dropdown shows groups in the desired order.
+          .sort((a, b) => {
+            const groupA = getPrefixListType(a.label);
+            const groupB = getPrefixListType(b.label);
+
+            return groupPriority[groupA] - groupPriority[groupB];
+          }),
+      [prefixLists]
+    );
+
+    /**
+     * Returns the list of prefix list options available for a specific row.
+     * Always includes the currently selected option, and excludes any options
+     * that are already selected in other rows. This prevents duplicate prefix
+     * list selection across rows.
+     */
+    const getAvailableOptions = React.useCallback(
+      (idx: number, address: string) =>
+        supportedOptions.filter(
+          (o) =>
+            o.label === address || // allow current
+            !pls.some((p, i) => i !== idx && p.address === o.label)
+        ),
+      [supportedOptions, pls]
+    );
+
+    const updatePL = (idx: number, updated: Partial<ExtendedPL>) => {
+      const newPLs = [...pls];
+      newPLs[idx] = { ...newPLs[idx], ...updated };
+      onChange(newPLs);
+    };
+
+    // Handlers
+    const handleSelectPL = (label: string, idx: number) => {
+      const match = supportedOptions.find((o) => o.label === label);
+      if (!match) return;
+
+      updatePL(idx, {
+        address: label,
+        ...getDefaultPLReferenceState(match.support),
+      });
+    };
+
+    const handleToggleIPv4 = (checked: boolean, idx: number) => {
+      updatePL(idx, {
+        inIPv4Rule: checked,
+      });
+    };
+
+    const handleToggleIPv6 = (checked: boolean, idx: number) => {
+      updatePL(idx, {
+        inIPv6Rule: checked,
+      });
+    };
+
+    const addNewInput = () => {
+      onChange([...pls, { address: '', inIPv4Rule: false, inIPv6Rule: false }]);
+    };
+
+    const removeInput = (idx: number) => {
+      const _pls = [...pls];
+      _pls.splice(idx, 1);
+      onChange(_pls);
+    };
+
+    if (!pls) {
+      return null;
+    }
+
+    const renderRow = (thisPL: ExtendedPL, idx: number) => {
+      const availableOptions = getAvailableOptions(idx, thisPL.address);
+
+      const selectedOption = availableOptions.find(
+        (o) => o.label === thisPL.address
+      );
+
+      // Disabling a checkbox ensures that at least one option (IPv4 or IPv6) remains checked
+      const ipv4Unsupported =
+        selectedOption?.support.isPLIPv4Unsupported === true;
+      const ipv6Unsupported =
+        selectedOption?.support.isPLIPv6Unsupported === true;
+
+      const ipv4Forced =
+        thisPL.inIPv4Rule === true && thisPL.inIPv6Rule === false;
+      const ipv6Forced =
+        thisPL.inIPv6Rule === true && thisPL.inIPv4Rule === false;
+
+      const disableIPv4 = ipv4Unsupported || ipv4Forced;
+      const disableIPv6 = ipv6Unsupported || ipv6Forced;
+
+      return (
+        <Grid
+          container
+          data-testid="prefixlist-select"
+          direction="row"
+          key={`prefixlist-${idx}`}
+          spacing={2}
+          sx={{
+            justifyContent: 'center',
+          }}
+        >
+          <Grid size={11}>
+            <Autocomplete
+              disableClearable={prefixLists.length > 0}
+              disabled={disabled}
+              errorText={thisPL.error}
+              getOptionLabel={(option) => option.label}
+              groupBy={(option) => getPrefixListType(option.label)}
+              label=""
+              loading={isLoading}
+              noMarginTop
+              onChange={(_, selectedPrefixList) => {
+                handleSelectPL(selectedPrefixList?.label ?? '', idx);
+              }}
+              options={availableOptions}
+              placeholder="Type to search or select Prefix List"
+              value={
+                availableOptions.find((o) => o.label === thisPL.address) ?? null
+              }
+            />
+            {thisPL.address.length !== 0 && (
+              <Box
+                display="flex"
+                justifyContent="space-between"
+                sx={{ ml: 0.4 }}
+              >
+                <Box display="flex" gap={2}>
+                  <Checkbox
+                    checked={thisPL.inIPv4Rule === true}
+                    data-testid={`ipv4-checkbox-${idx}`}
+                    disabled={disableIPv4 || disabled}
+                    onChange={() => handleToggleIPv4(!thisPL.inIPv4Rule, idx)}
+                    text="IPv4"
+                  />
+                  <Checkbox
+                    checked={thisPL.inIPv6Rule === true}
+                    data-testid={`ipv6-checkbox-${idx}`}
+                    disabled={disableIPv6 || disabled}
+                    onChange={() => handleToggleIPv6(!thisPL.inIPv6Rule, idx)}
+                    text="IPv6"
+                  />
+                </Box>
+                <Box alignItems="center" display="flex">
+                  <Link onClick={() => {}}>View Details</Link>
+                </Box>
+              </Box>
+            )}
+          </Grid>
+          <Grid size={1}>
+            <IconButton
+              aria-disabled={disabled}
+              className={classes.button}
+              data-testid="button"
+              disabled={disabled}
+              onClick={() => removeInput(idx)}
+              sx={(theme) => ({
+                height: 20,
+                width: 20,
+                marginTop: `${theme.spacingFunction(16)} !important`,
+              })}
+            >
+              <CloseIcon data-testid={`delete-pl-${idx}`} />
+            </IconButton>
+          </Grid>
+        </Grid>
+      );
+    };
+
+    return (
+      <div className={cx(classes.root, className)}>
+        {/* Display the title only when pls.length > 0 (i.e., at least one PL row is added) */}
+        {pls.length > 0 && (
+          <Box display="flex">
+            <InputLabel sx={{ margin: 0 }}>Prefix List</InputLabel>
+            {isFirewallRulesetsPrefixListsBetaEnabled && <BetaChip />}
+          </Box>
+        )}
+        <Stack spacing={1}>
+          {pls.map((thisPL, idx) => renderRow(thisPL, idx))}
+        </Stack>
+        <Button
+          buttonType="secondary"
+          className={classes.addPL}
+          compactX
+          disabled={disabled}
+          onClick={addNewInput}
+        >
+          Add a Prefix List
+        </Button>
+      </div>
+    );
+  }
+);
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.ts b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.ts
index bdf38531fd0..200ffa8c0f1 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.ts
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.ts
@@ -135,6 +135,12 @@ export const firewallRuleCreateOptions = [
 
 type PrefixListGroup = 'Account' | 'Other' | 'System';
 
+export const groupPriority: Record<PrefixListGroup, number> = {
+  Account: 1,
+  System: 2,
+  Other: 3,
+};
+
 export const getPrefixListType = (name: string): PrefixListGroup => {
   if (name.startsWith('pl::')) {
     return 'Account';
diff --git a/packages/manager/src/features/Firewalls/shared.tsx b/packages/manager/src/features/Firewalls/shared.tsx
index 675683ad504..f9696d68960 100644
--- a/packages/manager/src/features/Firewalls/shared.tsx
+++ b/packages/manager/src/features/Firewalls/shared.tsx
@@ -72,12 +72,24 @@ export const protocolOptions: FirewallOptionItem<FirewallRuleProtocol>[] = [
   { label: 'IPENCAP', value: 'IPENCAP' },
 ];
 
-export const addressOptions = [
-  { label: 'All IPv4, All IPv6', value: 'all' },
-  { label: 'All IPv4', value: 'allIPv4' },
-  { label: 'All IPv6', value: 'allIPv6' },
-  { label: 'IP / Netmask', value: 'ip/netmask' },
-];
+export const useAddressOptions = () => {
+  const { isFirewallRulesetsPrefixlistsFeatureEnabled } =
+    useIsFirewallRulesetsPrefixlistsEnabled();
+
+  return [
+    { label: 'All IPv4, All IPv6', value: 'all' },
+    { label: 'All IPv4', value: 'allIPv4' },
+    { label: 'All IPv6', value: 'allIPv6' },
+    {
+      label: isFirewallRulesetsPrefixlistsFeatureEnabled
+        ? 'IP / Netmask / Prefix List'
+        : 'IP / Netmask',
+      // We can keep this entire value even if the option is feature-flagged.
+      // Feature-flagging the label (without the "Prefix List" text) is sufficient.
+      value: 'ip/netmask/prefixlist',
+    },
+  ];
+};
 
 export const portPresets: Record<FirewallPreset, keyof typeof PORT_PRESETS> = {
   dns: '53',
diff --git a/packages/manager/src/utilities/ipUtils.ts b/packages/manager/src/utilities/ipUtils.ts
index e95a8fc3b9f..3cb6659cd67 100644
--- a/packages/manager/src/utilities/ipUtils.ts
+++ b/packages/manager/src/utilities/ipUtils.ts
@@ -1,6 +1,8 @@
 import { PRIVATE_IPV4_REGEX } from '@linode/validation';
 import { parseCIDR, parse as parseIP } from 'ipaddr.js';
 
+import type { PrefixListRuleReference } from 'src/features/Firewalls/shared';
+
 /**
  * Removes the prefix length from the end of an IPv6 address.
  *
@@ -21,6 +23,8 @@ export interface ExtendedIP {
   error?: string;
 }
 
+export interface ExtendedPL extends ExtendedIP, PrefixListRuleReference {}
+
 export const stringToExtendedIP = (ip: string): ExtendedIP => ({ address: ip });
 export const extendedIPToString = (ip: ExtendedIP): string => ip.address;
 export const ipFieldPlaceholder = '192.0.2.1/32';

From 915b1704286e0e1e91d251c4fb60f291597cab2a Mon Sep 17 00:00:00 2001
From: Ankita <ankitaan@akamai.com>
Date: Wed, 3 Dec 2025 16:58:20 +0530
Subject: [PATCH 66/91] upcoming: [DI-28504] - Update tooltip msg in LKE
 service dashboard (#13157)

* upcoming: [DI-28504] - Update tooltip msg

* upcoming: [DI-28504] - Fix linting

* upcoming: [DI-28504] - Add changeset

---------

Co-authored-by: venkatmano-akamai <vmangalr@akamai.com>
---
 .../.changeset/pr-13157-upcoming-features-1764741522593.md   | 5 +++++
 packages/manager/src/features/CloudPulse/Utils/constants.ts  | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 packages/manager/.changeset/pr-13157-upcoming-features-1764741522593.md

diff --git a/packages/manager/.changeset/pr-13157-upcoming-features-1764741522593.md b/packages/manager/.changeset/pr-13157-upcoming-features-1764741522593.md
new file mode 100644
index 00000000000..f91b3a5d2f5
--- /dev/null
+++ b/packages/manager/.changeset/pr-13157-upcoming-features-1764741522593.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+CloudPulse-Metrics: Update tooltip msg for `Clusters` filter in LKE service dashboard ([#13157](https://github.com/linode/manager/pull/13157))
diff --git a/packages/manager/src/features/CloudPulse/Utils/constants.ts b/packages/manager/src/features/CloudPulse/Utils/constants.ts
index eb7629499a6..2e830288e4d 100644
--- a/packages/manager/src/features/CloudPulse/Utils/constants.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/constants.ts
@@ -91,7 +91,8 @@ export const INTERFACE_IDS_LIMIT_ERROR_MESSAGE =
 
 export const INTERFACE_IDS_PLACEHOLDER_TEXT = 'e.g., 1234,5678';
 
-export const CLUSTERS_TOOLTIP_TEXT = 'It includes enterprise Clusters only.';
+export const CLUSTERS_TOOLTIP_TEXT =
+  'This list includes only LKE Enterprise clusters.';
 
 export const NO_REGION_MESSAGE: Record<number, string> = {
   1: 'No database clusters configured in any regions.',

From 6d8b9c40bf7512a37e14b5e1ef1ab54aa887db3f Mon Sep 17 00:00:00 2001
From: Alban Bailly <130582365+abailly-akamai@users.noreply.github.com>
Date: Wed, 3 Dec 2025 13:42:00 +0100
Subject: [PATCH 67/91] fix: [UIE-9731] - IAM Permissions performance
 improvements: Create from Backup & Clone (#13143)

* utilize new endpoint to avoid parallel queries

* add loading

* handle cards as well

* Added changeset:  IAM Permissions performance improvements: Create from Backup & Clone
---
 .../pr-13143-fixed-1764672257327.md           |   5 +
 .../LinodeCreate/shared/LinodeSelectTable.tsx |  86 +++++++++---
 .../shared/LinodeSelectTableRow.test.tsx      | 124 +++++++++++-------
 .../shared/LinodeSelectTableRow.tsx           |  32 +++--
 .../shared/SelectLinodeCard.test.tsx          |  44 +++----
 .../LinodeCreate/shared/SelectLinodeCard.tsx  |  15 +--
 6 files changed, 189 insertions(+), 117 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13143-fixed-1764672257327.md

diff --git a/packages/manager/.changeset/pr-13143-fixed-1764672257327.md b/packages/manager/.changeset/pr-13143-fixed-1764672257327.md
new file mode 100644
index 00000000000..d5cb5c3d6fd
--- /dev/null
+++ b/packages/manager/.changeset/pr-13143-fixed-1764672257327.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+ IAM Permissions performance improvements: Create from Backup & Clone ([#13143](https://github.com/linode/manager/pull/13143))
diff --git a/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTable.tsx b/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTable.tsx
index ce008f726d3..e46f3cebac8 100644
--- a/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTable.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTable.tsx
@@ -19,6 +19,8 @@ import { TableRowEmpty } from 'src/components/TableRowEmpty/TableRowEmpty';
 import { TableRowError } from 'src/components/TableRowError/TableRowError';
 import { TableRowLoading } from 'src/components/TableRowLoading/TableRowLoading';
 import { TableSortCell } from 'src/components/TableSortCell';
+import { useGetAllUserEntitiesByPermission } from 'src/features/IAM/hooks/useGetAllUserEntitiesByPermission';
+import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
 import {
   linodesCreateTypesMap,
   useGetLinodeCreateType,
@@ -56,6 +58,26 @@ export const LinodeSelectTable = (props: Props) => {
     theme.breakpoints.up('md')
   );
 
+  const { data: accountPermissions, isLoading: isLoadingAccountPermissions } =
+    usePermissions('account', ['create_linode']);
+
+  const {
+    data: shutdownableLinodes = [],
+    isLoading: isLoadingShutdownableLinodes,
+    error: shutdownableLinodesError,
+  } = useGetAllUserEntitiesByPermission({
+    entityType: 'linode',
+    permission: 'shutdown_linode',
+  });
+  const {
+    data: cloneableLinodes = [],
+    isLoading: isLoadingCloneableLinodes,
+    error: cloneableLinodesError,
+  } = useGetAllUserEntitiesByPermission({
+    entityType: 'linode',
+    permission: 'clone_linode',
+  });
+
   const {
     control,
     formState: {
@@ -102,7 +124,12 @@ export const LinodeSelectTable = (props: Props) => {
 
   const { filter, filterError } = getLinodeXFilter(query, order, orderBy);
 
-  const { data, error, isFetching, isLoading } = useLinodesQuery(
+  const {
+    data,
+    error: linodesError,
+    isFetching,
+    isLoading: isLoadingLinodes,
+  } = useLinodesQuery(
     {
       page: pagination.page,
       page_size: pagination.pageSize,
@@ -144,6 +171,14 @@ export const LinodeSelectTable = (props: Props) => {
 
   const columns = enablePowerOff ? 6 : 5;
 
+  const isLoading =
+    isLoadingAccountPermissions ||
+    isLoadingShutdownableLinodes ||
+    isLoadingCloneableLinodes ||
+    isLoadingLinodes;
+  const error =
+    shutdownableLinodesError || cloneableLinodesError || linodesError;
+
   return (
     <Stack pt={1} spacing={2}>
       {fieldState.error?.message && (
@@ -195,27 +230,38 @@ export const LinodeSelectTable = (props: Props) => {
               </TableRow>
             </TableHead>
             <TableBody>
-              {isLoading && <TableRowLoading columns={columns} rows={10} />}
+              {isLoading && (
+                <TableRowLoading columns={columns} rows={pagination.pageSize} />
+              )}
               {error && (
                 <TableRowError colSpan={columns} message={error[0].reason} />
               )}
               {data?.results === 0 && <TableRowEmpty colSpan={columns} />}
-              {data?.data.map((linode) => (
-                <LinodeSelectTableRow
-                  key={linode.id}
-                  linode={linode}
-                  onPowerOff={
-                    enablePowerOff
-                      ? () => {
-                          setLinodeToPowerOff(linode);
-                          sendLinodePowerOffEvent('Clone Linode');
-                        }
-                      : undefined
-                  }
-                  onSelect={() => handleSelect(linode)}
-                  selected={linode.id === field.value?.id}
-                />
-              ))}
+              {!isLoading &&
+                !error &&
+                data?.data.map((linode) => (
+                  <LinodeSelectTableRow
+                    disabled={!accountPermissions?.create_linode}
+                    isCloneable={cloneableLinodes?.some(
+                      (l) => l.id === linode.id
+                    )}
+                    isShutdownable={shutdownableLinodes?.some(
+                      (l) => l.id === linode.id
+                    )}
+                    key={linode.id}
+                    linode={linode}
+                    onPowerOff={
+                      enablePowerOff
+                        ? () => {
+                            setLinodeToPowerOff(linode);
+                            sendLinodePowerOffEvent('Clone Linode');
+                          }
+                        : undefined
+                    }
+                    onSelect={() => handleSelect(linode)}
+                    selected={linode.id === field.value?.id}
+                  />
+                ))}
             </TableBody>
           </Table>
         ) : (
@@ -224,6 +270,10 @@ export const LinodeSelectTable = (props: Props) => {
               <SelectLinodeCard
                 handlePowerOff={() => handlePowerOff(linode)}
                 handleSelection={() => handleSelect(linode)}
+                isCloneable={cloneableLinodes?.some((l) => l.id === linode.id)}
+                isShutdownable={shutdownableLinodes?.some(
+                  (l) => l.id === linode.id
+                )}
                 key={linode.id}
                 linode={linode}
                 selected={linode.id === field.value?.id}
diff --git a/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTableRow.test.tsx b/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTableRow.test.tsx
index 0d8231e3617..5649783398b 100644
--- a/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTableRow.test.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTableRow.test.tsx
@@ -3,8 +3,6 @@ import userEvent from '@testing-library/user-event';
 import React from 'react';
 
 import { imageFactory, typeFactory } from 'src/factories';
-import { makeResourcePage } from 'src/mocks/serverHandlers';
-import { http, HttpResponse, server } from 'src/mocks/testServer';
 import {
   renderWithThemeAndHookFormContext,
   wrapWithTableBody,
@@ -13,18 +11,20 @@ import {
 import { LinodeSelectTableRow } from './LinodeSelectTableRow';
 
 const queryMocks = vi.hoisted(() => ({
-  userPermissions: vi.fn(() => ({
-    data: {
-      shutdown_linode: false,
-      clone_linode: false,
-      create_linode: false,
-    },
-  })),
+  useImageQuery: vi.fn().mockReturnValue({}),
+  useRegionsQuery: vi.fn().mockReturnValue({}),
+  useTypeQuery: vi.fn().mockReturnValue({}),
 }));
 
-vi.mock('src/features/IAM/hooks/usePermissions', () => ({
-  usePermissions: queryMocks.userPermissions,
-}));
+vi.mock('@linode/queries', async () => {
+  const actual = await vi.importActual('@linode/queries');
+  return {
+    ...actual,
+    useImageQuery: queryMocks.useImageQuery,
+    useRegionsQuery: queryMocks.useRegionsQuery,
+    useTypeQuery: queryMocks.useTypeQuery,
+  };
+});
 
 describe('LinodeSelectTableRow', () => {
   it('should render a Radio that is labeled by the Linode label', () => {
@@ -32,7 +32,14 @@ describe('LinodeSelectTableRow', () => {
 
     const { getByLabelText } = renderWithThemeAndHookFormContext({
       component: wrapWithTableBody(
-        <LinodeSelectTableRow linode={linode} onSelect={vi.fn()} selected />
+        <LinodeSelectTableRow
+          disabled={false}
+          isCloneable={false}
+          isShutdownable={false}
+          linode={linode}
+          onSelect={vi.fn()}
+          selected
+        />
       ),
     });
 
@@ -44,7 +51,14 @@ describe('LinodeSelectTableRow', () => {
 
     const { getByLabelText } = renderWithThemeAndHookFormContext({
       component: wrapWithTableBody(
-        <LinodeSelectTableRow linode={linode} onSelect={vi.fn()} selected />
+        <LinodeSelectTableRow
+          disabled={false}
+          isCloneable={false}
+          isShutdownable={false}
+          linode={linode}
+          onSelect={vi.fn()}
+          selected
+        />
       ),
     });
 
@@ -57,6 +71,9 @@ describe('LinodeSelectTableRow', () => {
     const { getByLabelText } = renderWithThemeAndHookFormContext({
       component: wrapWithTableBody(
         <LinodeSelectTableRow
+          disabled={false}
+          isCloneable={false}
+          isShutdownable={false}
           linode={linode}
           onSelect={vi.fn()}
           selected={false}
@@ -68,13 +85,6 @@ describe('LinodeSelectTableRow', () => {
   });
 
   it('should should call onSelect when a radio is selected', async () => {
-    queryMocks.userPermissions.mockReturnValue({
-      data: {
-        shutdown_linode: false,
-        clone_linode: true,
-        create_linode: true,
-      },
-    });
     const linode = linodeFactory.build();
 
     const onSelect = vi.fn();
@@ -82,6 +92,9 @@ describe('LinodeSelectTableRow', () => {
     const { getByLabelText } = renderWithThemeAndHookFormContext({
       component: wrapWithTableBody(
         <LinodeSelectTableRow
+          disabled={false}
+          isCloneable={true}
+          isShutdownable={false}
           linode={linode}
           onSelect={onSelect}
           selected={false}
@@ -102,15 +115,20 @@ describe('LinodeSelectTableRow', () => {
       label: 'My Image Nice Label',
     });
 
-    server.use(
-      http.get('*/v4/images/my-image', () => {
-        return HttpResponse.json(image);
-      })
-    );
+    queryMocks.useImageQuery.mockReturnValue({
+      data: image,
+    });
 
     const { findByText } = renderWithThemeAndHookFormContext({
       component: wrapWithTableBody(
-        <LinodeSelectTableRow linode={linode} onSelect={vi.fn()} selected />
+        <LinodeSelectTableRow
+          disabled={false}
+          isCloneable={false}
+          isShutdownable={false}
+          linode={linode}
+          onSelect={vi.fn()}
+          selected
+        />
       ),
     });
 
@@ -124,19 +142,24 @@ describe('LinodeSelectTableRow', () => {
       label: 'US Test',
     });
 
-    server.use(
-      http.get('*/v4*/regions', () => {
-        return HttpResponse.json(makeResourcePage([region]));
-      })
-    );
+    queryMocks.useRegionsQuery.mockReturnValue({
+      data: [region],
+    });
 
     const { findByText } = renderWithThemeAndHookFormContext({
       component: wrapWithTableBody(
-        <LinodeSelectTableRow linode={linode} onSelect={vi.fn()} selected />
+        <LinodeSelectTableRow
+          disabled={false}
+          isCloneable={false}
+          isShutdownable={false}
+          linode={linode}
+          onSelect={vi.fn()}
+          selected
+        />
       ),
     });
 
-    await findByText(`US, ${region.label}`);
+    await findByText(region.label);
   });
 
   it('should render a Linode plan label', async () => {
@@ -146,15 +169,20 @@ describe('LinodeSelectTableRow', () => {
       label: 'Linode Type 1',
     });
 
-    server.use(
-      http.get('*/v4/linode/types/linode-type-1', () => {
-        return HttpResponse.json(type);
-      })
-    );
+    queryMocks.useTypeQuery.mockReturnValue({
+      data: type,
+    });
 
     const { findByText } = renderWithThemeAndHookFormContext({
       component: wrapWithTableBody(
-        <LinodeSelectTableRow linode={linode} onSelect={vi.fn()} selected />
+        <LinodeSelectTableRow
+          disabled={false}
+          isCloneable={false}
+          isShutdownable={false}
+          linode={linode}
+          onSelect={vi.fn()}
+          selected
+        />
       ),
     });
 
@@ -167,6 +195,9 @@ describe('LinodeSelectTableRow', () => {
     const { getByText } = renderWithThemeAndHookFormContext({
       component: wrapWithTableBody(
         <LinodeSelectTableRow
+          disabled={false}
+          isCloneable={false}
+          isShutdownable={false}
           linode={linode}
           onPowerOff={vi.fn()}
           onSelect={vi.fn()}
@@ -180,17 +211,13 @@ describe('LinodeSelectTableRow', () => {
 
   it('should render an enabled power off button if the Linode is powered on, a onPowerOff function is passed, and the row is selected, if user has shutdown_linode permission', async () => {
     const linode = linodeFactory.build({ status: 'running' });
-    queryMocks.userPermissions.mockReturnValue({
-      data: {
-        shutdown_linode: true,
-        clone_linode: true,
-        create_linode: true,
-      },
-    });
 
     const { getByText } = renderWithThemeAndHookFormContext({
       component: wrapWithTableBody(
         <LinodeSelectTableRow
+          disabled={false}
+          isCloneable={true}
+          isShutdownable={true}
           linode={linode}
           onPowerOff={vi.fn()}
           onSelect={vi.fn()}
@@ -209,6 +236,9 @@ describe('LinodeSelectTableRow', () => {
     const { getByText } = renderWithThemeAndHookFormContext({
       component: wrapWithTableBody(
         <LinodeSelectTableRow
+          disabled={false}
+          isCloneable={true}
+          isShutdownable={true}
           linode={linode}
           onPowerOff={onPowerOff}
           onSelect={vi.fn()}
diff --git a/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTableRow.tsx b/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTableRow.tsx
index dba275bec94..51405c434cc 100644
--- a/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTableRow.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreate/shared/LinodeSelectTableRow.tsx
@@ -7,12 +7,14 @@ import { InlineMenuAction } from 'src/components/InlineMenuAction/InlineMenuActi
 import { StatusIcon } from 'src/components/StatusIcon/StatusIcon';
 import { TableCell } from 'src/components/TableCell';
 import { TableRow } from 'src/components/TableRow';
-import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
 import { getLinodeIconStatus } from 'src/features/Linodes/LinodesLanding/utils';
 
 import type { Linode } from '@linode/api-v4';
 
 interface Props {
+  disabled: boolean;
+  isCloneable: boolean;
+  isShutdownable: boolean;
   linode: Linode;
   onPowerOff?: () => void;
   onSelect: () => void;
@@ -20,7 +22,15 @@ interface Props {
 }
 
 export const LinodeSelectTableRow = (props: Props) => {
-  const { linode, onPowerOff, onSelect, selected } = props;
+  const {
+    disabled,
+    isCloneable,
+    isShutdownable,
+    linode,
+    onPowerOff,
+    onSelect,
+    selected,
+  } = props;
 
   const { data: image } = useImageQuery(
     linode.image ?? '',
@@ -33,25 +43,13 @@ export const LinodeSelectTableRow = (props: Props) => {
 
   const region = regions?.find((r) => r.id === linode.region);
 
-  const { data: accountPermissions } = usePermissions('account', [
-    'create_linode',
-  ]);
-
-  const { data: permissions } = usePermissions(
-    'linode',
-    ['shutdown_linode', 'clone_linode'],
-    linode.id
-  );
-
   return (
-    <TableRow disabled={!permissions.clone_linode} key={linode.label}>
+    <TableRow disabled={!isCloneable} key={linode.label}>
       <TableCell>
         <FormControlLabel
           checked={selected}
           control={<Radio />}
-          disabled={
-            !permissions.clone_linode || !accountPermissions?.create_linode
-          }
+          disabled={!isCloneable || disabled}
           label={linode.label}
           onChange={onSelect}
           sx={{ gap: 2 }}
@@ -72,7 +70,7 @@ export const LinodeSelectTableRow = (props: Props) => {
             <InlineMenuAction
               actionText="Power Off"
               buttonHeight={43}
-              disabled={!permissions.shutdown_linode}
+              disabled={!isShutdownable}
               onClick={onPowerOff}
             />
           )}
diff --git a/packages/manager/src/features/Linodes/LinodeCreate/shared/SelectLinodeCard.test.tsx b/packages/manager/src/features/Linodes/LinodeCreate/shared/SelectLinodeCard.test.tsx
index 9baac9b60ad..6da5338a6da 100644
--- a/packages/manager/src/features/Linodes/LinodeCreate/shared/SelectLinodeCard.test.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreate/shared/SelectLinodeCard.test.tsx
@@ -19,23 +19,15 @@ const defaultProps = {
   showPowerActions: false,
 };
 
-const queryMocks = vi.hoisted(() => ({
-  userPermissions: vi.fn(() => ({
-    data: {
-      shutdown_linode: false,
-      clone_linode: false,
-    },
-  })),
-}));
-
-vi.mock('src/features/IAM/hooks/usePermissions', () => ({
-  usePermissions: queryMocks.userPermissions,
-}));
-
 describe('SelectLinodeCard', () => {
   it('displays the status of a linode', () => {
     const { getByLabelText, getByText, queryByRole } = renderWithTheme(
-      <SelectLinodeCard {...defaultProps} showPowerActions={true} />
+      <SelectLinodeCard
+        {...defaultProps}
+        isCloneable={true}
+        isShutdownable={true}
+        showPowerActions={true}
+      />
     );
     expect(getByLabelText('Linode status running')).toBeInTheDocument();
     expect(getByText('Running')).toBeVisible();
@@ -47,6 +39,8 @@ describe('SelectLinodeCard', () => {
     const { getByLabelText, getByText, getByRole } = renderWithTheme(
       <SelectLinodeCard
         {...defaultProps}
+        isCloneable={true}
+        isShutdownable={false}
         selected={true}
         showPowerActions={true}
       />
@@ -63,6 +57,8 @@ describe('SelectLinodeCard', () => {
     const { getByTestId, getByText } = renderWithTheme(
       <SelectLinodeCard
         {...defaultProps}
+        isCloneable={false}
+        isShutdownable={true}
         selected={true}
         showPowerActions={true}
       />
@@ -74,15 +70,11 @@ describe('SelectLinodeCard', () => {
   });
 
   it('should enable the Selection Card if user has clone_linode permission', () => {
-    queryMocks.userPermissions.mockReturnValue({
-      data: {
-        shutdown_linode: true,
-        clone_linode: true,
-      },
-    });
     const { getByTestId, getByText } = renderWithTheme(
       <SelectLinodeCard
         {...defaultProps}
+        isCloneable={true}
+        isShutdownable={true}
         selected={true}
         showPowerActions={true}
       />
@@ -94,15 +86,11 @@ describe('SelectLinodeCard', () => {
   });
 
   it('displays the status and the enabled Power Off button of a linode that is selected and running when power actions should be shown, and user has shutdown_linode permission', () => {
-    queryMocks.userPermissions.mockReturnValue({
-      data: {
-        shutdown_linode: true,
-        clone_linode: true,
-      },
-    });
     const { getByLabelText, getByRole, getByText } = renderWithTheme(
       <SelectLinodeCard
         {...defaultProps}
+        isCloneable={true}
+        isShutdownable={true}
         selected={true}
         showPowerActions={true}
       />
@@ -121,6 +109,8 @@ describe('SelectLinodeCard', () => {
     const { queryByRole } = renderWithTheme(
       <SelectLinodeCard
         {...defaultProps}
+        isCloneable={true}
+        isShutdownable={true}
         selected={true}
         showPowerActions={false}
       />
@@ -132,6 +122,8 @@ describe('SelectLinodeCard', () => {
     const { getByLabelText, getByText, queryByRole } = renderWithTheme(
       <SelectLinodeCard
         {...defaultProps}
+        isCloneable={true}
+        isShutdownable={true}
         linode={mockPoweredOffLinode}
         selected={true}
         showPowerActions={true}
diff --git a/packages/manager/src/features/Linodes/LinodeCreate/shared/SelectLinodeCard.tsx b/packages/manager/src/features/Linodes/LinodeCreate/shared/SelectLinodeCard.tsx
index 216069da2e6..073547b06de 100644
--- a/packages/manager/src/features/Linodes/LinodeCreate/shared/SelectLinodeCard.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreate/shared/SelectLinodeCard.tsx
@@ -10,7 +10,6 @@ import React from 'react';
 
 import { SelectionCard } from 'src/components/SelectionCard/SelectionCard';
 import { StatusIcon } from 'src/components/StatusIcon/StatusIcon';
-import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
 
 import { getLinodeIconStatus } from '../../LinodesLanding/utils';
 
@@ -20,6 +19,8 @@ interface Props {
   disabled?: boolean;
   handlePowerOff: () => void;
   handleSelection: () => void;
+  isCloneable: boolean;
+  isShutdownable: boolean;
   linode: Linode;
   selected?: boolean;
   showPowerActions: boolean;
@@ -29,6 +30,8 @@ export const SelectLinodeCard = ({
   disabled,
   handlePowerOff,
   handleSelection,
+  isCloneable,
+  isShutdownable,
   linode,
   selected,
   showPowerActions,
@@ -45,12 +48,6 @@ export const SelectLinodeCard = ({
     Boolean(linode?.image)
   );
 
-  const { data: permissions } = usePermissions(
-    'linode',
-    ['shutdown_linode', 'clone_linode'],
-    linode.id
-  );
-
   const iconStatus = getLinodeIconStatus(linode?.status);
   const shouldShowPowerButton =
     showPowerActions && linode?.status === 'running' && selected;
@@ -79,7 +76,7 @@ export const SelectLinodeCard = ({
         {shouldShowPowerButton && (
           <Button
             buttonType="outlined"
-            disabled={!permissions.shutdown_linode}
+            disabled={!isShutdownable}
             onClick={handlePowerOff}
           >
             Power Off
@@ -92,7 +89,7 @@ export const SelectLinodeCard = ({
   return (
     <SelectionCard
       checked={selected}
-      disabled={!permissions.clone_linode || disabled}
+      disabled={!isCloneable || disabled}
       heading={linode.label}
       key={`selection-card-${linode.id}`}
       onClick={handleSelection}

From bb2a467741ad802e49aac06bb4a7f8b7f454fa26 Mon Sep 17 00:00:00 2001
From: Tanushree Bhattacharji <tbhattac@akamai.com>
Date: Wed, 3 Dec 2025 21:12:14 +0530
Subject: [PATCH 68/91] upcoming: [UIE-9564] - Implement Listener Detail -
 Nodes table (#13147)

* upcoming: [UIE-9564] - Implement Listener Detail - Nodes table.

* Added changeset: Implement Nodes table in listener detail page

* Address review comments.

* Fix unit test.
---
 ...r-13147-upcoming-features-1764592604792.md |   5 +
 .../NetworkLoadBalancersListenerDetail.tsx    |   6 +-
 .../NodesTable/NodesTable.test.tsx            | 186 +++++++++++++++
 .../NodesTable/NodesTable.tsx                 | 211 ++++++++++++++++++
 .../NodesTable/NodesTableRow.tsx              |  59 +++++
 .../NetworkLoadBalancers/constants.ts         |   8 +
 .../src/routes/networkLoadBalancer/index.ts   |  14 +-
 7 files changed, 480 insertions(+), 9 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13147-upcoming-features-1764592604792.md
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NodesTable/NodesTable.test.tsx
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NodesTable/NodesTable.tsx
 create mode 100644 packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NodesTable/NodesTableRow.tsx

diff --git a/packages/manager/.changeset/pr-13147-upcoming-features-1764592604792.md b/packages/manager/.changeset/pr-13147-upcoming-features-1764592604792.md
new file mode 100644
index 00000000000..460d9a7e704
--- /dev/null
+++ b/packages/manager/.changeset/pr-13147-upcoming-features-1764592604792.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Implement Nodes table in Network LoadBalancer Listener detail page ([#13147](https://github.com/linode/manager/pull/13147))
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetail.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetail.tsx
index 8434b1afd94..29ba10e7db6 100644
--- a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetail.tsx
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetail.tsx
@@ -10,8 +10,10 @@ import { DocumentTitleSegment } from 'src/components/DocumentTitle';
 import { EntityDetail } from 'src/components/EntityDetail/EntityDetail';
 import { LandingHeader } from 'src/components/LandingHeader';
 
+import { NLB_API_DOCS_LINK } from '../../constants';
 import { NetworkLoadBalancersListenerDetailBody } from './NetworkLoadBalancersListenerDetailBody';
 import { NetworkLoadBalancersListenerDetailHeader } from './NetworkLoadBalancersListenerDetailHeader';
+import { NodesTable } from './NodesTable/NodesTable';
 
 const NetworkLoadBalancersListenerDetail = () => {
   const { id, listenerId } = useParams({
@@ -50,12 +52,13 @@ const NetworkLoadBalancersListenerDetail = () => {
             {
               label: nlb.label,
               position: 2,
+              linkTo: '/netloadbalancers/$id/listeners',
             },
           ],
           pathname: `/netloadbalancers/${id}/listeners/${listenerId}`,
         }}
         docsLabel="Docs"
-        docsLink="https://techdocs.akamai.com/linode-api/changelog/network-load-balancers"
+        docsLink={NLB_API_DOCS_LINK}
         removeCrumbX={2}
         title={`${listener.label}`}
       />
@@ -75,6 +78,7 @@ const NetworkLoadBalancersListenerDetail = () => {
         }
         noBodyBottomBorder={true}
       />
+      <NodesTable listenerId={listener.id} nlbId={nlb.id} />
     </>
   );
 };
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NodesTable/NodesTable.test.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NodesTable/NodesTable.test.tsx
new file mode 100644
index 00000000000..e6cc6d780c6
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NodesTable/NodesTable.test.tsx
@@ -0,0 +1,186 @@
+import * as React from 'react';
+import { vi } from 'vitest';
+
+import { networkLoadBalancerNodeFactory } from 'src/factories';
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import { NodesTable } from './NodesTable';
+
+const queryMocks = vi.hoisted(() => ({
+  useNetworkLoadBalancerNodesQuery: vi.fn().mockReturnValue({}),
+  useNavigate: vi.fn(),
+  useSearch: vi.fn().mockReturnValue({ query: '' }),
+}));
+
+vi.mock('@linode/queries', async () => {
+  const actual = await vi.importActual('@linode/queries');
+  return {
+    ...actual,
+    useNetworkLoadBalancerNodesQuery:
+      queryMocks.useNetworkLoadBalancerNodesQuery,
+  };
+});
+
+vi.mock('@tanstack/react-router', async () => {
+  const actual = await vi.importActual('@tanstack/react-router');
+  return {
+    ...actual,
+    useNavigate: queryMocks.useNavigate,
+    useSearch: queryMocks.useSearch,
+  };
+});
+
+vi.mock('src/hooks/usePaginationV2', () => ({
+  usePaginationV2: () => ({
+    page: 1,
+    pageSize: 25,
+    handlePageChange: vi.fn(),
+    handlePageSizeChange: vi.fn(),
+  }),
+}));
+
+vi.mock('src/hooks/useOrderV2', () => ({
+  useOrderV2: () => ({
+    order: 'asc',
+    orderBy: 'id',
+    handleOrderChange: vi.fn(),
+  }),
+}));
+
+vi.mock('@linode/search', () => ({
+  getAPIFilterFromQuery: (query: string) => ({
+    filter: {},
+    error: null,
+  }),
+}));
+
+describe('NodesTable', () => {
+  const mockNodes = networkLoadBalancerNodeFactory.buildList(5);
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('renders a loading state', () => {
+    queryMocks.useNetworkLoadBalancerNodesQuery.mockReturnValue({
+      isLoading: true,
+    });
+
+    const { getByTestId } = renderWithTheme(
+      <NodesTable listenerId={2} nlbId={1} />
+    );
+
+    expect(getByTestId('circle-progress')).toBeVisible();
+  });
+
+  it('renders nodes table with correct columns', () => {
+    queryMocks.useNetworkLoadBalancerNodesQuery.mockReturnValue({
+      isLoading: false,
+      data: { data: mockNodes, results: 5 },
+    });
+
+    const { getByText } = renderWithTheme(
+      <NodesTable listenerId={2} nlbId={1} />
+    );
+
+    expect(getByText('Node Label')).toBeVisible();
+    expect(getByText('ID')).toBeVisible();
+    expect(getByText('Linode ID')).toBeVisible();
+    expect(getByText('VPC IPv6')).toBeVisible();
+  });
+
+  it('renders nodes count in header', () => {
+    queryMocks.useNetworkLoadBalancerNodesQuery.mockReturnValue({
+      isLoading: false,
+      data: { data: mockNodes, results: 5 },
+    });
+
+    const { getByText } = renderWithTheme(
+      <NodesTable listenerId={2} nlbId={1} />
+    );
+
+    expect(getByText(/Nodes \(5\)/)).toBeVisible();
+  });
+
+  it('renders a Nodes table', () => {
+    const nodeFactory = networkLoadBalancerNodeFactory.build({
+      id: 123,
+      linode_id: 456,
+    });
+    queryMocks.useNetworkLoadBalancerNodesQuery.mockReturnValue({
+      isLoading: false,
+      data: { data: [nodeFactory], results: 1, page: 1, page_size: 25 },
+    });
+
+    const { getByText, getByTestId, getByRole } = renderWithTheme(
+      <NodesTable listenerId={2} nlbId={1} />
+    );
+
+    const link = getByRole('link', { name: `${nodeFactory.linode_id}` });
+    expect(link).toHaveAttribute('href', `/linodes/${nodeFactory.linode_id}`);
+
+    expect(getByText('Nodes (1)')).toBeVisible();
+    expect(getByTestId(`nlb-node-row-${nodeFactory.id}`)).toBeVisible();
+    expect(getByText(nodeFactory.label)).toBeVisible();
+    expect(getByText(nodeFactory.id)).toBeVisible();
+    expect(getByText(nodeFactory.linode_id)).toBeVisible();
+  });
+
+  it('renders table rows for each node', () => {
+    queryMocks.useNetworkLoadBalancerNodesQuery.mockReturnValue({
+      isLoading: false,
+      data: { data: mockNodes, results: 5 },
+    });
+
+    const { getByText } = renderWithTheme(
+      <NodesTable listenerId={2} nlbId={1} />
+    );
+
+    mockNodes.forEach((node) => {
+      expect(getByText(node.label)).toBeVisible();
+    });
+  });
+
+  it('renders an empty Nodes table if there are no nodes', () => {
+    queryMocks.useNetworkLoadBalancerNodesQuery.mockReturnValue({
+      isLoading: false,
+      data: { data: [], results: 0 },
+    });
+
+    const { getByText } = renderWithTheme(
+      <NodesTable listenerId={2} nlbId={1} />
+    );
+
+    expect(getByText('Nodes (0)')).toBeVisible();
+    expect(getByText('No nodes are assigned to this listener')).toBeVisible();
+  });
+
+  it('renders error state when query fails', () => {
+    queryMocks.useNetworkLoadBalancerNodesQuery.mockReturnValue({
+      isLoading: false,
+      error: [{ reason: 'Failed to fetch nodes' }],
+    });
+
+    const { getByText } = renderWithTheme(
+      <NodesTable listenerId={2} nlbId={1} />
+    );
+
+    expect(getByText('Failed to fetch nodes')).toBeVisible();
+  });
+
+  it('renders search field with correct placeholder', () => {
+    queryMocks.useNetworkLoadBalancerNodesQuery.mockReturnValue({
+      isLoading: false,
+      data: { data: mockNodes, results: 5 },
+    });
+
+    const { getByPlaceholderText } = renderWithTheme(
+      <NodesTable listenerId={2} nlbId={1} />
+    );
+
+    const searchField = getByPlaceholderText(
+      'Search Node ID, Linode ID or IP address'
+    );
+    expect(searchField).toBeVisible();
+  });
+});
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NodesTable/NodesTable.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NodesTable/NodesTable.tsx
new file mode 100644
index 00000000000..e85c120b410
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NodesTable/NodesTable.tsx
@@ -0,0 +1,211 @@
+import { useNetworkLoadBalancerNodesQuery } from '@linode/queries';
+import { getAPIFilterFromQuery } from '@linode/search';
+import {
+  CircleProgress,
+  Hidden,
+  Stack,
+  Typography,
+  useTheme,
+} from '@linode/ui';
+import { useNavigate, useSearch } from '@tanstack/react-router';
+import * as React from 'react';
+
+import { DebouncedSearchTextField } from 'src/components/DebouncedSearchTextField';
+import { PaginationFooter } from 'src/components/PaginationFooter/PaginationFooter';
+import { Table } from 'src/components/Table';
+import { TableBody } from 'src/components/TableBody';
+import { TableCell } from 'src/components/TableCell';
+import { TableHead } from 'src/components/TableHead';
+import { TableRow } from 'src/components/TableRow';
+import { TableRowEmpty } from 'src/components/TableRowEmpty/TableRowEmpty';
+import { TableRowError } from 'src/components/TableRowError/TableRowError';
+import { TableSortCell } from 'src/components/TableSortCell';
+import { useOrderV2 } from 'src/hooks/useOrderV2';
+import { usePaginationV2 } from 'src/hooks/usePaginationV2';
+
+import {
+  NLB_NODES_ROUTE,
+  NLB_NODES_TABLE_DEFAULT_ORDER,
+  NLB_NODES_TABLE_DEFAULT_ORDER_BY,
+  NLB_NODES_TABLE_PREFERENCE_KEY,
+} from '../../../constants';
+import { NodesTableRow } from './NodesTableRow';
+
+interface NodesTableProps {
+  listenerId: number;
+  nlbId: number;
+}
+
+const preferenceKey = NLB_NODES_TABLE_PREFERENCE_KEY;
+
+export const NodesTable = (props: NodesTableProps) => {
+  const navigate = useNavigate();
+  const { nlbId, listenerId } = props;
+  const theme = useTheme();
+
+  const search = useSearch({
+    from: NLB_NODES_ROUTE,
+    shouldThrow: false,
+  });
+
+  const pagination = usePaginationV2({
+    currentRoute: NLB_NODES_ROUTE,
+    preferenceKey,
+    searchParams: (prev) => ({
+      ...prev,
+      query: search?.query,
+    }),
+  });
+
+  const { handleOrderChange, order, orderBy } = useOrderV2({
+    initialRoute: {
+      defaultOrder: {
+        order: NLB_NODES_TABLE_DEFAULT_ORDER,
+        orderBy: NLB_NODES_TABLE_DEFAULT_ORDER_BY,
+      },
+      from: NLB_NODES_ROUTE,
+    },
+    preferenceKey,
+  });
+
+  const { filter: searchFilter, error: searchError } = getAPIFilterFromQuery(
+    search?.query,
+    {
+      searchableFieldsWithoutOperator: ['id', 'linode_id', 'address_v6'],
+    }
+  );
+
+  const filter = {
+    ['+order']: order,
+    ['+order_by']: orderBy,
+    ...searchFilter,
+  };
+
+  const {
+    data: nodesData,
+    error,
+    isFetching,
+    isLoading,
+  } = useNetworkLoadBalancerNodesQuery(
+    nlbId,
+    listenerId,
+    {
+      page: pagination.page,
+      page_size: pagination.pageSize,
+    },
+    filter
+  );
+
+  const onSearch = (query: string) => {
+    navigate({
+      search: (prev) => ({
+        ...prev,
+        page: undefined,
+        query: query ? query : undefined,
+      }),
+      to: `/netloadbalancers/${nlbId}/listeners/${listenerId}/nodes`,
+    });
+  };
+
+  if (isLoading) {
+    return <CircleProgress />;
+  }
+
+  return (
+    <Stack>
+      <Stack
+        direction="row"
+        gap={theme.spacingFunction(20)}
+        paddingBottom={theme.spacingFunction(20)}
+        paddingTop={theme.spacingFunction(40)}
+        sx={(theme) => ({
+          [theme.breakpoints.up('lg')]: {
+            paddingLeft: 0,
+          },
+        })}
+      >
+        <Typography
+          sx={{
+            alignItems: 'center',
+            display: 'inline-flex',
+          }}
+          variant="h3"
+        >
+          Nodes ({nodesData?.results ?? 0})
+        </Typography>
+        <DebouncedSearchTextField
+          clearable
+          debounceTime={250}
+          errorText={searchError?.message}
+          hideLabel
+          isSearching={isFetching}
+          label="Search"
+          onSearch={onSearch}
+          placeholder="Search Node ID, Linode ID or IP address"
+          sx={{
+            [theme.breakpoints.up('sm')]: {
+              width: '350px',
+            },
+            width: '250px',
+          }}
+          value={search?.query ?? ''}
+        />
+      </Stack>
+      <Table aria-label="Network Load Balancer Listener Nodes">
+        <TableHead>
+          <TableRow>
+            <TableCell>Node Label</TableCell>
+            <TableSortCell
+              active={orderBy === 'id'}
+              direction={order}
+              handleClick={handleOrderChange}
+              label="id"
+            >
+              ID
+            </TableSortCell>
+            <TableSortCell
+              active={orderBy === 'linode_id'}
+              direction={order}
+              handleClick={handleOrderChange}
+              label="linode_id"
+            >
+              Linode ID
+            </TableSortCell>
+            <TableSortCell
+              active={orderBy === 'address_v6'}
+              direction={order}
+              handleClick={handleOrderChange}
+              label="address_v6"
+            >
+              VPC IPv6
+            </TableSortCell>
+            <Hidden mdDown>
+              <TableCell>Updated</TableCell>
+              <TableCell>Created</TableCell>
+            </Hidden>
+          </TableRow>
+        </TableHead>
+        <TableBody>
+          {error && <TableRowError colSpan={6} message={error[0].reason} />}
+          {nodesData?.data?.length === 0 && (
+            <TableRowEmpty
+              colSpan={6}
+              message="No nodes are assigned to this listener"
+            />
+          )}
+          {nodesData?.data?.map((node) => (
+            <NodesTableRow key={node.id} {...node} />
+          ))}
+        </TableBody>
+      </Table>
+      <PaginationFooter
+        count={nodesData?.results || 0}
+        eventCategory="Nodes Table"
+        handlePageChange={pagination.handlePageChange}
+        handleSizeChange={pagination.handlePageSizeChange}
+        page={pagination.page}
+        pageSize={pagination.pageSize}
+      />
+    </Stack>
+  );
+};
diff --git a/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NodesTable/NodesTableRow.tsx b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NodesTable/NodesTableRow.tsx
new file mode 100644
index 00000000000..0e084a3280c
--- /dev/null
+++ b/packages/manager/src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NodesTable/NodesTableRow.tsx
@@ -0,0 +1,59 @@
+import { Hidden } from '@linode/ui';
+import * as React from 'react';
+
+import { DateTimeDisplay } from 'src/components/DateTimeDisplay';
+import { Link } from 'src/components/Link';
+import { TableCell } from 'src/components/TableCell';
+import { TableRow } from 'src/components/TableRow';
+import { IPAddress } from 'src/features/Linodes/LinodesLanding/IPAddress';
+
+import type { NetworkLoadBalancerNode } from '@linode/api-v4/lib/netloadbalancers';
+
+export const NodesTableRow = (props: NetworkLoadBalancerNode) => {
+  const { id, label, linode_id, address_v6, updated, created } = props;
+
+  const [isHovered, setIsHovered] = React.useState(false);
+
+  const handleMouseEnter = React.useCallback(() => {
+    setIsHovered(true);
+  }, []);
+
+  const handleMouseLeave = React.useCallback(() => {
+    setIsHovered(false);
+  }, []);
+
+  return (
+    <TableRow
+      data-testid={`nlb-node-row-${id}`}
+      key={id}
+      onMouseEnter={handleMouseEnter}
+      onMouseLeave={handleMouseLeave}
+    >
+      <TableCell>{label}</TableCell>
+      <TableCell>{id}</TableCell>
+      <TableCell>
+        <Link
+          accessibleAriaLabel={linode_id.toString()}
+          to={`/linodes/${linode_id}`}
+        >
+          {linode_id}
+        </Link>
+      </TableCell>
+      <TableCell>
+        {address_v6 ? (
+          <IPAddress ips={[address_v6]} isHovered={isHovered} />
+        ) : (
+          'None'
+        )}
+      </TableCell>
+      <Hidden mdDown>
+        <TableCell>
+          <DateTimeDisplay value={updated} />
+        </TableCell>
+        <TableCell>
+          <DateTimeDisplay value={created} />
+        </TableCell>
+      </Hidden>
+    </TableRow>
+  );
+};
diff --git a/packages/manager/src/features/NetworkLoadBalancers/constants.ts b/packages/manager/src/features/NetworkLoadBalancers/constants.ts
index 9b28fd7ac29..6ab205f3f1c 100644
--- a/packages/manager/src/features/NetworkLoadBalancers/constants.ts
+++ b/packages/manager/src/features/NetworkLoadBalancers/constants.ts
@@ -2,3 +2,11 @@ export const MAX_PORT_DISPLAY_CHARS = 12;
 
 export const NLB_API_DOCS_LINK =
   'https://techdocs.akamai.com/linode-api/changelog/network-load-balancers';
+
+// default order constants
+export const NLB_NODES_TABLE_DEFAULT_ORDER = 'asc';
+export const NLB_NODES_TABLE_DEFAULT_ORDER_BY = 'id';
+export const NLB_NODES_TABLE_PREFERENCE_KEY = 'netloadbalancers-listener-nodes';
+
+export const NLB_NODES_ROUTE =
+  '/netloadbalancers/$id/listeners/$listenerId/nodes';
diff --git a/packages/manager/src/routes/networkLoadBalancer/index.ts b/packages/manager/src/routes/networkLoadBalancer/index.ts
index 5f5245e0207..e7e29fd4a12 100644
--- a/packages/manager/src/routes/networkLoadBalancer/index.ts
+++ b/packages/manager/src/routes/networkLoadBalancer/index.ts
@@ -1,8 +1,13 @@
 import { createRoute, redirect } from '@tanstack/react-router';
 
 import { rootRoute } from '../root';
+import { TableSearchParams } from '../types';
 import { NetworkLoadBalancersRoute } from './networkLoadBalancersRoute';
 
+export interface NodesSearchParams extends TableSearchParams {
+  query?: string;
+}
+
 const networkLoadBalancersRoute = createRoute({
   component: NetworkLoadBalancersRoute,
   getParentRoute: () => rootRoute,
@@ -19,14 +24,6 @@ const networkLoadBalancersIndexRoute = createRoute({
 );
 
 const networkLoadBalancerDetailRoute = createRoute({
-  beforeLoad: async ({ params }) => {
-    throw redirect({
-      params: {
-        id: Number(params.id),
-      },
-      to: '/netloadbalancers/$id/listeners',
-    });
-  },
   getParentRoute: () => networkLoadBalancersRoute,
   path: '$id',
 });
@@ -68,6 +65,7 @@ const networkLoadBalancerNodesRoute = createRoute({
     }),
   },
   path: '$id/listeners/$listenerId/nodes',
+  validateSearch: (search: NodesSearchParams) => search,
 }).lazy(() =>
   import(
     'src/features/NetworkLoadBalancers/NetworkLoadBalancersDetail/NetworkLoadBalancersListenerDetail/NetworkLoadBalancersListenerDetailLazyRoutes'

From 9f4a82a989e17ecb57b4b10cba6483627bcf4751 Mon Sep 17 00:00:00 2001
From: Purvesh Makode <pmakode@akamai.com>
Date: Thu, 4 Dec 2025 03:39:30 +0530
Subject: [PATCH 69/91] upcoming: [UIE-9709] - Integrate Prefix List Details
 Drawer with Edit and Add Rule Drawer (#13158)

* Update tests and fix typo

* Added changeset: Integrate Prefix List details drawer with Edit and Add Rule drawer

* Add tests for handleOpenPrefixListDrawer call on click of View Details

* Update ruleset details drawer button text from cancel to close

* Change from Link to LinkButton

* Update mock protocol
---
 ...r-13158-upcoming-features-1764752133530.md |  5 ++
 .../Rules/FirewallPrefixListDrawer.test.tsx   | 15 ++++
 .../Rules/FirewallPrefixListDrawer.tsx        |  7 ++
 .../Rules/FirewallRuleDrawer.test.tsx         |  2 +-
 .../Rules/FirewallRuleDrawer.tsx              |  7 ++
 .../Rules/FirewallRuleDrawer.types.ts         |  4 ++
 .../FirewallDetail/Rules/FirewallRuleForm.tsx |  4 +-
 .../Rules/FirewallRuleSetDetailsView.tsx      |  2 +-
 ....tsx => MultiplePrefixListSelect.test.tsx} | 69 ++++++++++++-------
 ...elect.tsx => MultiplePrefixListSelect.tsx} | 25 ++++++-
 packages/manager/src/mocks/serverHandlers.ts  |  2 +-
 11 files changed, 110 insertions(+), 32 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13158-upcoming-features-1764752133530.md
 rename packages/manager/src/features/Firewalls/FirewallDetail/Rules/{MutiplePrefixListSelect.test.tsx => MultiplePrefixListSelect.test.tsx} (85%)
 rename packages/manager/src/features/Firewalls/FirewallDetail/Rules/{MutiplePrefixListSelect.tsx => MultiplePrefixListSelect.tsx} (92%)

diff --git a/packages/manager/.changeset/pr-13158-upcoming-features-1764752133530.md b/packages/manager/.changeset/pr-13158-upcoming-features-1764752133530.md
new file mode 100644
index 00000000000..5775b0813cf
--- /dev/null
+++ b/packages/manager/.changeset/pr-13158-upcoming-features-1764752133530.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Integrate Prefix List details drawer with Edit and Add Rule drawer ([#13158](https://github.com/linode/manager/pull/13158))
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.test.tsx
index 118f52b8154..fa248f6675f 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.test.tsx
@@ -52,6 +52,12 @@ const computeExpectedElements = (
     label = 'Prefix List Name:';
   }
 
+  if (context?.type === 'rule' && context.modeViewedFrom === 'create') {
+    title = `Add an ${capitalize(category)} Rule or Rule Set`;
+    button = `Back to ${capitalize(category)} Rule`;
+    label = 'Prefix List Name:';
+  }
+
   if (context?.type === 'ruleset' && context.modeViewedFrom === 'view') {
     title = `${capitalize(category)} Rule Set details`;
     button = 'Back to the Rule Set';
@@ -98,6 +104,15 @@ describe('PrefixListDrawer', () => {
         plRuleRef: { inIPv4Rule: true, inIPv6Rule: true },
       },
     },
+    {
+      ...baseProps,
+      category: 'inbound',
+      context: {
+        type: 'rule',
+        modeViewedFrom: 'create',
+        plRuleRef: { inIPv4Rule: true, inIPv6Rule: true },
+      },
+    },
     {
       ...baseProps,
       category: 'outbound',
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx
index 37e9f464242..a1292f39f11 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx
@@ -80,6 +80,13 @@ export const FirewallPrefixListDrawer = React.memo(
         };
       }
 
+      if (type === 'rule' && modeViewedFrom === 'create') {
+        return {
+          title: `Add an ${capitalize(category)} Rule or Rule Set`,
+          backButton: `Back to ${capitalize(category)} Rule`,
+        };
+      }
+
       if (type === 'ruleset' && modeViewedFrom === 'view') {
         return {
           title: `${capitalize(category)} Rule Set details`,
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
index b4f0b216965..57b88c41801 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
@@ -267,7 +267,7 @@ describe('ViewRuleSetDetailsDrawer', () => {
       expect(getByText(`${capitalize(category)} Rules`)).toBeVisible();
 
       // Cancel button
-      expect(getByRole('button', { name: 'Cancel' })).toBeVisible();
+      expect(getByRole('button', { name: 'Close' })).toBeVisible();
     }
   );
 });
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
index 61edb9528ca..ec7d525a2f0 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
@@ -245,6 +245,13 @@ export const FirewallRuleDrawer = React.memo(
                   addressesLabel={addressesLabel}
                   category={category}
                   closeDrawer={onClose}
+                  handleOpenPrefixListDrawer={(prefixListLabel, plRuleRef) => {
+                    handleOpenPrefixListDrawer(
+                      prefixListLabel,
+                      plRuleRef,
+                      'rule'
+                    );
+                  }}
                   ips={ips}
                   mode={mode}
                   pls={pls}
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts
index f942b9af1cb..bd09e974484 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts
@@ -45,6 +45,10 @@ export interface FirewallRuleFormProps extends FormikProps<FormState> {
   addressesLabel: string;
   category: Category;
   closeDrawer: () => void;
+  handleOpenPrefixListDrawer: (
+    prefixListLabel: string,
+    plRuleRef: PrefixListRuleReference
+  ) => void;
   ips: ExtendedIP[];
   mode: FirewallRuleDrawerMode;
   pls: ExtendedPL[];
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx
index 6de74c88677..ef26ae33514 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx
@@ -24,7 +24,7 @@ import {
 import { ipFieldPlaceholder } from 'src/utilities/ipUtils';
 
 import { enforceIPMasks } from './FirewallRuleDrawer.utils';
-import { MultiplePrefixListSelect } from './MutiplePrefixListSelect';
+import { MultiplePrefixListSelect } from './MultiplePrefixListSelect';
 import { PORT_PRESETS, PORT_PRESETS_ITEMS } from './shared';
 
 import type { FirewallRuleFormProps } from './FirewallRuleDrawer.types';
@@ -45,6 +45,7 @@ export const FirewallRuleForm = React.memo((props: FirewallRuleFormProps) => {
     errors,
     handleBlur,
     handleChange,
+    handleOpenPrefixListDrawer,
     handleSubmit,
     ips,
     pls,
@@ -348,6 +349,7 @@ export const FirewallRuleForm = React.memo((props: FirewallRuleFormProps) => {
           {isFirewallRulesetsPrefixlistsFeatureEnabled && (
             <MultiplePrefixListSelect
               aria-label="Prefix List for Firewall rule"
+              handleOpenPrefixListDrawer={handleOpenPrefixListDrawer}
               onChange={handlePrefixListChange}
               pls={pls}
             />
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetDetailsView.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetDetailsView.tsx
index f7a2ff5c33f..5378e7a1386 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetDetailsView.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetDetailsView.tsx
@@ -196,7 +196,7 @@ export const FirewallRuleSetDetailsView = (
 
       <ActionsPanel
         secondaryButtonProps={{
-          label: 'Cancel',
+          label: 'Close',
           onClick: closeDrawer,
         }}
       />
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MutiplePrefixListSelect.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MultiplePrefixListSelect.test.tsx
similarity index 85%
rename from packages/manager/src/features/Firewalls/FirewallDetail/Rules/MutiplePrefixListSelect.test.tsx
rename to packages/manager/src/features/Firewalls/FirewallDetail/Rules/MultiplePrefixListSelect.test.tsx
index 8df198514e4..91c29ef660d 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MutiplePrefixListSelect.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MultiplePrefixListSelect.test.tsx
@@ -5,7 +5,7 @@ import React from 'react';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import * as shared from '../../shared';
-import { MultiplePrefixListSelect } from './MutiplePrefixListSelect';
+import { MultiplePrefixListSelect } from './MultiplePrefixListSelect';
 
 const queryMocks = vi.hoisted(() => ({
   useAllFirewallPrefixListsQuery: vi.fn().mockReturnValue({}),
@@ -31,7 +31,10 @@ describe('MultiplePrefixListSelect', () => {
     });
   });
 
-  const onChange = vi.fn();
+  const baseProps = {
+    handleOpenPrefixListDrawer: vi.fn(),
+    onChange: vi.fn(),
+  };
 
   const mockPrefixLists = [
     {
@@ -62,7 +65,7 @@ describe('MultiplePrefixListSelect', () => {
   it('should render the title only when at least one PL row is added', () => {
     const { getByText } = renderWithTheme(
       <MultiplePrefixListSelect
-        onChange={vi.fn()}
+        {...baseProps}
         pls={[{ address: '', inIPv4Rule: false, inIPv6Rule: false }]}
       />
     );
@@ -71,24 +74,23 @@ describe('MultiplePrefixListSelect', () => {
 
   it('should not render the title when no PL row is added', () => {
     const { queryByText } = renderWithTheme(
-      <MultiplePrefixListSelect onChange={vi.fn()} pls={[]} />
+      <MultiplePrefixListSelect {...baseProps} pls={[]} />
     );
     expect(queryByText('Prefix List')).not.toBeInTheDocument();
   });
 
   it('should add a new PL row (empty state) when clicking "Add a Prefix List"', async () => {
     const { getByText } = renderWithTheme(
-      <MultiplePrefixListSelect onChange={onChange} pls={[]} />
+      <MultiplePrefixListSelect {...baseProps} pls={[]} />
     );
 
     await userEvent.click(getByText('Add a Prefix List'));
-    expect(onChange).toHaveBeenCalledWith([
+    expect(baseProps.onChange).toHaveBeenCalledWith([
       { address: '', inIPv4Rule: false, inIPv6Rule: false },
     ]);
   });
 
   it('should remove a PL row when clicking delete (X)', async () => {
-    const onChange = vi.fn();
     const pls = [
       {
         address: 'pl::supports-both',
@@ -97,17 +99,17 @@ describe('MultiplePrefixListSelect', () => {
       },
     ];
     const { getByTestId } = renderWithTheme(
-      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+      <MultiplePrefixListSelect {...baseProps} pls={pls} />
     );
 
     await userEvent.click(getByTestId('delete-pl-0'));
-    expect(onChange).toHaveBeenCalledWith([]);
+    expect(baseProps.onChange).toHaveBeenCalledWith([]);
   });
 
   it('filters out unsupported PLs from dropdown', async () => {
     const pls = [{ address: '', inIPv4Rule: false, inIPv6Rule: false }];
     const { getByRole, queryByText } = renderWithTheme(
-      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+      <MultiplePrefixListSelect {...baseProps} pls={pls} />
     );
 
     const input = getByRole('combobox');
@@ -131,7 +133,7 @@ describe('MultiplePrefixListSelect', () => {
       { address: '', inIPv4Rule: false, inIPv6Rule: false },
     ];
     const { getAllByRole, findByText } = renderWithTheme(
-      <MultiplePrefixListSelect onChange={onChange} pls={selectedPLs} />
+      <MultiplePrefixListSelect {...baseProps} pls={selectedPLs} />
     );
 
     const inputs = getAllByRole('combobox');
@@ -166,7 +168,7 @@ describe('MultiplePrefixListSelect', () => {
       },
     ];
     const { getByDisplayValue, queryAllByTestId } = renderWithTheme(
-      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+      <MultiplePrefixListSelect {...baseProps} pls={pls} />
     );
 
     expect(queryAllByTestId('prefixlist-select')).toHaveLength(3);
@@ -178,7 +180,7 @@ describe('MultiplePrefixListSelect', () => {
   it('defaults to IPv4 selected and IPv6 unselected when choosing a PL that supports both', async () => {
     const pls = [{ address: '', inIPv4Rule: false, inIPv6Rule: false }];
     const { findByText, getByRole } = renderWithTheme(
-      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+      <MultiplePrefixListSelect {...baseProps} pls={pls} />
     );
 
     const input = getByRole('combobox');
@@ -190,7 +192,7 @@ describe('MultiplePrefixListSelect', () => {
     const option = await findByText('pl::supports-both');
     await userEvent.click(option);
 
-    expect(onChange).toHaveBeenCalledWith([
+    expect(baseProps.onChange).toHaveBeenCalledWith([
       {
         address: 'pl::supports-both',
         inIPv4Rule: true,
@@ -202,7 +204,7 @@ describe('MultiplePrefixListSelect', () => {
   it('defaults to IPv4 selected and IPv6 unselected when choosing a PL that supports only IPv4', async () => {
     const pls = [{ address: '', inIPv4Rule: false, inIPv6Rule: false }];
     const { findByText, getByRole } = renderWithTheme(
-      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+      <MultiplePrefixListSelect {...baseProps} pls={pls} />
     );
 
     const input = getByRole('combobox');
@@ -214,7 +216,7 @@ describe('MultiplePrefixListSelect', () => {
     const option = await findByText('pl:system:supports-only-ipv4');
     await userEvent.click(option);
 
-    expect(onChange).toHaveBeenCalledWith([
+    expect(baseProps.onChange).toHaveBeenCalledWith([
       {
         address: 'pl:system:supports-only-ipv4',
         inIPv4Rule: true,
@@ -226,7 +228,7 @@ describe('MultiplePrefixListSelect', () => {
   it('defaults to IPv4 unselected and IPv6 selected when choosing a PL that supports only IPv6', async () => {
     const pls = [{ address: '', inIPv4Rule: false, inIPv6Rule: false }];
     const { findByText, getByRole } = renderWithTheme(
-      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+      <MultiplePrefixListSelect {...baseProps} pls={pls} />
     );
 
     const input = getByRole('combobox');
@@ -238,7 +240,7 @@ describe('MultiplePrefixListSelect', () => {
     const option = await findByText('pl::supports-only-ipv6');
     await userEvent.click(option);
 
-    expect(onChange).toHaveBeenCalledWith([
+    expect(baseProps.onChange).toHaveBeenCalledWith([
       {
         address: 'pl::supports-only-ipv6',
         inIPv4Rule: false,
@@ -252,7 +254,7 @@ describe('MultiplePrefixListSelect', () => {
       { address: 'pl::supports-both', inIPv4Rule: true, inIPv6Rule: false },
     ];
     const { findByTestId } = renderWithTheme(
-      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+      <MultiplePrefixListSelect {...baseProps} pls={pls} />
     );
 
     const ipv4CheckboxWrapper = await findByTestId('ipv4-checkbox-0');
@@ -275,7 +277,7 @@ describe('MultiplePrefixListSelect', () => {
       { address: 'pl::supports-both', inIPv4Rule: false, inIPv6Rule: true },
     ];
     const { findByTestId } = renderWithTheme(
-      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+      <MultiplePrefixListSelect {...baseProps} pls={pls} />
     );
 
     const ipv4CheckboxWrapper = await findByTestId('ipv4-checkbox-0');
@@ -298,7 +300,7 @@ describe('MultiplePrefixListSelect', () => {
       { address: 'pl::supports-both', inIPv4Rule: true, inIPv6Rule: true },
     ];
     const { findByTestId } = renderWithTheme(
-      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+      <MultiplePrefixListSelect {...baseProps} pls={pls} />
     );
 
     const ipv4CheckboxWrapper = await findByTestId('ipv4-checkbox-0');
@@ -325,7 +327,7 @@ describe('MultiplePrefixListSelect', () => {
       },
     ];
     const { findByTestId } = renderWithTheme(
-      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+      <MultiplePrefixListSelect {...baseProps} pls={pls} />
     );
 
     const ipv4CheckboxWrapper = await findByTestId('ipv4-checkbox-0');
@@ -352,7 +354,7 @@ describe('MultiplePrefixListSelect', () => {
       },
     ];
     const { findByTestId } = renderWithTheme(
-      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+      <MultiplePrefixListSelect {...baseProps} pls={pls} />
     );
 
     const ipv4CheckboxWrapper = await findByTestId('ipv4-checkbox-0');
@@ -376,14 +378,31 @@ describe('MultiplePrefixListSelect', () => {
       { address: 'pl::supports-both', inIPv4Rule: true, inIPv6Rule: false },
     ];
     const { findByTestId } = renderWithTheme(
-      <MultiplePrefixListSelect onChange={onChange} pls={pls} />
+      <MultiplePrefixListSelect {...baseProps} pls={pls} />
     );
 
     const ipv6Checkbox = await findByTestId('ipv6-checkbox-0');
     await userEvent.click(ipv6Checkbox);
 
-    expect(onChange).toHaveBeenCalledWith([
+    expect(baseProps.onChange).toHaveBeenCalledWith([
       { address: 'pl::supports-both', inIPv4Rule: true, inIPv6Rule: true },
     ]);
   });
+
+  it('calls handleOpenPrefixListDrawer with correct arguments when clicking "View Details"', async () => {
+    const pls = [
+      { address: 'pl::supports-both', inIPv4Rule: true, inIPv6Rule: false },
+    ];
+
+    const { getByText } = renderWithTheme(
+      <MultiplePrefixListSelect {...baseProps} pls={pls} />
+    );
+
+    await userEvent.click(getByText('View Details'));
+
+    expect(baseProps.handleOpenPrefixListDrawer).toHaveBeenCalledWith(
+      'pl::supports-both',
+      { inIPv4Rule: true, inIPv6Rule: false }
+    );
+  });
 });
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MutiplePrefixListSelect.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MultiplePrefixListSelect.tsx
similarity index 92%
rename from packages/manager/src/features/Firewalls/FirewallDetail/Rules/MutiplePrefixListSelect.tsx
rename to packages/manager/src/features/Firewalls/FirewallDetail/Rules/MultiplePrefixListSelect.tsx
index b956e1c4075..91525de7216 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MutiplePrefixListSelect.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MultiplePrefixListSelect.tsx
@@ -8,19 +8,20 @@ import {
   CloseIcon,
   IconButton,
   InputLabel,
+  LinkButton,
   Stack,
 } from '@linode/ui';
 import Grid from '@mui/material/Grid';
 import * as React from 'react';
 import { makeStyles } from 'tss-react/mui';
 
-import { Link } from 'src/components/Link';
 import { useIsFirewallRulesetsPrefixlistsEnabled } from 'src/features/Firewalls/shared';
 
 import { getPrefixListType, groupPriority } from './shared';
 
 import type { FirewallPrefixList } from '@linode/api-v4';
 import type { Theme } from '@mui/material/styles';
+import type { PrefixListRuleReference } from 'src/features/Firewalls/shared';
 import type { ExtendedPL } from 'src/utilities/ipUtils';
 
 const useStyles = makeStyles()((theme: Theme) => ({
@@ -88,6 +89,14 @@ export interface MultiplePrefixListSelectProps {
    */
   disabled?: boolean;
 
+  /**
+   * Opens the Prefix List details drawer for the given Prefix List.
+   */
+  handleOpenPrefixListDrawer: (
+    prefixListLabel: string,
+    plRuleRef: PrefixListRuleReference
+  ) => void;
+
   /**
    * Callback triggered when PLs change, passing updated `pls`.
    */
@@ -106,7 +115,8 @@ export interface MultiplePrefixListSelectProps {
 
 export const MultiplePrefixListSelect = React.memo(
   (props: MultiplePrefixListSelectProps) => {
-    const { className, disabled, pls, onChange } = props;
+    const { className, disabled, handleOpenPrefixListDrawer, onChange, pls } =
+      props;
     const { classes, cx } = useStyles();
     const {
       isFirewallRulesetsPrefixlistsFeatureEnabled,
@@ -276,7 +286,16 @@ export const MultiplePrefixListSelect = React.memo(
                   />
                 </Box>
                 <Box alignItems="center" display="flex">
-                  <Link onClick={() => {}}>View Details</Link>
+                  <LinkButton
+                    onClick={() => {
+                      handleOpenPrefixListDrawer(thisPL.address, {
+                        inIPv4Rule: thisPL.inIPv4Rule,
+                        inIPv6Rule: thisPL.inIPv6Rule,
+                      });
+                    }}
+                  >
+                    View Details
+                  </LinkButton>
                 </Box>
               </Box>
             )}
diff --git a/packages/manager/src/mocks/serverHandlers.ts b/packages/manager/src/mocks/serverHandlers.ts
index 86110139cd0..03479d934b8 100644
--- a/packages/manager/src/mocks/serverHandlers.ts
+++ b/packages/manager/src/mocks/serverHandlers.ts
@@ -1486,7 +1486,7 @@ export const handlers = [
                     ],
                   },
                   ports: '22, 53, 80, 100, 443, 3306',
-                  protocol: 'IPENCAP',
+                  protocol: 'UDP',
                   action: 'ACCEPT',
                 }),
               ],

From df8ff8f5b229031ec6eb00749c27845feeec7b40 Mon Sep 17 00:00:00 2001
From: grevanak-akamai <145482092+grevanak-akamai@users.noreply.github.com>
Date: Thu, 4 Dec 2025 11:57:23 +0530
Subject: [PATCH 70/91] Tech story: [UIE-8943] - Replace dropdowns in Database
 cluster settings page with CDS select web component (#13057)

---
 .../pr-13057-changed-1762343659819.md         |   5 +
 packages/manager/package.json                 |   2 +-
 .../DatabaseSettings/MaintenanceWindow.tsx    | 178 ++++++++++--------
 pnpm-lock.yaml                                |  18 +-
 4 files changed, 114 insertions(+), 89 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13057-changed-1762343659819.md

diff --git a/packages/manager/.changeset/pr-13057-changed-1762343659819.md b/packages/manager/.changeset/pr-13057-changed-1762343659819.md
new file mode 100644
index 00000000000..e50a5c0e329
--- /dev/null
+++ b/packages/manager/.changeset/pr-13057-changed-1762343659819.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Tech Stories
+---
+
+DBaaS: Replace the dropdowns in Database cluster settings page with CDS select web component ([#13057](https://github.com/linode/manager/pull/13057))
diff --git a/packages/manager/package.json b/packages/manager/package.json
index e67df571e5f..7a78fd09062 100644
--- a/packages/manager/package.json
+++ b/packages/manager/package.json
@@ -45,7 +45,7 @@
     "@tanstack/react-query-devtools": "5.51.24",
     "@tanstack/react-router": "^1.111.11",
     "@xterm/xterm": "^5.5.0",
-    "akamai-cds-react-components": "0.0.1-alpha.15",
+    "akamai-cds-react-components": "0.0.1-alpha.18",
     "algoliasearch": "^4.14.3",
     "axios": "~1.12.0",
     "braintree-web": "^3.92.2",
diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/MaintenanceWindow.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/MaintenanceWindow.tsx
index 880d90e4152..9b7048eb6dc 100644
--- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/MaintenanceWindow.tsx
+++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/MaintenanceWindow.tsx
@@ -2,8 +2,10 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { useDatabaseMutation } from '@linode/queries';
 import {
   Autocomplete,
+  Box,
   FormControl,
   FormControlLabel,
+  InputLabel,
   Notice,
   Radio,
   RadioGroup,
@@ -13,7 +15,7 @@ import {
 } from '@linode/ui';
 import { updateMaintenanceSchema } from '@linode/validation';
 import { styled } from '@mui/material/styles';
-import { Button } from 'akamai-cds-react-components';
+import { Button, Select } from 'akamai-cds-react-components';
 import { DateTime } from 'luxon';
 import { useSnackbar } from 'notistack';
 import * as React from 'react';
@@ -157,89 +159,107 @@ export const MaintenanceWindow = (props: Props) => {
                 <Controller
                   control={control}
                   name="day_of_week"
-                  render={({ field, fieldState }) => (
-                    <Autocomplete
-                      autoHighlight
-                      disableClearable
-                      disabled={disabled}
-                      errorText={fieldState.error?.message}
-                      isOptionEqualToValue={(option, value) =>
-                        option.value === value.value
-                      }
-                      label="Day of Week"
-                      noMarginTop
-                      onChange={(_, day) => {
-                        field.onChange(day.value);
-                        weekSelectionModifier(day.label, weekSelectionMap);
-                      }}
-                      options={daySelectionMap}
-                      placeholder="Choose a day"
-                      renderOption={(props, option) => (
-                        <li {...props}>{option.label}</li>
-                      )}
-                      textFieldProps={{
-                        dataAttrs: {
-                          'data-qa-weekday-select': true,
-                        },
-                      }}
-                      value={daySelectionMap.find(
-                        (thisOption) => thisOption.value === dayOfWeek
-                      )}
-                    />
+                  render={({ field }) => (
+                    <Box>
+                      <InputLabel
+                        data-qa-dropdown-label="day-of-week-select"
+                        data-qa-textfield-label="Day of Week"
+                        sx={{
+                          marginBottom: '8px',
+                          transform: 'none',
+                        }}
+                      >
+                        Day of Week
+                      </InputLabel>
+                      <Box
+                        data-qa-autocomplete="Day of Week"
+                        sx={{ width: '125px' }}
+                      >
+                        <Select
+                          autocomplete
+                          id="dayOfWeek"
+                          items={daySelectionMap}
+                          onChange={(e: CustomEvent) => {
+                            const day: { label: string; value: number } =
+                              e.detail;
+                            field.onChange(day.value);
+                            weekSelectionModifier(day.label, weekSelectionMap);
+                          }}
+                          placeholder="Choose a day"
+                          selected={daySelectionMap.find(
+                            (thisOption) => thisOption.value === dayOfWeek
+                          )}
+                          valueFn={(day: { label: string; value: number }) =>
+                            `${day.label}`
+                          }
+                        />
+                      </Box>
+                    </Box>
                   )}
                 />
               </FormControl>
               <FormControl>
-                <div style={{ alignItems: 'center', display: 'flex' }}>
-                  <Controller
-                    control={control}
-                    name="hour_of_day"
-                    render={({ field, fieldState }) => (
-                      <Autocomplete
-                        autoHighlight
-                        defaultValue={hourSelectionMap.find(
-                          (option) => option.value === 20
-                        )}
-                        disableClearable
-                        disabled={disabled}
-                        errorText={fieldState.error?.message}
-                        label="Time"
-                        noMarginTop
-                        onChange={(_, hour) => {
-                          field.onChange(hour?.value);
-                        }}
-                        options={hourSelectionMap}
-                        placeholder="Choose a time"
-                        renderOption={(props, option) => (
-                          <li {...props}>{option.label}</li>
-                        )}
-                        textFieldProps={{
-                          dataAttrs: {
-                            'data-qa-time-select': true,
-                          },
+                <Controller
+                  control={control}
+                  name="hour_of_day"
+                  render={({ field }) => (
+                    <Box data-qa-autocomplete="Time">
+                      <Box>
+                        <InputLabel
+                          data-qa-dropdown-label="time-select"
+                          data-qa-textfield-label="Time"
+                          htmlFor="time"
+                          sx={{
+                            marginBottom: '8px',
+                            transform: 'none',
+                          }}
+                        >
+                          Time
+                        </InputLabel>
+                      </Box>
+                      <Box
+                        sx={{
+                          display: 'flex',
                         }}
-                        value={hourSelectionMap.find(
-                          (thisOption) => thisOption.value === hourOfDay
-                        )}
-                      />
-                    )}
-                  />
-                  <TooltipIcon
-                    status="info"
-                    sxTooltipIcon={{
-                      marginTop: '1.75rem',
-                      padding: '0px 8px',
-                    }}
-                    text={
-                      <Typography>
-                        UTC is {utcOffsetText(utcOffsetInHours)} hours compared
-                        to your local timezone. Click{' '}
-                        <Link to="/profile/display">here</Link> to view or
-                        change your timezone settings.
-                      </Typography>
-                    }
-                  />
-                </div>
+                      >
+                        <Box sx={{ width: '120px' }}>
+                          <Select
+                            autocomplete
+                            disabled={disabled}
+                            id="time"
+                            items={hourSelectionMap}
+                            onChange={(e: CustomEvent) => {
+                              const hour: { label: string; value: number } =
+                                e.detail;
+                              field.onChange(hour?.value);
+                            }}
+                            placeholder="Choose a time"
+                            selected={hourSelectionMap.find(
+                              (thisOption) => thisOption.value === hourOfDay
+                            )}
+                            valueFn={(time: { label: string }) =>
+                              `${time.label}`
+                            }
+                          />
+                        </Box>
+                        <TooltipIcon
+                          status="info"
+                          sxTooltipIcon={{
+                            padding: '0px 8px',
+                          }}
+                          text={
+                            <Typography>
+                              UTC is {utcOffsetText(utcOffsetInHours)} hours
+                              compared to your local timezone. Click{' '}
+                              <Link to="/profile/display">here</Link> to view or
+                              change your timezone settings.
+                            </Typography>
+                          }
+                        />
+                      </Box>
+                    </Box>
+                  )}
+                />
               </FormControl>
             </Stack>
             {isLegacy && (
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2002db8f2e2..4e6b138ab76 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -215,8 +215,8 @@ importers:
         specifier: ^5.5.0
         version: 5.5.0
       akamai-cds-react-components:
-        specifier: 0.0.1-alpha.15
-        version: 0.0.1-alpha.15(@linode/design-language-system@5.0.0)(@types/react@19.1.6)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
+        specifier: 0.0.1-alpha.18
+        version: 0.0.1-alpha.18(@linode/design-language-system@5.0.0)(@types/react@19.1.6)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
       algoliasearch:
         specifier: ^4.14.3
         version: 4.24.0
@@ -2990,14 +2990,14 @@ packages:
   ajv@6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
 
-  akamai-cds-react-components@0.0.1-alpha.15:
-    resolution: {integrity: sha512-uJZLFjzxlV/hmGYiziIa7F6m55qSG0KMela7TLFbx+V1OFeAy71ULOGpOXGo9sU38GbUr8w4xw5YxLEcJPyRoA==}
+  akamai-cds-react-components@0.0.1-alpha.18:
+    resolution: {integrity: sha512-vSwKqxsolHewLqjLZgX6eCMb/Dwfdm1V1Ql258BJtvm32h8YN2HcAiQf6RdCzKP+09S8dlEQMmUhSgKmBugz0Q==}
     peerDependencies:
       react: ^18.0.0
       react-dom: ^18.0.0
 
-  akamai-cds-web-components@0.0.1-alpha.15:
-    resolution: {integrity: sha512-Hb4P7tyqq7iE3lg/kSD1++jGuj9aFxbhcZ9MaQ9nWgFLbjm46EI0QQzALNUdXjwlaK5x+/uUri8IHveyiGzgtA==}
+  akamai-cds-web-components@0.0.1-alpha.18:
+    resolution: {integrity: sha512-VCUItyxy9eTe98HzZ9tZvZHi/13iKuHj7eSqujOm2WumaHM4qiUKcgF2EuR2SrtjTgq7xUe3U15DEfMWrHjpuw==}
     peerDependencies:
       '@linode/design-language-system': ^4.0.0
 
@@ -8736,17 +8736,17 @@ snapshots:
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
 
-  akamai-cds-react-components@0.0.1-alpha.15(@linode/design-language-system@5.0.0)(@types/react@19.1.6)(react-dom@19.1.0(react@19.1.0))(react@19.1.0):
+  akamai-cds-react-components@0.0.1-alpha.18(@linode/design-language-system@5.0.0)(@types/react@19.1.6)(react-dom@19.1.0(react@19.1.0))(react@19.1.0):
     dependencies:
       '@lit/react': 1.0.8(@types/react@19.1.6)
-      akamai-cds-web-components: 0.0.1-alpha.15(@linode/design-language-system@5.0.0)
+      akamai-cds-web-components: 0.0.1-alpha.18(@linode/design-language-system@5.0.0)
       react: 19.1.0
       react-dom: 19.1.0(react@19.1.0)
     transitivePeerDependencies:
       - '@linode/design-language-system'
       - '@types/react'
 
-  akamai-cds-web-components@0.0.1-alpha.15(@linode/design-language-system@5.0.0):
+  akamai-cds-web-components@0.0.1-alpha.18(@linode/design-language-system@5.0.0):
     dependencies:
       '@linode/design-language-system': 5.0.0
       lit: 3.3.1

From 5ea7b896eeb5514ca3d80e0b6fc4f2bedb9ed60c Mon Sep 17 00:00:00 2001
From: Alban Bailly <130582365+abailly-akamai@users.noreply.github.com>
Date: Thu, 4 Dec 2025 10:56:37 +0100
Subject: [PATCH 71/91] fix: [UIE-9737] - IAM Permissions performance
 improvements: Firewall entity assignment (#13153)

* Permission model switch

* Added changeset: IAM Permissions performance improvements: Firewall entity assignment
---
 .../pr-13153-fixed-1764672225221.md           |  5 +++
 .../Devices/FirewallDeviceActionMenu.tsx      | 45 +++++++------------
 .../Devices/FirewallDeviceRow.test.tsx        | 30 +++++++------
 .../Devices/FirewallDeviceTable.tsx           | 41 ++++++++++++++++-
 4 files changed, 76 insertions(+), 45 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13153-fixed-1764672225221.md

diff --git a/packages/manager/.changeset/pr-13153-fixed-1764672225221.md b/packages/manager/.changeset/pr-13153-fixed-1764672225221.md
new file mode 100644
index 00000000000..a3fcbd7ffb7
--- /dev/null
+++ b/packages/manager/.changeset/pr-13153-fixed-1764672225221.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+IAM Permissions performance improvements: Firewall entity assignment ([#13153](https://github.com/linode/manager/pull/13153))
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceActionMenu.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceActionMenu.tsx
index 5cccbf61343..33cef97f1f4 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceActionMenu.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceActionMenu.tsx
@@ -6,48 +6,31 @@ export interface ActionHandlers {
   handleRemoveDevice: (device: FirewallDevice) => void;
 }
 
-import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
-
 import type { FirewallDevice } from '@linode/api-v4';
 
 export interface FirewallDeviceActionMenuProps extends ActionHandlers {
   device: FirewallDevice;
   disabled: boolean;
+  isLinodeUpdatable: boolean;
+  isNodebalancerUpdatable: boolean;
+  isPermissionsLoading: boolean;
 }
 
 export const FirewallDeviceActionMenu = React.memo(
   (props: FirewallDeviceActionMenuProps) => {
-    const { device, disabled, handleRemoveDevice } = props;
+    const {
+      device,
+      disabled,
+      handleRemoveDevice,
+      isLinodeUpdatable,
+      isNodebalancerUpdatable,
+      isPermissionsLoading,
+    } = props;
 
     const { type } = device.entity;
 
-    const { data: linodePermissions, isLoading: isLinodePermissionsLoading } =
-      usePermissions(
-        'linode',
-        ['update_linode'],
-        device?.entity.id,
-        type !== 'nodebalancer'
-      );
-
-    const {
-      data: nodebalancerPermissions,
-      isLoading: isNodebalancerPermissionsLoading,
-    } = usePermissions(
-      'nodebalancer',
-      ['update_nodebalancer'],
-      device?.entity.id,
-      type === 'nodebalancer'
-    );
-
     const disabledDueToPermissions =
-      type === 'nodebalancer'
-        ? !nodebalancerPermissions?.update_nodebalancer
-        : !linodePermissions?.update_linode;
-
-    const isPermissionsLoading =
-      type === 'nodebalancer'
-        ? isNodebalancerPermissionsLoading
-        : isLinodePermissionsLoading;
+      type === 'nodebalancer' ? !isNodebalancerUpdatable : !isLinodeUpdatable;
 
     return (
       <InlineMenuAction
@@ -59,7 +42,9 @@ export const FirewallDeviceActionMenu = React.memo(
         tooltip={
           disabledDueToPermissions
             ? `You do not have permission to modify this ${type === 'nodebalancer' ? 'NodeBalancer' : 'Linode'}.`
-            : undefined
+            : disabled
+              ? 'You do not have permission to remove the device from this firewall.'
+              : undefined
         }
       />
     );
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceRow.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceRow.test.tsx
index 8bdf964c135..5f521cd2182 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceRow.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceRow.test.tsx
@@ -2,7 +2,6 @@ import userEvent from '@testing-library/user-event';
 import * as React from 'react';
 
 import { accountFactory, firewallDeviceFactory } from 'src/factories';
-import { http, HttpResponse, server } from 'src/mocks/testServer';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { FirewallDeviceRow } from './FirewallDeviceRow';
@@ -10,22 +9,25 @@ import { FirewallDeviceRow } from './FirewallDeviceRow';
 import type { FirewallDeviceEntityType } from '@linode/api-v4';
 
 const queryMocks = vi.hoisted(() => ({
-  userPermissions: vi.fn(() => ({
-    data: {
-      update_linode: true,
-    },
-  })),
+  useAccount: vi.fn().mockReturnValue({}),
 }));
 
-vi.mock('src/features/IAM/hooks/usePermissions', () => ({
-  usePermissions: queryMocks.userPermissions,
-}));
+vi.mock('@linode/queries', async () => {
+  const actual = await vi.importActual('@linode/queries');
+  return {
+    ...actual,
+    useAccount: queryMocks.useAccount,
+  };
+});
 
 const props = {
   device: firewallDeviceFactory.build(),
   disabled: false,
   handleRemoveDevice: vi.fn(),
   isLinodeRelatedDevice: true,
+  isLinodeUpdatable: true,
+  isNodebalancerUpdatable: true,
+  isPermissionsLoading: false,
 };
 
 const INTERFACE_TEXT = 'Configuration Profile Interface';
@@ -36,11 +38,11 @@ describe('FirewallDeviceRow', () => {
       capabilities: ['Linode Interfaces'],
     });
 
-    server.use(
-      http.get('*/v4*/account', () => {
-        return HttpResponse.json(account);
-      })
-    );
+    queryMocks.useAccount.mockReturnValue({
+      data: account,
+      isLoading: false,
+      error: null,
+    });
 
     const { getAllByRole, getByText, findByText } = renderWithTheme(
       <FirewallDeviceRow {...props} />,
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceTable.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceTable.tsx
index ff0e392f369..ac68229bf9d 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceTable.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceTable.tsx
@@ -9,6 +9,7 @@ import { TableContentWrapper } from 'src/components/TableContentWrapper/TableCon
 import { TableHead } from 'src/components/TableHead';
 import { TableRow } from 'src/components/TableRow';
 import { TableSortCell } from 'src/components/TableSortCell';
+import { useGetAllUserEntitiesByPermission } from 'src/features/IAM/hooks/useGetAllUserEntitiesByPermission';
 import { useOrderV2 } from 'src/hooks/useOrderV2';
 import { usePaginationV2 } from 'src/hooks/usePaginationV2';
 import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
@@ -47,6 +48,26 @@ export const FirewallDeviceTable = React.memo(
       isLoading,
     } = useAllFirewallDevicesQuery(firewallId);
 
+    const {
+      data: updatableLinodes = [],
+      isLoading: isLinodePermissionsLoading,
+      error: linodePermissionsError,
+    } = useGetAllUserEntitiesByPermission({
+      entityType: 'linode',
+      permission: 'update_linode',
+      enabled: type === 'linode',
+    });
+
+    const {
+      data: updatableNodebalancers = [],
+      isLoading: isNodebalancerPermissionsLoading,
+      error: nodebalancerPermissionsError,
+    } = useGetAllUserEntitiesByPermission({
+      entityType: 'nodebalancer',
+      permission: 'update_nodebalancer',
+      enabled: type === 'nodebalancer',
+    });
+
     const devices =
       allDevices?.filter((device) =>
         type === 'linode' && isLinodeInterfacesEnabled
@@ -82,12 +103,20 @@ export const FirewallDeviceTable = React.memo(
 
     const isLinodeRelatedDevice = type === 'linode';
 
+    const permissionsError =
+      linodePermissionsError || nodebalancerPermissionsError;
+
     const _error = error
       ? getAPIErrorOrDefault(
           error,
           `Unable to retrieve ${formattedTypes[deviceType]}s`
         )
-      : undefined;
+      : permissionsError
+        ? getAPIErrorOrDefault(
+            permissionsError,
+            `Unable to retrieve ${formattedTypes[deviceType]}s`
+          )
+        : undefined;
 
     const ariaLabel = `List of ${formattedTypes[deviceType]}s attached to this firewall`;
 
@@ -152,6 +181,16 @@ export const FirewallDeviceTable = React.memo(
                   disabled={disabled}
                   handleRemoveDevice={handleRemoveDevice}
                   isLinodeRelatedDevice={isLinodeRelatedDevice}
+                  isLinodeUpdatable={updatableLinodes?.some(
+                    (linode) => linode.id === thisDevice.entity.id
+                  )}
+                  isNodebalancerUpdatable={updatableNodebalancers?.some(
+                    (nodebalancer) => nodebalancer.id === thisDevice.entity.id
+                  )}
+                  isPermissionsLoading={
+                    isLinodePermissionsLoading ||
+                    isNodebalancerPermissionsLoading
+                  }
                   key={`device-row-${thisDevice.id}`}
                 />
               ))}

From bbddca59d5ceb6fbf02cad3294fd3a47fb55aaea Mon Sep 17 00:00:00 2001
From: Alban Bailly <130582365+abailly-akamai@users.noreply.github.com>
Date: Thu, 4 Dec 2025 13:37:29 +0100
Subject: [PATCH 72/91] fix: [UIE-9733] - Performance improvement in IAM users
 pages (#13159)

* Save progress

* Save progress

* Same for AssignedEntitiesTable

* Abstraction through common hook

* test

* test fixes

* moar test fixes (mocking)

* Cleanup & comments

* small fix

* Added changeset: Performance improvement in IAM users pages
---
 packages/api-v4/src/entities/types.ts         |   4 +-
 packages/api-v4/src/iam/iam.ts                |  27 ++
 packages/api-v4/src/iam/types.ts              |   6 +-
 .../pr-13159-fixed-1764841164025.md           |   5 +
 .../AssignedEntitiesTable.test.tsx            |  35 +-
 .../AssignedEntitiesTable.tsx                 |  27 +-
 .../AssignedRolesTable.test.tsx               |  39 +-
 .../AssignedRolesTable/AssignedRolesTable.tsx |  17 +-
 .../IAM/Shared/AssignedRolesTable/utils.ts    |   9 +-
 .../src/features/IAM/Shared/Entities/utils.ts |   2 +-
 .../manager/src/features/IAM/Shared/types.ts  |   9 +-
 .../src/features/IAM/Shared/utilities.ts      |   7 +-
 .../Users/UserEntities/UserEntities.test.tsx  |  18 +-
 .../features/IAM/Users/UserEntities/utils.ts  |   2 +-
 .../IAM/Users/UserRoles/UserRoles.test.tsx    |  33 +-
 .../IAM/hooks/useGetUserEntities.test.ts      | 407 ++++++++++++++++++
 .../features/IAM/hooks/useGetUserEntities.ts  |  58 +++
 packages/queries/src/iam/keys.ts              |  16 +
 18 files changed, 596 insertions(+), 125 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13159-fixed-1764841164025.md
 create mode 100644 packages/manager/src/features/IAM/hooks/useGetUserEntities.test.ts
 create mode 100644 packages/manager/src/features/IAM/hooks/useGetUserEntities.ts

diff --git a/packages/api-v4/src/entities/types.ts b/packages/api-v4/src/entities/types.ts
index 6e2cf38a61d..d78671c8b03 100644
--- a/packages/api-v4/src/entities/types.ts
+++ b/packages/api-v4/src/entities/types.ts
@@ -12,8 +12,10 @@ export type EntityType =
   | 'volume'
   | 'vpc';
 
+export type EntityId = number | string;
+
 export interface AccountEntity {
-  id: number;
+  id: EntityId;
   label: string;
   type: EntityType;
 }
diff --git a/packages/api-v4/src/iam/iam.ts b/packages/api-v4/src/iam/iam.ts
index 006f634b428..17686bb58a6 100644
--- a/packages/api-v4/src/iam/iam.ts
+++ b/packages/api-v4/src/iam/iam.ts
@@ -142,3 +142,30 @@ export const getUserEntitiesByPermission = ({
     setParams(params),
     setXFilter(filter),
   );
+
+/**
+ * getUserEntities
+ *
+ * Returns the available entities for a given user.
+ * It is using the getUserEntitiesByPermission method, but without the permission parameter.
+ * This is used to get all entities for a given user, per entity type.
+ */
+export interface GetUserEntitiesParams {
+  entityType: EntityType;
+  filter?: Filter;
+  params?: Params;
+  username: string;
+}
+
+export const getUserEntities = ({
+  username,
+  entityType,
+  params,
+  filter,
+}: GetUserEntitiesParams) =>
+  Request<ResourcePage<EntityByPermission>>(
+    setURL(`${BETA_API_ROOT}/iam/users/${username}/entities/${entityType}`),
+    setMethod('GET'),
+    setParams(params),
+    setXFilter(filter),
+  );
diff --git a/packages/api-v4/src/iam/types.ts b/packages/api-v4/src/iam/types.ts
index 3ffeaa29952..dea764e8ffd 100644
--- a/packages/api-v4/src/iam/types.ts
+++ b/packages/api-v4/src/iam/types.ts
@@ -1,4 +1,4 @@
-import type { EntityType } from '../entities/types';
+import type { EntityId, EntityType } from '../entities/types';
 
 export type AccountType = 'account';
 
@@ -436,7 +436,7 @@ export interface IamUserRoles {
 }
 
 export interface EntityAccess {
-  id: number;
+  id: EntityId;
   roles: EntityRoleType[];
   type: AccessType;
 }
@@ -457,7 +457,7 @@ export interface Roles {
   permissions: PermissionType[];
 }
 export interface EntityByPermission {
-  id: number | string;
+  id: EntityId;
   label: string;
   type: EntityType;
 }
diff --git a/packages/manager/.changeset/pr-13159-fixed-1764841164025.md b/packages/manager/.changeset/pr-13159-fixed-1764841164025.md
new file mode 100644
index 00000000000..cdeab9ae276
--- /dev/null
+++ b/packages/manager/.changeset/pr-13159-fixed-1764841164025.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+Performance improvement in IAM users pages ([#13159](https://github.com/linode/manager/pull/13159))
diff --git a/packages/manager/src/features/IAM/Shared/AssignedEntitiesTable/AssignedEntitiesTable.test.tsx b/packages/manager/src/features/IAM/Shared/AssignedEntitiesTable/AssignedEntitiesTable.test.tsx
index 46ee9ab8a92..14294dce2d4 100644
--- a/packages/manager/src/features/IAM/Shared/AssignedEntitiesTable/AssignedEntitiesTable.test.tsx
+++ b/packages/manager/src/features/IAM/Shared/AssignedEntitiesTable/AssignedEntitiesTable.test.tsx
@@ -9,27 +9,23 @@ import { renderWithTheme } from 'src/utilities/testHelpers';
 import { AssignedEntitiesTable } from '../../Shared/AssignedEntitiesTable/AssignedEntitiesTable';
 
 const queryMocks = vi.hoisted(() => ({
-  useAllAccountEntities: vi.fn().mockReturnValue({}),
   useParams: vi.fn().mockReturnValue({}),
   useSearch: vi.fn().mockReturnValue({}),
   useUserRoles: vi.fn().mockReturnValue({}),
+  useGetUserEntities: vi.fn().mockReturnValue({}),
 }));
 
 vi.mock('@linode/queries', async () => {
-  const actual = await vi.importActual<any>('@linode/queries');
+  const actual = await vi.importActual('@linode/queries');
   return {
     ...actual,
     useUserRoles: queryMocks.useUserRoles,
   };
 });
 
-vi.mock('src/queries/entities/entities', async () => {
-  const actual = await vi.importActual('src/queries/entities/entities');
-  return {
-    ...actual,
-    useAllAccountEntities: queryMocks.useAllAccountEntities,
-  };
-});
+vi.mock('../../hooks/useGetUserEntities', () => ({
+  useGetUserEntities: queryMocks.useGetUserEntities,
+}));
 
 vi.mock('@tanstack/react-router', async () => {
   const actual = await vi.importActual('@tanstack/react-router');
@@ -56,6 +52,11 @@ describe('AssignedEntitiesTable', () => {
     queryMocks.useSearch.mockReturnValue({
       query: '',
     });
+    queryMocks.useGetUserEntities.mockReturnValue({
+      userEntities: mockEntities,
+      isLoading: false,
+      error: null,
+    });
   });
 
   it('should display no roles text if there are no roles assigned to user', async () => {
@@ -73,10 +74,6 @@ describe('AssignedEntitiesTable', () => {
       data: userRolesFactory.build(),
     });
 
-    queryMocks.useAllAccountEntities.mockReturnValue({
-      data: mockEntities,
-    });
-
     renderWithTheme(<AssignedEntitiesTable />);
 
     expect(screen.getByText('no_devices')).toBeVisible();
@@ -98,10 +95,6 @@ describe('AssignedEntitiesTable', () => {
       data: userRolesFactory.build(),
     });
 
-    queryMocks.useAllAccountEntities.mockReturnValue({
-      data: mockEntities,
-    });
-
     renderWithTheme(<AssignedEntitiesTable />);
 
     const searchInput = screen.getByPlaceholderText('Search');
@@ -117,10 +110,6 @@ describe('AssignedEntitiesTable', () => {
       data: userRolesFactory.build(),
     });
 
-    queryMocks.useAllAccountEntities.mockReturnValue({
-      data: mockEntities,
-    });
-
     renderWithTheme(<AssignedEntitiesTable />);
 
     const searchInput = screen.getByPlaceholderText('Search');
@@ -136,10 +125,6 @@ describe('AssignedEntitiesTable', () => {
       data: userRolesFactory.build(),
     });
 
-    queryMocks.useAllAccountEntities.mockReturnValue({
-      data: mockEntities,
-    });
-
     renderWithTheme(<AssignedEntitiesTable />);
 
     const autocomplete = screen.getByPlaceholderText('All Entities');
diff --git a/packages/manager/src/features/IAM/Shared/AssignedEntitiesTable/AssignedEntitiesTable.tsx b/packages/manager/src/features/IAM/Shared/AssignedEntitiesTable/AssignedEntitiesTable.tsx
index 0ffe95c13b5..e4e97d7d188 100644
--- a/packages/manager/src/features/IAM/Shared/AssignedEntitiesTable/AssignedEntitiesTable.tsx
+++ b/packages/manager/src/features/IAM/Shared/AssignedEntitiesTable/AssignedEntitiesTable.tsx
@@ -21,9 +21,9 @@ import { TableRowError } from 'src/components/TableRowError/TableRowError';
 import { TableRowLoading } from 'src/components/TableRowLoading/TableRowLoading';
 import { TableSortCell } from 'src/components/TableSortCell';
 import { usePaginationV2 } from 'src/hooks/usePaginationV2';
-import { useAllAccountEntities } from 'src/queries/entities/entities';
 
 import { useIsDefaultDelegationRolesForChildAccount } from '../../hooks/useDelegationRole';
+import { useGetUserEntities } from '../../hooks/useGetUserEntities';
 import { usePermissions } from '../../hooks/usePermissions';
 import {
   addEntityNamesToRoles,
@@ -102,12 +102,6 @@ export const AssignedEntitiesTable = ({ username }: Props) => {
     React.useState<boolean>(false);
   const [selectedRole, setSelectedRole] = React.useState<EntitiesRole>();
 
-  const {
-    data: entities,
-    error: entitiesError,
-    isLoading: entitiesLoading,
-  } = useAllAccountEntities({});
-
   const {
     data: assignedUserRoles,
     error: assignedUserRolesError,
@@ -138,11 +132,20 @@ export const AssignedEntitiesTable = ({ username }: Props) => {
     ? permissions?.update_default_delegate_access
     : permissions?.is_account_admin;
 
+  const {
+    userEntities,
+    isLoading: entitiesLoading,
+    error: entitiesError,
+  } = useGetUserEntities({
+    username: username ?? '',
+    userRoles: assignedRoles,
+  });
+
   const { filterableOptions, roles } = React.useMemo(() => {
-    if (!assignedRoles || !entities) {
+    if (!assignedRoles || !userEntities) {
       return { filterableOptions: [], roles: [] };
     }
-    const transformedEntities = groupAccountEntitiesByType(entities);
+    const transformedEntities = groupAccountEntitiesByType(userEntities);
 
     const roles = addEntityNamesToRoles(assignedRoles, transformedEntities);
 
@@ -152,7 +155,7 @@ export const AssignedEntitiesTable = ({ username }: Props) => {
     ];
 
     return { filterableOptions, roles };
-  }, [assignedRoles, entities]);
+  }, [assignedRoles, userEntities]);
 
   const handleChangeRole = (role: EntitiesRole, mode: DrawerModes) => {
     setIsChangeRoleForEntityDrawerOpen(true);
@@ -211,11 +214,11 @@ export const AssignedEntitiesTable = ({ username }: Props) => {
       );
     }
 
-    if (!entities || !assignedRoles || filteredRoles.length === 0) {
+    if (!userEntities || !assignedRoles || filteredRoles.length === 0) {
       return <TableRowEmpty colSpan={3} message={'No items to display.'} />;
     }
 
-    if (assignedRoles && entities) {
+    if (assignedRoles && userEntities) {
       return (
         <>
           {filteredAndSortedRoles
diff --git a/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.test.tsx b/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.test.tsx
index 1bf10ef230e..f5667ce8bc5 100644
--- a/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.test.tsx
+++ b/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.test.tsx
@@ -10,7 +10,6 @@ import { renderWithTheme } from 'src/utilities/testHelpers';
 import { AssignedRolesTable } from './AssignedRolesTable';
 
 const queryMocks = vi.hoisted(() => ({
-  useAllAccountEntities: vi.fn().mockReturnValue({}),
   useParams: vi.fn().mockReturnValue({}),
   useAccountRoles: vi.fn().mockReturnValue({}),
   useUserRoles: vi.fn().mockReturnValue({}),
@@ -18,6 +17,7 @@ const queryMocks = vi.hoisted(() => ({
   useIsDefaultDelegationRolesForChildAccount: vi.fn().mockReturnValue({
     isDefaultDelegationRolesForChildAccount: false,
   }),
+  useGetUserEntities: vi.fn().mockReturnValue({}),
 }));
 
 vi.mock('@linode/queries', async () => {
@@ -31,14 +31,6 @@ vi.mock('@linode/queries', async () => {
   };
 });
 
-vi.mock('src/queries/entities/entities', async () => {
-  const actual = await vi.importActual('src/queries/entities/entities');
-  return {
-    ...actual,
-    useAllAccountEntities: queryMocks.useAllAccountEntities,
-  };
-});
-
 vi.mock('@tanstack/react-router', async () => {
   const actual = await vi.importActual('@tanstack/react-router');
   return {
@@ -52,6 +44,10 @@ vi.mock('../../hooks/useDelegationRole', () => ({
     queryMocks.useIsDefaultDelegationRolesForChildAccount,
 }));
 
+vi.mock('../../hooks/useGetUserEntities', () => ({
+  useGetUserEntities: queryMocks.useGetUserEntities,
+}));
+
 const mockEntities = [
   accountEntityFactory.build({
     id: 7,
@@ -72,6 +68,11 @@ describe('AssignedRolesTable', () => {
     queryMocks.useParams.mockReturnValue({
       username: 'test_user',
     });
+    queryMocks.useGetUserEntities.mockReturnValue({
+      userEntities: mockEntities,
+      isLoading: false,
+      error: null,
+    });
   });
 
   it('should display no roles text if there are no roles assigned to user', async () => {
@@ -93,10 +94,6 @@ describe('AssignedRolesTable', () => {
       data: mockAccountRoles,
     });
 
-    queryMocks.useAllAccountEntities.mockReturnValue({
-      data: mockEntities,
-    });
-
     renderWithTheme(<AssignedRolesTable />);
 
     expect(screen.getByText('account_linode_admin')).toBeVisible();
@@ -121,10 +118,6 @@ describe('AssignedRolesTable', () => {
       data: mockAccountRoles,
     });
 
-    queryMocks.useAllAccountEntities.mockReturnValue({
-      data: mockEntities,
-    });
-
     renderWithTheme(<AssignedRolesTable />);
 
     const searchInput = screen.getByPlaceholderText('Search');
@@ -144,10 +137,6 @@ describe('AssignedRolesTable', () => {
       data: mockAccountRoles,
     });
 
-    queryMocks.useAllAccountEntities.mockReturnValue({
-      data: mockEntities,
-    });
-
     renderWithTheme(<AssignedRolesTable />);
 
     const searchInput = screen.getByPlaceholderText('Search');
@@ -167,10 +156,6 @@ describe('AssignedRolesTable', () => {
       data: mockAccountRoles,
     });
 
-    queryMocks.useAllAccountEntities.mockReturnValue({
-      data: mockEntities,
-    });
-
     renderWithTheme(<AssignedRolesTable />);
 
     const autocomplete = screen.getByPlaceholderText('All Assigned Roles');
@@ -194,10 +179,6 @@ describe('AssignedRolesTable', () => {
       data: mockAccountRoles,
     });
 
-    queryMocks.useAllAccountEntities.mockReturnValue({
-      data: mockEntities,
-    });
-
     renderWithTheme(<AssignedRolesTable />);
 
     expect(screen.getByText('Add New Default Roles')).toBeVisible();
diff --git a/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.tsx b/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.tsx
index 82da1535714..2706249e462 100644
--- a/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.tsx
+++ b/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.tsx
@@ -19,9 +19,9 @@ import { TableRow } from 'src/components/TableRow';
 import { TableRowEmpty } from 'src/components/TableRowEmpty/TableRowEmpty';
 import { TableSortCell } from 'src/components/TableSortCell/TableSortCell';
 import { usePaginationV2 } from 'src/hooks/usePaginationV2';
-import { useAllAccountEntities } from 'src/queries/entities/entities';
 
 import { useIsDefaultDelegationRolesForChildAccount } from '../../hooks/useDelegationRole';
+import { useGetUserEntities } from '../../hooks/useGetUserEntities';
 import { usePermissions } from '../../hooks/usePermissions';
 import { AssignedEntities } from '../../Users/UserRoles/AssignedEntities';
 import { AssignNewRoleDrawer } from '../../Users/UserRoles/AssignNewRoleDrawer';
@@ -168,9 +168,11 @@ export const AssignedRolesTable = () => {
 
   const { data: accountRoles, isLoading: accountPermissionsLoading } =
     useAccountRoles();
-  const { data: entities, isLoading: entitiesLoading } = useAllAccountEntities(
-    {}
-  );
+
+  const { userEntities, isLoading: entitiesLoading } = useGetUserEntities({
+    username: username ?? '',
+    userRoles: assignedRoles,
+  });
 
   const { filterableOptions, roles } = React.useMemo(() => {
     if (!assignedRoles || !accountRoles) {
@@ -185,14 +187,13 @@ export const AssignedRolesTable = () => {
       ...mapEntityTypesForSelect(roles, ' Roles'),
     ];
 
-    if (entities) {
-      const transformedEntities = groupAccountEntitiesByType(entities);
-
+    if (userEntities) {
+      const transformedEntities = groupAccountEntitiesByType(userEntities);
       roles = addEntitiesNamesToRoles(roles, transformedEntities);
     }
 
     return { filterableOptions, roles };
-  }, [assignedRoles, accountRoles, entities]);
+  }, [assignedRoles, accountRoles, userEntities]);
 
   const [query, setQuery] = React.useState('');
 
diff --git a/packages/manager/src/features/IAM/Shared/AssignedRolesTable/utils.ts b/packages/manager/src/features/IAM/Shared/AssignedRolesTable/utils.ts
index d3533a80438..5923d610e6e 100644
--- a/packages/manager/src/features/IAM/Shared/AssignedRolesTable/utils.ts
+++ b/packages/manager/src/features/IAM/Shared/AssignedRolesTable/utils.ts
@@ -4,6 +4,7 @@ import type { ExtendedRoleView, RoleView } from '../types';
 import type {
   AccountEntity,
   AccountRoleType,
+  EntityId,
   EntityRoleType,
   EntityType,
   IamAccountRoles,
@@ -11,7 +12,7 @@ import type {
 } from '@linode/api-v4';
 
 export interface CombinedRoles {
-  id: null | number[];
+  id: EntityId[] | null;
   name: AccountRoleType | EntityRoleType;
 }
 
@@ -71,7 +72,7 @@ export const addEntitiesNamesToRoles = (
  */
 export const combineRoles = (data: IamUserRoles): CombinedRoles[] => {
   const combinedRoles: CombinedRoles[] = [];
-  const roleMap: Map<AccountRoleType | EntityRoleType, null | number[]> =
+  const roleMap: Map<AccountRoleType | EntityRoleType, EntityId[] | null> =
     new Map();
 
   // Add account access roles with resource_id set to null
@@ -83,7 +84,7 @@ export const combineRoles = (data: IamUserRoles): CombinedRoles[] => {
 
   // Add resource access roles with their respective resource_id
   data.entity_access.forEach(
-    (resource: { id: number; roles: EntityRoleType[] }) => {
+    (resource: { id: EntityId; roles: EntityRoleType[] }) => {
       resource.roles?.forEach((role: EntityRoleType) => {
         if (roleMap.has(role)) {
           const existingResourceIds = roleMap.get(role);
@@ -114,7 +115,7 @@ export const mapRolesToPermissions = (
 ): RoleView[] => {
   const allRoles = mapAccountPermissionsToRoles(accountPermissions);
 
-  const userRolesLookup = new Map<string, null | number[]>();
+  const userRolesLookup = new Map<string, EntityId[] | null>();
   userRoles.forEach(({ id, name }) => {
     userRolesLookup.set(name, id);
   });
diff --git a/packages/manager/src/features/IAM/Shared/Entities/utils.ts b/packages/manager/src/features/IAM/Shared/Entities/utils.ts
index aab965e3fd6..4891e977074 100644
--- a/packages/manager/src/features/IAM/Shared/Entities/utils.ts
+++ b/packages/manager/src/features/IAM/Shared/Entities/utils.ts
@@ -55,7 +55,7 @@ export const getPlaceholder = (
 };
 
 export const mapEntitiesToOptions = (
-  entities: { id: number; label: string }[]
+  entities: Pick<AccountEntity, 'id' | 'label'>[]
 ): EntitiesOption[] => {
   return entities.map((entity) => ({
     label: entity.label,
diff --git a/packages/manager/src/features/IAM/Shared/types.ts b/packages/manager/src/features/IAM/Shared/types.ts
index 7c2305a4abd..0877cab424d 100644
--- a/packages/manager/src/features/IAM/Shared/types.ts
+++ b/packages/manager/src/features/IAM/Shared/types.ts
@@ -1,6 +1,7 @@
 import type {
   AccessType,
   AccountRoleType,
+  EntityId,
   EntityRoleType,
   IamAccessType,
   PermissionType,
@@ -8,13 +9,13 @@ import type {
 
 export interface EntitiesOption {
   label: string;
-  value: number;
+  value: EntityId;
 }
 
 export interface RoleView {
   access: 'account_access' | 'entity_access';
   description: string;
-  entity_ids: null | number[];
+  entity_ids: EntityId[] | null;
   entity_type: AccessType;
   id: AccountRoleType | EntityRoleType;
   name: AccountRoleType | EntityRoleType;
@@ -26,7 +27,7 @@ export interface ExtendedRoleView extends RoleView {
 
 export interface EntitiesRole {
   access: IamAccessType;
-  entity_id: number;
+  entity_id: EntityId;
   entity_name: string;
   entity_type: AccessType;
   id: string;
@@ -34,7 +35,7 @@ export interface EntitiesRole {
 }
 
 export interface CombinedEntity {
-  id: number;
+  id: EntityId;
   name: string;
 }
 
diff --git a/packages/manager/src/features/IAM/Shared/utilities.ts b/packages/manager/src/features/IAM/Shared/utilities.ts
index 91a1b4cadbc..77f6e7b2b3a 100644
--- a/packages/manager/src/features/IAM/Shared/utilities.ts
+++ b/packages/manager/src/features/IAM/Shared/utilities.ts
@@ -19,6 +19,7 @@ import type {
   AccountRoleType,
   APIError,
   EntityAccess,
+  EntityId,
   EntityRoleType,
   EntityType,
   IamAccess,
@@ -324,7 +325,7 @@ export const groupAccountEntitiesByType = (
 
 export const changeRoleForEntity = (
   entityRoles: EntityAccess[],
-  entityId: number,
+  entityId: EntityId,
   entityType: AccessType,
   initialRole: EntityRoleType,
   newRole: EntityRoleType
@@ -349,7 +350,7 @@ export const changeRoleForEntity = (
 
 export const toEntityAccess = (
   entityRoles: EntityAccess[],
-  entityIds: number[],
+  entityIds: EntityId[],
   roleName: EntityRoleType,
   roleType: AccessType
 ): EntityAccess[] => {
@@ -391,7 +392,7 @@ export const toEntityAccess = (
 export const deleteUserEntity = (
   entityRoles: EntityAccess[],
   roleName: EntityRoleType,
-  entityId: number,
+  entityId: EntityId,
   entityType: AccessType
 ): EntityAccess[] => {
   return entityRoles
diff --git a/packages/manager/src/features/IAM/Users/UserEntities/UserEntities.test.tsx b/packages/manager/src/features/IAM/Users/UserEntities/UserEntities.test.tsx
index 1858996f4ea..7250ecf2ebf 100644
--- a/packages/manager/src/features/IAM/Users/UserEntities/UserEntities.test.tsx
+++ b/packages/manager/src/features/IAM/Users/UserEntities/UserEntities.test.tsx
@@ -22,12 +22,12 @@ const mockEntities = [
 ];
 
 const queryMocks = vi.hoisted(() => ({
-  useAllAccountEntities: vi.fn().mockReturnValue({}),
   useParams: vi.fn().mockReturnValue({}),
   useSearch: vi.fn().mockReturnValue({}),
   useAccountRoles: vi.fn().mockReturnValue({}),
   useUserRoles: vi.fn().mockReturnValue({}),
   usePermissions: vi.fn().mockReturnValue({}),
+  useGetUserEntities: vi.fn().mockReturnValue({}),
 }));
 
 vi.mock('@linode/queries', async () => {
@@ -39,13 +39,9 @@ vi.mock('@linode/queries', async () => {
   };
 });
 
-vi.mock('src/queries/entities/entities', async () => {
-  const actual = await vi.importActual('src/queries/entities/entities');
-  return {
-    ...actual,
-    useAllAccountEntities: queryMocks.useAllAccountEntities,
-  };
-});
+vi.mock('../../hooks/useGetUserEntities', () => ({
+  useGetUserEntities: queryMocks.useGetUserEntities,
+}));
 
 vi.mock('@tanstack/react-router', async () => {
   const actual = await vi.importActual('@tanstack/react-router');
@@ -120,8 +116,10 @@ describe('UserEntities', () => {
       data: accountRolesFactory.build(),
     });
 
-    queryMocks.useAllAccountEntities.mockReturnValue({
-      data: mockEntities,
+    queryMocks.useGetUserEntities.mockReturnValue({
+      userEntities: mockEntities,
+      isLoading: false,
+      error: null,
     });
 
     renderWithTheme(<UserEntities />);
diff --git a/packages/manager/src/features/IAM/Users/UserEntities/utils.ts b/packages/manager/src/features/IAM/Users/UserEntities/utils.ts
index 32bd33907b5..e13d899ceca 100644
--- a/packages/manager/src/features/IAM/Users/UserEntities/utils.ts
+++ b/packages/manager/src/features/IAM/Users/UserEntities/utils.ts
@@ -11,7 +11,7 @@ export const addEntityNamesToRoles = (
   assignedRoles: IamUserRoles,
   entities: Map<EntityType, Pick<AccountEntity, 'id' | 'label'>[]>
 ): EntitiesRole[] => {
-  const entitiesRoles = assignedRoles.entity_access;
+  const entitiesRoles = assignedRoles.entity_access ?? [];
 
   return entitiesRoles.flatMap((entityRole: EntityAccess) => {
     const entityByType = entities.get(entityRole.type as EntityType);
diff --git a/packages/manager/src/features/IAM/Users/UserRoles/UserRoles.test.tsx b/packages/manager/src/features/IAM/Users/UserRoles/UserRoles.test.tsx
index 3565e7d17c2..d4b76f90c1b 100644
--- a/packages/manager/src/features/IAM/Users/UserRoles/UserRoles.test.tsx
+++ b/packages/manager/src/features/IAM/Users/UserRoles/UserRoles.test.tsx
@@ -21,12 +21,12 @@ const mockEntities = [
 ];
 
 const queryMocks = vi.hoisted(() => ({
-  useAllAccountEntities: vi.fn().mockReturnValue({}),
   useParams: vi.fn().mockReturnValue({}),
   useSearch: vi.fn().mockReturnValue({}),
   useAccountRoles: vi.fn().mockReturnValue({}),
   useUserRoles: vi.fn().mockReturnValue({}),
   usePermissions: vi.fn().mockReturnValue({}),
+  useGetUserEntities: vi.fn().mockReturnValue({}),
 }));
 
 vi.mock('@linode/queries', async () => {
@@ -38,13 +38,9 @@ vi.mock('@linode/queries', async () => {
   };
 });
 
-vi.mock('src/queries/entities/entities', async () => {
-  const actual = await vi.importActual('src/queries/entities/entities');
-  return {
-    ...actual,
-    useAllAccountEntities: queryMocks.useAllAccountEntities,
-  };
-});
+vi.mock('../../hooks/useGetUserEntities', () => ({
+  useGetUserEntities: queryMocks.useGetUserEntities,
+}));
 
 vi.mock('@tanstack/react-router', async () => {
   const actual = await vi.importActual('@tanstack/react-router');
@@ -76,6 +72,11 @@ describe('UserRoles', () => {
         is_account_admin: true,
       },
     });
+    queryMocks.useGetUserEntities.mockReturnValue({
+      userEntities: mockEntities,
+      isLoading: false,
+      error: null,
+    });
   });
 
   it('should display no roles text if no roles are assigned to user', async () => {
@@ -107,10 +108,6 @@ describe('UserRoles', () => {
       data: accountRolesFactory.build(),
     });
 
-    queryMocks.useAllAccountEntities.mockReturnValue({
-      data: mockEntities,
-    });
-
     renderWithTheme(<UserRoles />);
 
     expect(
@@ -139,10 +136,6 @@ describe('UserRoles', () => {
       data: accountRolesFactory.build(),
     });
 
-    queryMocks.useAllAccountEntities.mockReturnValue({
-      data: mockEntities,
-    });
-
     renderWithTheme(<UserRoles />);
 
     expect(screen.getByText('firewall_admin')).toBeVisible();
@@ -166,10 +159,6 @@ describe('UserRoles', () => {
       data: accountRolesFactory.build(),
     });
 
-    queryMocks.useAllAccountEntities.mockReturnValue({
-      data: mockEntities,
-    });
-
     renderWithTheme(<UserRoles />);
 
     expect(screen.getByText('account_admin')).toBeVisible();
@@ -184,10 +173,6 @@ describe('UserRoles', () => {
       data: accountRolesFactory.build(),
     });
 
-    queryMocks.useAllAccountEntities.mockReturnValue({
-      data: mockEntities,
-    });
-
     renderWithTheme(<UserRoles />);
 
     expect(screen.getByText('account_linode_admin')).toBeVisible();
diff --git a/packages/manager/src/features/IAM/hooks/useGetUserEntities.test.ts b/packages/manager/src/features/IAM/hooks/useGetUserEntities.test.ts
new file mode 100644
index 00000000000..d7856365247
--- /dev/null
+++ b/packages/manager/src/features/IAM/hooks/useGetUserEntities.test.ts
@@ -0,0 +1,407 @@
+import { renderHook } from '@testing-library/react';
+
+import { wrapWithTheme } from 'src/utilities/testHelpers';
+
+import { useGetUserEntities } from './useGetUserEntities';
+
+import type {
+  EntityAccess,
+  EntityByPermission,
+  EntityType,
+  IamUserRoles,
+} from '@linode/api-v4';
+
+const queryMocks = vi.hoisted(() => ({
+  useQueries: vi.fn().mockReturnValue({}),
+}));
+
+const iamQueriesMock = vi.hoisted(() => ({
+  user: vi.fn().mockReturnValue({}),
+}));
+
+vi.mock('@linode/queries', async () => {
+  const actual = await vi.importActual('@linode/queries');
+  return {
+    ...actual,
+    iamQueries: iamQueriesMock,
+    useQueries: queryMocks.useQueries,
+  };
+});
+
+describe('useGetUserEntities', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+
+    iamQueriesMock.user.mockReturnValue({
+      _ctx: {
+        allUserEntities: vi.fn().mockReturnValue({
+          queryKey: ['user-entities'],
+          queryFn: vi.fn(),
+        }),
+      },
+    });
+  });
+
+  const createMockUserRoles = (
+    entityAccess: Array<{ id: number | string; roles: string[]; type: string }>
+  ): IamUserRoles => ({
+    account_access: [],
+    entity_access: entityAccess as EntityAccess[],
+  });
+
+  const createMockEntities = (
+    entities: Array<{ id: number | string; label: string; type: string }>
+  ): EntityByPermission[] =>
+    entities.map((e) => ({
+      id: e.id,
+      label: e.label,
+      type: e.type as EntityType,
+    }));
+
+  it('should return undefined entities when userRoles is undefined', () => {
+    queryMocks.useQueries.mockReturnValue([]);
+
+    const { result } = renderHook(
+      () =>
+        useGetUserEntities({
+          username: 'test-user',
+          userRoles: undefined,
+        }),
+      {
+        wrapper: (ui) => wrapWithTheme(ui),
+      }
+    );
+
+    expect(result.current.userEntities).toEqual([]);
+    expect(result.current.isLoading).toBe(false);
+  });
+
+  it('should fetch entities for all entity types in userRoles', () => {
+    const mockUserRoles = createMockUserRoles([
+      { id: 1, type: 'linode', roles: ['linode_admin'] },
+      { id: 2, type: 'volume', roles: ['volume_viewer'] },
+      { id: 3, type: 'firewall', roles: ['firewall_editor'] },
+    ]);
+
+    queryMocks.useQueries.mockReturnValue([
+      { data: [], isLoading: false, error: null },
+      { data: [], isLoading: false, error: null },
+      { data: [], isLoading: false, error: null },
+    ]);
+
+    renderHook(
+      () =>
+        useGetUserEntities({
+          username: 'test-user',
+          userRoles: mockUserRoles,
+        }),
+      {
+        wrapper: (ui) => wrapWithTheme(ui),
+      }
+    );
+
+    // Verify useQueries was called with correct configuration
+    expect(queryMocks.useQueries).toHaveBeenCalledWith(
+      expect.objectContaining({
+        queries: expect.arrayContaining([
+          expect.objectContaining({
+            enabled: true,
+            staleTime: 1 * 60 * 1000, // 1 minute
+          }),
+        ]),
+      })
+    );
+  });
+
+  it('should combine entities from multiple entity types', async () => {
+    const mockUserRoles = createMockUserRoles([
+      { id: 123, type: 'linode', roles: ['linode_admin'] },
+      { id: 456, type: 'volume', roles: ['volume_viewer'] },
+    ]);
+
+    const linodeEntities = createMockEntities([
+      { id: 123, label: 'my-linode-1', type: 'linode' },
+      { id: 124, label: 'my-linode-2', type: 'linode' },
+    ]);
+
+    const volumeEntities = createMockEntities([
+      { id: 456, label: 'my-volume-1', type: 'volume' },
+    ]);
+
+    queryMocks.useQueries.mockReturnValue([
+      { data: linodeEntities, isLoading: false, error: null },
+      { data: volumeEntities, isLoading: false, error: null },
+    ]);
+
+    const { result } = renderHook(
+      () =>
+        useGetUserEntities({
+          username: 'test-user',
+          userRoles: mockUserRoles,
+        }),
+      {
+        wrapper: (ui) => wrapWithTheme(ui),
+      }
+    );
+
+    expect(result.current.userEntities).toHaveLength(3);
+    expect(result.current.userEntities).toEqual([
+      ...linodeEntities,
+      ...volumeEntities,
+    ]);
+    expect(result.current.isLoading).toBe(false);
+  });
+
+  it('should handle loading state correctly', () => {
+    const mockUserRoles = createMockUserRoles([
+      { id: 1, type: 'linode', roles: ['linode_admin'] },
+    ]);
+
+    queryMocks.useQueries.mockReturnValue([
+      { data: undefined, isLoading: true, error: null },
+    ]);
+
+    const { result } = renderHook(
+      () =>
+        useGetUserEntities({
+          username: 'test-user',
+          userRoles: mockUserRoles,
+        }),
+      {
+        wrapper: (ui) => wrapWithTheme(ui),
+      }
+    );
+
+    expect(result.current.isLoading).toBe(true);
+    expect(result.current.userEntities).toBeUndefined();
+  });
+
+  it('should handle error state correctly', () => {
+    const mockUserRoles = createMockUserRoles([
+      { id: 1, type: 'linode', roles: ['linode_admin'] },
+    ]);
+
+    const mockError = new Error('Failed to fetch');
+    queryMocks.useQueries.mockReturnValue([
+      { data: undefined, isLoading: false, error: mockError },
+    ]);
+
+    const { result } = renderHook(
+      () =>
+        useGetUserEntities({
+          username: 'test-user',
+          userRoles: mockUserRoles,
+        }),
+      {
+        wrapper: (ui) => wrapWithTheme(ui),
+      }
+    );
+
+    expect(result.current.error).toBe(true);
+    expect(result.current.isLoading).toBe(false);
+  });
+
+  it('should handle mixed numeric and string entity IDs (for images)', async () => {
+    const mockUserRoles = createMockUserRoles([
+      { id: 123, type: 'linode', roles: ['linode_admin'] },
+      { id: 'private/456', type: 'image', roles: ['image_viewer'] },
+    ]);
+
+    const mixedEntities = [
+      createMockEntities([{ id: 123, label: 'my-linode', type: 'linode' }]),
+      createMockEntities([
+        { id: 'private/456', label: 'my-image', type: 'image' },
+      ]),
+    ];
+
+    queryMocks.useQueries.mockReturnValue([
+      { data: mixedEntities[0], isLoading: false, error: null },
+      { data: mixedEntities[1], isLoading: false, error: null },
+    ]);
+
+    const { result } = renderHook(
+      () =>
+        useGetUserEntities({
+          username: 'test-user',
+          userRoles: mockUserRoles,
+        }),
+      {
+        wrapper: (ui) => wrapWithTheme(ui),
+      }
+    );
+
+    expect(result.current.userEntities).toHaveLength(2);
+    expect(result.current.userEntities?.[0].id).toBe(123);
+    expect(result.current.userEntities?.[1].id).toBe('private/456');
+  });
+
+  it('should handle empty entity_access array', () => {
+    const mockUserRoles = createMockUserRoles([]);
+
+    queryMocks.useQueries.mockReturnValue([]);
+
+    const { result } = renderHook(
+      () =>
+        useGetUserEntities({
+          username: 'test-user',
+          userRoles: mockUserRoles,
+        }),
+      {
+        wrapper: (ui) => wrapWithTheme(ui),
+      }
+    );
+
+    expect(result.current.userEntities).toEqual([]);
+    expect(result.current.isLoading).toBe(false);
+  });
+
+  it('should set enabled to false when username is empty', () => {
+    const mockUserRoles = createMockUserRoles([
+      { id: 1, type: 'linode', roles: ['linode_admin'] },
+    ]);
+
+    queryMocks.useQueries.mockReturnValue([
+      { data: [], isLoading: false, error: null },
+    ]);
+
+    renderHook(
+      () =>
+        useGetUserEntities({
+          username: '',
+          userRoles: mockUserRoles,
+        }),
+      {
+        wrapper: (ui) => wrapWithTheme(ui),
+      }
+    );
+
+    const callArgs = queryMocks.useQueries.mock.calls[0][0];
+    expect(callArgs.queries[0].enabled).toBe(false);
+  });
+
+  it('should handle partial loading when some queries complete before others', () => {
+    const mockUserRoles = createMockUserRoles([
+      { id: 1, type: 'linode', roles: ['linode_admin'] },
+      { id: 2, type: 'volume', roles: ['volume_viewer'] },
+    ]);
+
+    queryMocks.useQueries.mockReturnValue([
+      {
+        data: [{ id: 1, label: 'linode-1', type: 'linode' }],
+        isLoading: false,
+        error: null,
+      },
+      { data: undefined, isLoading: true, error: null },
+    ]);
+
+    const { result } = renderHook(
+      () =>
+        useGetUserEntities({
+          username: 'test-user',
+          userRoles: mockUserRoles,
+        }),
+      {
+        wrapper: (ui) => wrapWithTheme(ui),
+      }
+    );
+
+    // Should show loading if any query is loading
+    expect(result.current.isLoading).toBe(true);
+    expect(result.current.userEntities).toBeUndefined();
+  });
+
+  it('should flatten nested entity arrays correctly', async () => {
+    const mockUserRoles = createMockUserRoles([
+      { id: 1, type: 'linode', roles: ['linode_admin'] },
+      { id: 2, type: 'volume', roles: ['volume_viewer'] },
+    ]);
+
+    const mockEntities1 = createMockEntities([
+      { id: 1, label: 'entity-1', type: 'linode' },
+      { id: 2, label: 'entity-2', type: 'linode' },
+    ]);
+
+    const mockEntities2 = createMockEntities([
+      { id: 3, label: 'entity-3', type: 'volume' },
+    ]);
+
+    queryMocks.useQueries.mockReturnValue([
+      { data: mockEntities1, isLoading: false, error: null },
+      { data: mockEntities2, isLoading: false, error: null },
+    ]);
+
+    const { result } = renderHook(
+      () =>
+        useGetUserEntities({
+          username: 'test-user',
+          userRoles: mockUserRoles,
+        }),
+      {
+        wrapper: (ui) => wrapWithTheme(ui),
+      }
+    );
+
+    expect(result.current.userEntities).toHaveLength(3);
+    expect(result.current.userEntities).toEqual([
+      ...mockEntities1,
+      ...mockEntities2,
+    ]);
+  });
+
+  it('should handle queries with undefined data gracefully', async () => {
+    const mockUserRoles = createMockUserRoles([
+      { id: 1, type: 'linode', roles: ['linode_admin'] },
+      { id: 2, type: 'volume', roles: ['volume_viewer'] },
+    ]);
+
+    queryMocks.useQueries.mockReturnValue([
+      { data: undefined, isLoading: false, error: null },
+      {
+        data: [{ id: 2, label: 'volume-1', type: 'volume' }],
+        isLoading: false,
+        error: null,
+      },
+    ]);
+
+    const { result } = renderHook(
+      () =>
+        useGetUserEntities({
+          username: 'test-user',
+          userRoles: mockUserRoles,
+        }),
+      {
+        wrapper: (ui) => wrapWithTheme(ui),
+      }
+    );
+
+    expect(result.current.userEntities).toHaveLength(1);
+    expect(result.current.userEntities?.[0].id).toBe(2);
+    expect(result.current.isLoading).toBe(false);
+  });
+
+  it('should call iamQueries with correct username for each entity type', () => {
+    const mockUserRoles = createMockUserRoles([
+      { id: 1, type: 'linode', roles: ['linode_admin'] },
+      { id: 2, type: 'firewall', roles: ['firewall_viewer'] },
+    ]);
+
+    queryMocks.useQueries.mockReturnValue([
+      { data: [], isLoading: false, error: null },
+      { data: [], isLoading: false, error: null },
+    ]);
+
+    renderHook(
+      () =>
+        useGetUserEntities({
+          username: 'test-user',
+          userRoles: mockUserRoles,
+        }),
+      {
+        wrapper: (ui) => wrapWithTheme(ui),
+      }
+    );
+
+    expect(iamQueriesMock.user).toHaveBeenCalledWith('test-user');
+    expect(iamQueriesMock.user()._ctx.allUserEntities).toHaveBeenCalledTimes(2);
+  });
+});
diff --git a/packages/manager/src/features/IAM/hooks/useGetUserEntities.ts b/packages/manager/src/features/IAM/hooks/useGetUserEntities.ts
new file mode 100644
index 00000000000..0874eb022d0
--- /dev/null
+++ b/packages/manager/src/features/IAM/hooks/useGetUserEntities.ts
@@ -0,0 +1,58 @@
+import { iamQueries, useQueries } from '@linode/queries';
+import * as React from 'react';
+
+import type { IamUserRoles } from '@linode/api-v4';
+
+interface UseGetUserEntitiesProps {
+  username: string;
+  userRoles: IamUserRoles | undefined;
+}
+
+/**
+ * This hook gets all entities a user has the lowest level of access to.
+ *
+ * In order to get all entities for an account, use the useAllAccountEntities hook.
+ */
+export const useGetUserEntities = (props: UseGetUserEntitiesProps) => {
+  const { userRoles, username } = props;
+
+  /**
+   * Get the types of entities the user has access to by mapping over the user roles.
+   * This is used to determine which entity types to query for.
+   */
+  const entityTypes = React.useMemo(() => {
+    return userRoles?.entity_access?.map((entity) => entity.type) ?? [];
+  }, [userRoles]);
+
+  /**
+   * Get the entities for each entity type via /iam/users/${username}/entities/${entityType}
+   * While this endpoint can be filtered by permission, omitting the permission parameter will return all entities the user has any access to, starting at the lowest level of access (view_{entity_type}).
+   */
+  const entityQueries = useQueries({
+    queries: entityTypes.map((type) => ({
+      ...iamQueries.user(username ?? '')._ctx.allUserEntities(type),
+      enabled: !!username,
+      // Because entities can be added or removed from the account at any time, and we don't invalidate the query when this happens,
+      // we need to set a short stale time to ensure the data is up to date.
+      staleTime: 1 * 60 * 1000, // 1 minute stale time
+    })),
+  });
+
+  /**
+   * Combine the entities from each entity type into a single array.
+   */
+  const { entities, isLoading, error } = React.useMemo(() => {
+    const isLoading = entityQueries.some((q) => q.isLoading);
+    const error = entityQueries.some((q) => q.error);
+
+    if (isLoading) {
+      return { entities: undefined, isLoading: true };
+    }
+
+    const entities = entityQueries.map((q) => q.data || []).flat();
+
+    return { entities, error, isLoading: false };
+  }, [entityQueries]);
+
+  return { userEntities: entities, isLoading, error };
+};
diff --git a/packages/queries/src/iam/keys.ts b/packages/queries/src/iam/keys.ts
index 41068e0d9d9..a57374d04e7 100644
--- a/packages/queries/src/iam/keys.ts
+++ b/packages/queries/src/iam/keys.ts
@@ -1,6 +1,7 @@
 import {
   getAccountRoles,
   getUserAccountPermissions,
+  getUserEntities,
   getUserEntitiesByPermission,
   getUserEntityPermissions,
   getUserRoles,
@@ -12,6 +13,7 @@ import type {
   AccessType,
   EntityByPermission,
   GetEntitiesByPermissionParams,
+  Params,
   PermissionType,
 } from '@linode/api-v4';
 
@@ -57,6 +59,20 @@ export const iamQueries = createQueryKeys('iam', {
           }).then((res) => res.data ?? []),
         queryKey: [entityType, permission],
       }),
+      userEntities: (entityType: AccessType, params: Params = {}) => ({
+        queryFn: () =>
+          getUserEntities({ username, entityType, params }).then(
+            (res) => res.data,
+          ),
+        queryKey: [entityType, params],
+      }),
+      allUserEntities: (entityType: AccessType) => ({
+        queryFn: () =>
+          getAll<EntityByPermission>((params) =>
+            getUserEntities({ username, entityType, params }),
+          )().then((data) => data.data),
+        queryKey: [entityType, 'all'],
+      }),
     },
     queryKey: [username],
   }),

From 02ce696ff49184e279fb632ed9c2042cfc408490 Mon Sep 17 00:00:00 2001
From: aaleksee-akamai <aaleksee@akamai.com>
Date: Thu, 4 Dec 2025 13:44:12 +0100
Subject: [PATCH 73/91] feat: [UIE-9734] - IAM: fix perm check (#13160)

* feat: [UIE-9734] - IAM: fix perm check

* update perm check
---
 .../Devices/RemoveDeviceDialog.tsx            |  3 ++-
 .../LinodeFirewalls/LinodeFirewalls.test.tsx  |  7 +++++--
 .../LinodeFirewallsActionMenu.tsx             | 19 ++++++++++++++-----
 .../LinodeFirewalls/LinodeFirewallsRow.tsx    |  1 +
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/RemoveDeviceDialog.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/RemoveDeviceDialog.tsx
index 830d257cd54..8bf5f6f991d 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/RemoveDeviceDialog.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/RemoveDeviceDialog.tsx
@@ -55,7 +55,8 @@ export const RemoveDeviceDialog = React.memo((props: Props) => {
   const { data: firewallPermissions } = usePermissions(
     'firewall',
     ['delete_firewall_device'],
-    firewallId
+    firewallId,
+    firewallId !== -1
   );
 
   const { data: linodePermissions } = usePermissions(
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/LinodeFirewalls.test.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/LinodeFirewalls.test.tsx
index 90df3971da2..da74eef7986 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/LinodeFirewalls.test.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/LinodeFirewalls.test.tsx
@@ -26,6 +26,7 @@ const queryMocks = vi.hoisted(() => ({
   userPermissions: vi.fn(() => ({
     data: {
       apply_linode_firewalls: false,
+      update_linode: false,
       delete_firewall_device: false,
     },
   })),
@@ -96,10 +97,11 @@ describe('LinodeFirewalls', () => {
     expect(addFirewallBtn).toBeDisabled();
   });
 
-  it("should enable 'Unassign' button if the user has delete_firewall_device permission", async () => {
+  it("should enable 'Unassign' button if the user has update_linode and delete_firewall_device permission", async () => {
     queryMocks.userPermissions.mockReturnValue({
       data: {
         ...queryMocks.userPermissions().data,
+        update_linode: true,
         delete_firewall_device: true,
       },
     });
@@ -120,10 +122,11 @@ describe('LinodeFirewalls', () => {
     expect(unassignFirewallBtn).toBeEnabled();
   });
 
-  it("should disable 'Unassign' button if the user doesn't have delete_firewall_device permission", async () => {
+  it("should disable 'Unassign' button if the user doesn't have update_linode and delete_firewall_device permission", async () => {
     queryMocks.userPermissions.mockReturnValue({
       data: {
         ...queryMocks.userPermissions().data,
+        update_linode: false,
         delete_firewall_device: false,
       },
     });
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/LinodeFirewallsActionMenu.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/LinodeFirewallsActionMenu.tsx
index 7764bf93b6a..e0429b6a1b7 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/LinodeFirewallsActionMenu.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/LinodeFirewallsActionMenu.tsx
@@ -8,22 +8,31 @@ import type { Action } from 'src/components/ActionMenu/ActionMenu';
 
 interface LinodeFirewallsActionMenuProps {
   firewallID: number;
+  linodeID: number;
   onUnassign: () => void;
 }
 
 export const LinodeFirewallsActionMenu = (
   props: LinodeFirewallsActionMenuProps
 ) => {
-  const { firewallID, onUnassign } = props;
+  const { onUnassign, linodeID, firewallID } = props;
 
-  const { data: permissions } = usePermissions(
+  const { data: linodePermissions } = usePermissions(
+    'linode',
+    ['update_linode'],
+    linodeID
+  );
+
+  const { data: firewallPermissions } = usePermissions(
     'firewall',
     ['delete_firewall_device'],
-    firewallID,
-    true
+    firewallID
   );
 
-  const disabledProps = !permissions.delete_firewall_device
+  const disabledProps = !(
+    linodePermissions?.update_linode &&
+    firewallPermissions?.delete_firewall_device
+  )
     ? {
         disabled: true,
         tooltip: NO_PERMISSIONS_TOOLTIP_TEXT,
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/LinodeFirewallsRow.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/LinodeFirewallsRow.tsx
index 2ddb35031ce..0ee350b83c7 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/LinodeFirewallsRow.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/LinodeFirewallsRow.tsx
@@ -50,6 +50,7 @@ export const LinodeFirewallsRow = (props: LinodeFirewallsRowProps) => {
       <TableCell actionCell>
         <LinodeFirewallsActionMenu
           firewallID={firewallID}
+          linodeID={linodeID}
           onUnassign={() => onClickUnassign(firewallDevice, firewall)}
         />
       </TableCell>

From f95ccd4e6a3e7e2396415bb70cda804515aab632 Mon Sep 17 00:00:00 2001
From: tvijay-akamai <51293194+tvijay-akamai@users.noreply.github.com>
Date: Thu, 4 Dec 2025 18:37:13 +0530
Subject: [PATCH 74/91] fixed: [UIE-9539] Turn off generational plan features
 if no g7 and g8 plans are returned (#13136)

* fixed: [UIE-9539] turn off generational plan features if no g7 and g8 plans are returned

* fixed: [UIE-9539] addressed review comment

* fixed: [UIE-9539] updated info content in dedicated cpu tab

* fixed: [UIE-9539] updated info content in dedicated cpu tab and configured it to fallback to previous message if generational plans are not there in dedicated
---
 .../KubernetesPlanContainer.tsx               |   8 +-
 .../KubernetesPlanSelectionTable.tsx          |   8 +-
 .../KubernetesPlansPanel.tsx                  |   1 +
 .../components/PlansPanel/PlanContainer.tsx   |   5 +-
 .../components/PlansPanel/PlanInformation.tsx |  59 ++++-
 .../PlansPanel/PlanSelectionTable.tsx         |   5 +-
 .../components/PlansPanel/PlansPanel.tsx      |   1 +
 .../features/components/PlansPanel/utils.ts   |   4 +-
 .../manager/src/utilities/linodes.test.ts     | 213 +++++++++++++++++-
 packages/manager/src/utilities/linodes.ts     |  55 ++++-
 10 files changed, 334 insertions(+), 25 deletions(-)

diff --git a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanContainer.tsx b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanContainer.tsx
index dd627103896..94a2edd7b2f 100644
--- a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanContainer.tsx
+++ b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanContainer.tsx
@@ -110,7 +110,10 @@ export const KubernetesPlanContainer = (
     wholePanelIsDisabled,
   } = props;
   const shouldDisplayNoRegionSelectedMessage = !selectedRegionId;
-  const { isGenerationalPlansEnabled } = useIsGenerationalPlansEnabled();
+  const { isGenerationalPlansEnabled } = useIsGenerationalPlansEnabled(
+    plans,
+    planType
+  );
 
   /**
    * This features allows us to divide the GPU plans into two separate tables.
@@ -297,6 +300,7 @@ export const KubernetesPlanContainer = (
                         filterOptions={table}
                         key={`k8-plan-filter-${idx}`}
                         plans={filteredPlans}
+                        planType={planType}
                         renderPlanSelection={renderPlanSelection}
                         shouldDisplayNoRegionSelectedMessage={
                           shouldDisplayNoRegionSelectedMessage
@@ -309,6 +313,7 @@ export const KubernetesPlanContainer = (
                 <KubernetesPlanSelectionTable
                   key={planType}
                   plans={plans}
+                  planType={planType}
                   renderPlanSelection={renderPlanSelection}
                   shouldDisplayNoRegionSelectedMessage={
                     shouldDisplayNoRegionSelectedMessage
@@ -394,6 +399,7 @@ export const KubernetesPlanContainer = (
                     filterEmptyStateMessage={tableEmptyState?.message}
                     key={planType ?? 'all'}
                     plans={paginatedPlans}
+                    planType={planType}
                     renderPlanSelection={renderPlanSelection}
                     shouldDisplayNoRegionSelectedMessage={
                       shouldDisplayNoRegionSelectedMessage
diff --git a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanSelectionTable.tsx b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanSelectionTable.tsx
index 7135cba2b5d..5d2530d6f10 100644
--- a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanSelectionTable.tsx
+++ b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlanSelectionTable.tsx
@@ -9,6 +9,7 @@ import { TableRowEmpty } from 'src/components/TableRowEmpty/TableRowEmpty';
 import { useIsGenerationalPlansEnabled } from 'src/utilities/linodes';
 import { PLAN_SELECTION_NO_REGION_SELECTED_MESSAGE } from 'src/utilities/pricing/constants';
 
+import type { LinodeTypeClass } from '@linode/api-v4';
 import type { PlanSelectionFilterOptionsTable } from 'src/features/components/PlansPanel/PlanContainer';
 import type { PlanWithAvailability } from 'src/features/components/PlansPanel/types';
 
@@ -19,6 +20,7 @@ interface KubernetesPlanSelectionTableProps {
   filterEmptyStateMessage?: string;
   filterOptions?: PlanSelectionFilterOptionsTable;
   plans?: PlanWithAvailability[];
+  planType?: LinodeTypeClass;
   renderPlanSelection?: (plans: PlanWithAvailability[]) => React.JSX.Element[];
   shouldDisplayNoRegionSelectedMessage: boolean;
 }
@@ -40,10 +42,14 @@ export const KubernetesPlanSelectionTable = (
     filterEmptyStateMessage,
     filterOptions,
     plans,
+    planType,
     renderPlanSelection,
     shouldDisplayNoRegionSelectedMessage,
   } = props;
-  const { isGenerationalPlansEnabled } = useIsGenerationalPlansEnabled();
+  const { isGenerationalPlansEnabled } = useIsGenerationalPlansEnabled(
+    plans,
+    planType
+  );
 
   // Determine spacing based on feature flag:
   // - If generationalPlans is enabled (pagination mode) -> spacingBottom={0}
diff --git a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx
index 74afbe23aac..7cf653dfdd1 100644
--- a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx
+++ b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx
@@ -144,6 +144,7 @@ export const KubernetesPlansPanel = (props: Props) => {
                 isSelectedRegionEligibleForPlan={isSelectedRegionEligibleForPlan(
                   plan
                 )}
+                plans={plansForThisLinodeTypeClass}
                 planType={plan}
                 regionsData={regionsData}
               />
diff --git a/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx b/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx
index e14ab6d10e9..4b454edc2a5 100644
--- a/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx
+++ b/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx
@@ -116,7 +116,10 @@ export const PlanContainer = (props: PlanContainerProps) => {
   } = props;
   const location = useLocation();
   const flags = useFlags();
-  const { isGenerationalPlansEnabled } = useIsGenerationalPlansEnabled();
+  const { isGenerationalPlansEnabled } = useIsGenerationalPlansEnabled(
+    plans,
+    planType
+  );
 
   // Show the Transfer column if, for any plan, the api returned data and we're not in the Database Create flow
   const showTransfer =
diff --git a/packages/manager/src/features/components/PlansPanel/PlanInformation.tsx b/packages/manager/src/features/components/PlansPanel/PlanInformation.tsx
index bf2b9662888..f5867e31ec8 100644
--- a/packages/manager/src/features/components/PlansPanel/PlanInformation.tsx
+++ b/packages/manager/src/features/components/PlansPanel/PlanInformation.tsx
@@ -3,6 +3,7 @@ import * as React from 'react';
 
 import { Link } from 'src/components/Link';
 import { useFlags } from 'src/hooks/useFlags';
+import { useIsGenerationalPlansEnabled } from 'src/utilities/linodes';
 
 import { APLNotice } from './APLNotice';
 import {
@@ -19,6 +20,7 @@ import { PlansAvailabilityNotice } from './PlansAvailabilityNotice';
 import { PlanNoticeTypography } from './PlansAvailabilityNotice.styles';
 import { planTabInfoContent } from './utils';
 
+import type { PlanSelectionType } from './types';
 import type { Region } from '@linode/api-v4';
 import type { LinodeTypeClass } from '@linode/api-v4/lib/linodes';
 import type { Theme } from '@mui/material/styles';
@@ -37,6 +39,10 @@ export interface PlanInformationProps extends ExtendedPlanType {
   isAPLEnabled?: boolean;
   isResize?: boolean;
   isSelectedRegionEligibleForPlan: boolean;
+  /**
+   * Array of plans for this plan type class.
+   */
+  plans?: PlanSelectionType[];
   regionsData?: Region[];
 }
 
@@ -51,6 +57,7 @@ export const PlanInformation = (props: PlanInformationProps) => {
     isAPLEnabled,
     isResize,
     isSelectedRegionEligibleForPlan,
+    plans,
     planType,
     regionsData,
   } = props;
@@ -142,10 +149,10 @@ export const PlanInformation = (props: PlanInformationProps) => {
         <Notice
           dataTestId={limitedAvailabilityBannerTestId}
           sx={(theme: Theme) => ({
-            marginBottom: theme.spacing(3),
+            marginBottom: theme.spacingFunction(24),
             marginLeft: 0,
             marginTop: 0,
-            padding: `${theme.spacing(0.5)} ${theme.spacing(2)}`,
+            padding: `${theme.spacingFunction(4)} ${theme.spacingFunction(16)}`,
           })}
           variant="warning"
         >
@@ -158,15 +165,30 @@ export const PlanInformation = (props: PlanInformationProps) => {
         additionalBanners.map((banner, index) => (
           <React.Fragment key={index}>{banner}</React.Fragment>
         ))}
-      <ClassDescriptionCopy planType={planType} />
+      <ClassDescriptionCopy plans={plans} planType={planType} />
     </>
   );
 };
 
 export const limitedAvailabilityBannerTestId = 'limited-availability-banner';
 
-export const ClassDescriptionCopy = (props: ExtendedPlanType) => {
-  const { planType } = props;
+interface ClassDescriptionCopyProps extends ExtendedPlanType {
+  /**
+   * Array of plans for this plan type class.
+   */
+  plans?: PlanSelectionType[];
+}
+
+export const ClassDescriptionCopy = (props: ClassDescriptionCopyProps) => {
+  const { plans, planType } = props;
+
+  // Only check generational plans feature for dedicated plans
+  // Other plan types don't have different legacy descriptions
+  const { isGenerationalPlansEnabled } = useIsGenerationalPlansEnabled(
+    plans,
+    planType === 'dedicated' ? 'dedicated' : undefined
+  );
+
   let planTypeLabel: null | string;
   let docLink: null | string;
 
@@ -200,18 +222,31 @@ export const ClassDescriptionCopy = (props: ExtendedPlanType) => {
       docLink = null;
   }
 
+  // Determine which typography to display
+  let typography: string | undefined;
+
+  if (planType === 'dedicated') {
+    // For dedicated plans, use typographyOld if generational plans are disabled
+    typography = isGenerationalPlansEnabled
+      ? planTabInfoContent.dedicated?.typography
+      : planTabInfoContent.dedicated?.typographyOld ||
+        planTabInfoContent.dedicated?.typography;
+  } else {
+    // For all other plan types, just use typography
+    typography =
+      planTabInfoContent[planType as keyof typeof planTabInfoContent]
+        ?.typography;
+  }
+
   return planTypeLabel && docLink ? (
     <Typography
       sx={(theme: Theme) => ({
-        marginBottom: theme.spacing(3),
-        marginTop: theme.spacing(1),
+        marginBottom: theme.spacingFunction(24),
+        marginTop: theme.spacingFunction(8),
       })}
     >
-      {
-        planTabInfoContent[planType as keyof typeof planTabInfoContent]
-          ?.typography
-      }{' '}
-      <Link to={docLink}>Learn more</Link> about our {planTypeLabel} plans.
+      {typography} <Link to={docLink}>Learn more</Link> about our{' '}
+      {planTypeLabel} plans.
     </Typography>
   ) : null;
 };
diff --git a/packages/manager/src/features/components/PlansPanel/PlanSelectionTable.tsx b/packages/manager/src/features/components/PlansPanel/PlanSelectionTable.tsx
index 289bb7b4ceb..5c0583ec35e 100644
--- a/packages/manager/src/features/components/PlansPanel/PlanSelectionTable.tsx
+++ b/packages/manager/src/features/components/PlansPanel/PlanSelectionTable.tsx
@@ -59,7 +59,10 @@ export const PlanSelectionTable = (props: PlanSelectionTableProps) => {
     showUsableStorage,
   } = props;
   const flags = useFlags();
-  const { isGenerationalPlansEnabled } = useIsGenerationalPlansEnabled();
+  const { isGenerationalPlansEnabled } = useIsGenerationalPlansEnabled(
+    plans,
+    planType
+  );
 
   // Determine spacing based on feature flag:
   // - If generationalPlans is enabled (pagination mode) -> spacingBottom={0}
diff --git a/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx b/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx
index 5a24b9c9b5a..83ad6b78d30 100644
--- a/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx
+++ b/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx
@@ -209,6 +209,7 @@ export const PlansPanel = (props: PlansPanelProps) => {
                 isSelectedRegionEligibleForPlan={isSelectedRegionEligibleForPlan(
                   plan
                 )}
+                plans={plansForThisLinodeTypeClass}
                 planType={plan}
                 regionsData={regionsData || []}
               />
diff --git a/packages/manager/src/features/components/PlansPanel/utils.ts b/packages/manager/src/features/components/PlansPanel/utils.ts
index 90f4ffbeb3b..6ecc1f5801f 100644
--- a/packages/manager/src/features/components/PlansPanel/utils.ts
+++ b/packages/manager/src/features/components/PlansPanel/utils.ts
@@ -237,6 +237,8 @@ export const planTabInfoContent = {
     key: 'dedicated',
     title: 'Dedicated CPU',
     typography:
+      'Dedicated CPU instances are built for full-duty workloads needing consistent performance. Choose from different hardware generations — newer plans feature the latest hardware. Select Compute Optimized (1:2) for CPU-heavy tasks or General Purpose (1:4) for balanced workloads.',
+    typographyOld:
       'Dedicated CPU instances are good for full-duty workloads where consistent performance is important.',
   },
   gpu: {
@@ -504,7 +506,7 @@ export const useShouldDisablePremiumPlansTab = ({
   types: LinodeType[] | PlanSelectionType[] | undefined;
 }): boolean => {
   const { isGenerationalPlansEnabled, allowedPlans } =
-    useIsGenerationalPlansEnabled();
+    useIsGenerationalPlansEnabled(types, 'premium');
   // Check if any public premium plans are available.
   // We can omit "Premium HT" and "Premium nested" plans as customers don't deploy them using cloud manager.
   const arePublicPremiumPlansAvailable = types?.some(
diff --git a/packages/manager/src/utilities/linodes.test.ts b/packages/manager/src/utilities/linodes.test.ts
index 3716e3929ea..35eef4aee04 100644
--- a/packages/manager/src/utilities/linodes.test.ts
+++ b/packages/manager/src/utilities/linodes.test.ts
@@ -81,14 +81,23 @@ describe('useIsLinodeCloneFirewallEnabled', () => {
 });
 
 describe('useIsGenerationalPlansEnabled', () => {
+  const G7_DEDICATED_PLAN = { id: 'g7-dedicated-4' };
+  const G8_DEDICATED_PLAN = { id: 'g8-dedicated-4-2' };
+  const G6_STANDARD_PLAN = { id: 'g6-standard-1' };
+  const GPU_PLAN = { id: 'gpu-rtx6000-1' };
+  const G7_PREMIUM_PLAN = { id: 'g7-premium-4' };
+
   it('returns isGenerationalPlansEnabled: true if the feature is enabled', () => {
     const options = {
       flags: { generationalPlansv2: { enabled: true, allowedPlans: [] } },
     };
 
-    const { result } = renderHook(() => useIsGenerationalPlansEnabled(), {
-      wrapper: (ui) => wrapWithTheme(ui, options),
-    });
+    const { result } = renderHook(
+      () => useIsGenerationalPlansEnabled(undefined, undefined),
+      {
+        wrapper: (ui) => wrapWithTheme(ui, options),
+      }
+    );
 
     expect(result.current?.isGenerationalPlansEnabled).toBe(true);
   });
@@ -98,9 +107,201 @@ describe('useIsGenerationalPlansEnabled', () => {
       flags: { generationalPlansv2: { enabled: false, allowedPlans: [] } },
     };
 
-    const { result } = renderHook(() => useIsGenerationalPlansEnabled(), {
-      wrapper: (ui) => wrapWithTheme(ui, options),
-    });
+    const { result } = renderHook(
+      () => useIsGenerationalPlansEnabled(undefined, undefined),
+      {
+        wrapper: (ui) => wrapWithTheme(ui, options),
+      }
+    );
+
+    expect(result.current?.isGenerationalPlansEnabled).toBe(false);
+  });
+
+  it('returns isGenerationalPlansEnabled: true when flag is enabled and both G7 and G8 dedicated plans are available for dedicated planType', () => {
+    const options = {
+      flags: { generationalPlansv2: { enabled: true, allowedPlans: [] } },
+    };
+
+    const plans = [G7_DEDICATED_PLAN, G8_DEDICATED_PLAN, G6_STANDARD_PLAN];
+
+    const { result } = renderHook(
+      () => useIsGenerationalPlansEnabled(plans, 'dedicated'),
+      {
+        wrapper: (ui) => wrapWithTheme(ui, options),
+      }
+    );
+
+    expect(result.current?.isGenerationalPlansEnabled).toBe(true);
+  });
+
+  it('returns isGenerationalPlansEnabled: true when flag is enabled and only G7 dedicated plans are available for dedicated planType', () => {
+    const options = {
+      flags: { generationalPlansv2: { enabled: true, allowedPlans: [] } },
+    };
+
+    const plans = [G7_DEDICATED_PLAN, G6_STANDARD_PLAN];
+
+    const { result } = renderHook(
+      () => useIsGenerationalPlansEnabled(plans, 'dedicated'),
+      {
+        wrapper: (ui) => wrapWithTheme(ui, options),
+      }
+    );
+
+    expect(result.current?.isGenerationalPlansEnabled).toBe(true);
+  });
+
+  it('returns isGenerationalPlansEnabled: true when flag is enabled and only G8 dedicated plans are available for dedicated planType', () => {
+    const options = {
+      flags: { generationalPlansv2: { enabled: true, allowedPlans: [] } },
+    };
+
+    const plans = [G8_DEDICATED_PLAN, G6_STANDARD_PLAN];
+
+    const { result } = renderHook(
+      () => useIsGenerationalPlansEnabled(plans, 'dedicated'),
+      {
+        wrapper: (ui) => wrapWithTheme(ui, options),
+      }
+    );
+
+    expect(result.current?.isGenerationalPlansEnabled).toBe(true);
+  });
+
+  it('returns isGenerationalPlansEnabled: false when flag is enabled but neither G7 nor G8 dedicated plans are available for dedicated planType', () => {
+    const options = {
+      flags: { generationalPlansv2: { enabled: true, allowedPlans: [] } },
+    };
+
+    const plans = [
+      G6_STANDARD_PLAN,
+      { id: 'g6-dedicated-2' },
+      G7_PREMIUM_PLAN, // Not a g7-dedicated plan
+    ];
+
+    const { result } = renderHook(
+      () => useIsGenerationalPlansEnabled(plans, 'dedicated'),
+      {
+        wrapper: (ui) => wrapWithTheme(ui, options),
+      }
+    );
+
+    expect(result.current?.isGenerationalPlansEnabled).toBe(false);
+  });
+
+  it('returns isGenerationalPlansEnabled: true when flag is enabled but plans array is empty', () => {
+    const options = {
+      flags: { generationalPlansv2: { enabled: true, allowedPlans: [] } },
+    };
+
+    const { result } = renderHook(
+      () => useIsGenerationalPlansEnabled([], 'dedicated'),
+      {
+        wrapper: (ui) => wrapWithTheme(ui, options),
+      }
+    );
+
+    expect(result.current?.isGenerationalPlansEnabled).toBe(true);
+  });
+
+  it('returns isGenerationalPlansEnabled: false when flag is disabled regardless of plan availability', () => {
+    const options = {
+      flags: { generationalPlansv2: { enabled: false, allowedPlans: [] } },
+    };
+
+    const plans = [G7_DEDICATED_PLAN, G8_DEDICATED_PLAN];
+
+    const { result } = renderHook(
+      () => useIsGenerationalPlansEnabled(plans, 'dedicated'),
+      {
+        wrapper: (ui) => wrapWithTheme(ui, options),
+      }
+    );
+
+    expect(result.current?.isGenerationalPlansEnabled).toBe(false);
+  });
+
+  it('returns isGenerationalPlansEnabled: true for gpu planType when flag is enabled, regardless of G7/G8 availability', () => {
+    const options = {
+      flags: { generationalPlansv2: { enabled: true, allowedPlans: [] } },
+    };
+
+    const plans = [GPU_PLAN, G6_STANDARD_PLAN]; // No G7/G8 plans
+
+    const { result } = renderHook(
+      () => useIsGenerationalPlansEnabled(plans, 'gpu'),
+      {
+        wrapper: (ui) => wrapWithTheme(ui, options),
+      }
+    );
+
+    expect(result.current?.isGenerationalPlansEnabled).toBe(true);
+  });
+
+  it('returns isGenerationalPlansEnabled: true for highmem planType when flag is enabled, regardless of G7/G8 availability', () => {
+    const options = {
+      flags: { generationalPlansv2: { enabled: true, allowedPlans: [] } },
+    };
+
+    const plans = [{ id: 'g6-highmem-1' }]; // No G7/G8 plans
+
+    const { result } = renderHook(
+      () => useIsGenerationalPlansEnabled(plans, 'highmem'),
+      {
+        wrapper: (ui) => wrapWithTheme(ui, options),
+      }
+    );
+
+    expect(result.current?.isGenerationalPlansEnabled).toBe(true);
+  });
+
+  it('returns isGenerationalPlansEnabled: true for standard planType when flag is enabled, regardless of G7/G8 availability', () => {
+    const options = {
+      flags: { generationalPlansv2: { enabled: true, allowedPlans: [] } },
+    };
+
+    const plans = [G6_STANDARD_PLAN]; // No G7/G8 plans
+
+    const { result } = renderHook(
+      () => useIsGenerationalPlansEnabled(plans, 'standard'),
+      {
+        wrapper: (ui) => wrapWithTheme(ui, options),
+      }
+    );
+
+    expect(result.current?.isGenerationalPlansEnabled).toBe(true);
+  });
+
+  it('returns isGenerationalPlansEnabled: true for premium planType when G7 dedicated plans are available', () => {
+    const options = {
+      flags: { generationalPlansv2: { enabled: true, allowedPlans: [] } },
+    };
+
+    const plans = [G7_DEDICATED_PLAN, G7_PREMIUM_PLAN];
+
+    const { result } = renderHook(
+      () => useIsGenerationalPlansEnabled(plans, 'premium'),
+      {
+        wrapper: (ui) => wrapWithTheme(ui, options),
+      }
+    );
+
+    expect(result.current?.isGenerationalPlansEnabled).toBe(true);
+  });
+
+  it('returns isGenerationalPlansEnabled: false for premium planType when no G7/G8 dedicated plans are available', () => {
+    const options = {
+      flags: { generationalPlansv2: { enabled: true, allowedPlans: [] } },
+    };
+
+    const plans = [G7_PREMIUM_PLAN, { id: 'g6-premium-2' }]; // Premium plans but no dedicated G7/G8
+
+    const { result } = renderHook(
+      () => useIsGenerationalPlansEnabled(plans, 'premium'),
+      {
+        wrapper: (ui) => wrapWithTheme(ui, options),
+      }
+    );
 
     expect(result.current?.isGenerationalPlansEnabled).toBe(false);
   });
diff --git a/packages/manager/src/utilities/linodes.ts b/packages/manager/src/utilities/linodes.ts
index d2357b7dd0f..1d0f5f354b0 100644
--- a/packages/manager/src/utilities/linodes.ts
+++ b/packages/manager/src/utilities/linodes.ts
@@ -6,6 +6,7 @@ import { useFlags } from 'src/hooks/useFlags';
 import type {
   AccountMaintenance,
   Linode,
+  LinodeTypeClass,
   MaintenancePolicySlug,
 } from '@linode/api-v4';
 
@@ -92,12 +93,62 @@ export const useIsLinodeCloneFirewallEnabled = () => {
 /**
  * Returns whether or not features related to the Generational Compute Plans
  * should be enabled.
+ *
+ * The feature is disabled if:
+ * 1. The feature flag is disabled, OR
+ * 2. Both G7-dedicated and G8-dedicated plans are unavailable (ONLY for dedicated/premium plan classes)
+ *
+ * For plan classes other than 'dedicated' and 'premium' (e.g., 'gpu', 'highmem', 'standard'),
+ * the feature is controlled solely by the feature flag, regardless of G7/G8 plan availability.
+ *
+ * @param plans - Array of plans to check for G7/G8 dedicated availability
+ * @param planType - Plan class type (e.g., 'dedicated', 'gpu', 'premium')
  */
-export const useIsGenerationalPlansEnabled = () => {
+export const useIsGenerationalPlansEnabled = (
+  plans: Array<{ id: string }> | undefined,
+  planType: LinodeTypeClass | undefined
+) => {
   const flags = useFlags();
 
+  const isFlagEnabled = Boolean(flags.generationalPlansv2?.enabled);
+
+  // If feature flag is disabled, return early
+  if (!isFlagEnabled) {
+    return {
+      isGenerationalPlansEnabled: false,
+      allowedPlans: flags.generationalPlansv2?.allowedPlans || [],
+    };
+  }
+
+  // For plans other then dedicated/premium, or when no plans are provided,
+  // rely solely on the feature flag without checking G7/G8 availability
+  const shouldCheckG7G8Availability =
+    planType === 'dedicated' || planType === 'premium';
+
+  if (!plans || plans.length === 0 || !shouldCheckG7G8Availability) {
+    return {
+      isGenerationalPlansEnabled: isFlagEnabled,
+      allowedPlans: flags.generationalPlansv2?.allowedPlans || [],
+    };
+  }
+
+  // Check if G7-dedicated plans are available
+  const hasG7DedicatedPlans = plans.some((plan) =>
+    plan.id.startsWith('g7-dedicated-')
+  );
+
+  // Check if G8-dedicated plans are available
+  const hasG8DedicatedPlans = plans.some((plan) =>
+    plan.id.startsWith('g8-dedicated-')
+  );
+
+  // Disable generational plans feature if BOTH G7 and G8 dedicated plans are unavailable
+  const shouldDisableDueToUnavailability =
+    !hasG7DedicatedPlans && !hasG8DedicatedPlans;
+
   return {
-    isGenerationalPlansEnabled: Boolean(flags.generationalPlansv2?.enabled),
+    isGenerationalPlansEnabled:
+      isFlagEnabled && !shouldDisableDueToUnavailability,
     allowedPlans: flags.generationalPlansv2?.allowedPlans || [],
   };
 };

From 78aada033da4334ef0c1106bf23be1db0fd07ddb Mon Sep 17 00:00:00 2001
From: Alban Bailly <130582365+abailly-akamai@users.noreply.github.com>
Date: Thu, 4 Dec 2025 15:08:34 +0100
Subject: [PATCH 75/91] Revert "fix: [UIE-9733] - Performance improvement in
 IAM users pages (#13159)" (#13167)

This reverts commit bbddca59d5ceb6fbf02cad3294fd3a47fb55aaea.
---
 packages/api-v4/src/entities/types.ts         |   4 +-
 packages/api-v4/src/iam/iam.ts                |  27 --
 packages/api-v4/src/iam/types.ts              |   6 +-
 .../pr-13159-fixed-1764841164025.md           |   5 -
 .../AssignedEntitiesTable.test.tsx            |  35 +-
 .../AssignedEntitiesTable.tsx                 |  27 +-
 .../AssignedRolesTable.test.tsx               |  39 +-
 .../AssignedRolesTable/AssignedRolesTable.tsx |  17 +-
 .../IAM/Shared/AssignedRolesTable/utils.ts    |   9 +-
 .../src/features/IAM/Shared/Entities/utils.ts |   2 +-
 .../manager/src/features/IAM/Shared/types.ts  |   9 +-
 .../src/features/IAM/Shared/utilities.ts      |   7 +-
 .../Users/UserEntities/UserEntities.test.tsx  |  18 +-
 .../features/IAM/Users/UserEntities/utils.ts  |   2 +-
 .../IAM/Users/UserRoles/UserRoles.test.tsx    |  33 +-
 .../IAM/hooks/useGetUserEntities.test.ts      | 407 ------------------
 .../features/IAM/hooks/useGetUserEntities.ts  |  58 ---
 packages/queries/src/iam/keys.ts              |  16 -
 18 files changed, 125 insertions(+), 596 deletions(-)
 delete mode 100644 packages/manager/.changeset/pr-13159-fixed-1764841164025.md
 delete mode 100644 packages/manager/src/features/IAM/hooks/useGetUserEntities.test.ts
 delete mode 100644 packages/manager/src/features/IAM/hooks/useGetUserEntities.ts

diff --git a/packages/api-v4/src/entities/types.ts b/packages/api-v4/src/entities/types.ts
index d78671c8b03..6e2cf38a61d 100644
--- a/packages/api-v4/src/entities/types.ts
+++ b/packages/api-v4/src/entities/types.ts
@@ -12,10 +12,8 @@ export type EntityType =
   | 'volume'
   | 'vpc';
 
-export type EntityId = number | string;
-
 export interface AccountEntity {
-  id: EntityId;
+  id: number;
   label: string;
   type: EntityType;
 }
diff --git a/packages/api-v4/src/iam/iam.ts b/packages/api-v4/src/iam/iam.ts
index 17686bb58a6..006f634b428 100644
--- a/packages/api-v4/src/iam/iam.ts
+++ b/packages/api-v4/src/iam/iam.ts
@@ -142,30 +142,3 @@ export const getUserEntitiesByPermission = ({
     setParams(params),
     setXFilter(filter),
   );
-
-/**
- * getUserEntities
- *
- * Returns the available entities for a given user.
- * It is using the getUserEntitiesByPermission method, but without the permission parameter.
- * This is used to get all entities for a given user, per entity type.
- */
-export interface GetUserEntitiesParams {
-  entityType: EntityType;
-  filter?: Filter;
-  params?: Params;
-  username: string;
-}
-
-export const getUserEntities = ({
-  username,
-  entityType,
-  params,
-  filter,
-}: GetUserEntitiesParams) =>
-  Request<ResourcePage<EntityByPermission>>(
-    setURL(`${BETA_API_ROOT}/iam/users/${username}/entities/${entityType}`),
-    setMethod('GET'),
-    setParams(params),
-    setXFilter(filter),
-  );
diff --git a/packages/api-v4/src/iam/types.ts b/packages/api-v4/src/iam/types.ts
index dea764e8ffd..3ffeaa29952 100644
--- a/packages/api-v4/src/iam/types.ts
+++ b/packages/api-v4/src/iam/types.ts
@@ -1,4 +1,4 @@
-import type { EntityId, EntityType } from '../entities/types';
+import type { EntityType } from '../entities/types';
 
 export type AccountType = 'account';
 
@@ -436,7 +436,7 @@ export interface IamUserRoles {
 }
 
 export interface EntityAccess {
-  id: EntityId;
+  id: number;
   roles: EntityRoleType[];
   type: AccessType;
 }
@@ -457,7 +457,7 @@ export interface Roles {
   permissions: PermissionType[];
 }
 export interface EntityByPermission {
-  id: EntityId;
+  id: number | string;
   label: string;
   type: EntityType;
 }
diff --git a/packages/manager/.changeset/pr-13159-fixed-1764841164025.md b/packages/manager/.changeset/pr-13159-fixed-1764841164025.md
deleted file mode 100644
index cdeab9ae276..00000000000
--- a/packages/manager/.changeset/pr-13159-fixed-1764841164025.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Fixed
----
-
-Performance improvement in IAM users pages ([#13159](https://github.com/linode/manager/pull/13159))
diff --git a/packages/manager/src/features/IAM/Shared/AssignedEntitiesTable/AssignedEntitiesTable.test.tsx b/packages/manager/src/features/IAM/Shared/AssignedEntitiesTable/AssignedEntitiesTable.test.tsx
index 14294dce2d4..46ee9ab8a92 100644
--- a/packages/manager/src/features/IAM/Shared/AssignedEntitiesTable/AssignedEntitiesTable.test.tsx
+++ b/packages/manager/src/features/IAM/Shared/AssignedEntitiesTable/AssignedEntitiesTable.test.tsx
@@ -9,23 +9,27 @@ import { renderWithTheme } from 'src/utilities/testHelpers';
 import { AssignedEntitiesTable } from '../../Shared/AssignedEntitiesTable/AssignedEntitiesTable';
 
 const queryMocks = vi.hoisted(() => ({
+  useAllAccountEntities: vi.fn().mockReturnValue({}),
   useParams: vi.fn().mockReturnValue({}),
   useSearch: vi.fn().mockReturnValue({}),
   useUserRoles: vi.fn().mockReturnValue({}),
-  useGetUserEntities: vi.fn().mockReturnValue({}),
 }));
 
 vi.mock('@linode/queries', async () => {
-  const actual = await vi.importActual('@linode/queries');
+  const actual = await vi.importActual<any>('@linode/queries');
   return {
     ...actual,
     useUserRoles: queryMocks.useUserRoles,
   };
 });
 
-vi.mock('../../hooks/useGetUserEntities', () => ({
-  useGetUserEntities: queryMocks.useGetUserEntities,
-}));
+vi.mock('src/queries/entities/entities', async () => {
+  const actual = await vi.importActual('src/queries/entities/entities');
+  return {
+    ...actual,
+    useAllAccountEntities: queryMocks.useAllAccountEntities,
+  };
+});
 
 vi.mock('@tanstack/react-router', async () => {
   const actual = await vi.importActual('@tanstack/react-router');
@@ -52,11 +56,6 @@ describe('AssignedEntitiesTable', () => {
     queryMocks.useSearch.mockReturnValue({
       query: '',
     });
-    queryMocks.useGetUserEntities.mockReturnValue({
-      userEntities: mockEntities,
-      isLoading: false,
-      error: null,
-    });
   });
 
   it('should display no roles text if there are no roles assigned to user', async () => {
@@ -74,6 +73,10 @@ describe('AssignedEntitiesTable', () => {
       data: userRolesFactory.build(),
     });
 
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
+    });
+
     renderWithTheme(<AssignedEntitiesTable />);
 
     expect(screen.getByText('no_devices')).toBeVisible();
@@ -95,6 +98,10 @@ describe('AssignedEntitiesTable', () => {
       data: userRolesFactory.build(),
     });
 
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
+    });
+
     renderWithTheme(<AssignedEntitiesTable />);
 
     const searchInput = screen.getByPlaceholderText('Search');
@@ -110,6 +117,10 @@ describe('AssignedEntitiesTable', () => {
       data: userRolesFactory.build(),
     });
 
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
+    });
+
     renderWithTheme(<AssignedEntitiesTable />);
 
     const searchInput = screen.getByPlaceholderText('Search');
@@ -125,6 +136,10 @@ describe('AssignedEntitiesTable', () => {
       data: userRolesFactory.build(),
     });
 
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
+    });
+
     renderWithTheme(<AssignedEntitiesTable />);
 
     const autocomplete = screen.getByPlaceholderText('All Entities');
diff --git a/packages/manager/src/features/IAM/Shared/AssignedEntitiesTable/AssignedEntitiesTable.tsx b/packages/manager/src/features/IAM/Shared/AssignedEntitiesTable/AssignedEntitiesTable.tsx
index e4e97d7d188..0ffe95c13b5 100644
--- a/packages/manager/src/features/IAM/Shared/AssignedEntitiesTable/AssignedEntitiesTable.tsx
+++ b/packages/manager/src/features/IAM/Shared/AssignedEntitiesTable/AssignedEntitiesTable.tsx
@@ -21,9 +21,9 @@ import { TableRowError } from 'src/components/TableRowError/TableRowError';
 import { TableRowLoading } from 'src/components/TableRowLoading/TableRowLoading';
 import { TableSortCell } from 'src/components/TableSortCell';
 import { usePaginationV2 } from 'src/hooks/usePaginationV2';
+import { useAllAccountEntities } from 'src/queries/entities/entities';
 
 import { useIsDefaultDelegationRolesForChildAccount } from '../../hooks/useDelegationRole';
-import { useGetUserEntities } from '../../hooks/useGetUserEntities';
 import { usePermissions } from '../../hooks/usePermissions';
 import {
   addEntityNamesToRoles,
@@ -102,6 +102,12 @@ export const AssignedEntitiesTable = ({ username }: Props) => {
     React.useState<boolean>(false);
   const [selectedRole, setSelectedRole] = React.useState<EntitiesRole>();
 
+  const {
+    data: entities,
+    error: entitiesError,
+    isLoading: entitiesLoading,
+  } = useAllAccountEntities({});
+
   const {
     data: assignedUserRoles,
     error: assignedUserRolesError,
@@ -132,20 +138,11 @@ export const AssignedEntitiesTable = ({ username }: Props) => {
     ? permissions?.update_default_delegate_access
     : permissions?.is_account_admin;
 
-  const {
-    userEntities,
-    isLoading: entitiesLoading,
-    error: entitiesError,
-  } = useGetUserEntities({
-    username: username ?? '',
-    userRoles: assignedRoles,
-  });
-
   const { filterableOptions, roles } = React.useMemo(() => {
-    if (!assignedRoles || !userEntities) {
+    if (!assignedRoles || !entities) {
       return { filterableOptions: [], roles: [] };
     }
-    const transformedEntities = groupAccountEntitiesByType(userEntities);
+    const transformedEntities = groupAccountEntitiesByType(entities);
 
     const roles = addEntityNamesToRoles(assignedRoles, transformedEntities);
 
@@ -155,7 +152,7 @@ export const AssignedEntitiesTable = ({ username }: Props) => {
     ];
 
     return { filterableOptions, roles };
-  }, [assignedRoles, userEntities]);
+  }, [assignedRoles, entities]);
 
   const handleChangeRole = (role: EntitiesRole, mode: DrawerModes) => {
     setIsChangeRoleForEntityDrawerOpen(true);
@@ -214,11 +211,11 @@ export const AssignedEntitiesTable = ({ username }: Props) => {
       );
     }
 
-    if (!userEntities || !assignedRoles || filteredRoles.length === 0) {
+    if (!entities || !assignedRoles || filteredRoles.length === 0) {
       return <TableRowEmpty colSpan={3} message={'No items to display.'} />;
     }
 
-    if (assignedRoles && userEntities) {
+    if (assignedRoles && entities) {
       return (
         <>
           {filteredAndSortedRoles
diff --git a/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.test.tsx b/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.test.tsx
index f5667ce8bc5..1bf10ef230e 100644
--- a/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.test.tsx
+++ b/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.test.tsx
@@ -10,6 +10,7 @@ import { renderWithTheme } from 'src/utilities/testHelpers';
 import { AssignedRolesTable } from './AssignedRolesTable';
 
 const queryMocks = vi.hoisted(() => ({
+  useAllAccountEntities: vi.fn().mockReturnValue({}),
   useParams: vi.fn().mockReturnValue({}),
   useAccountRoles: vi.fn().mockReturnValue({}),
   useUserRoles: vi.fn().mockReturnValue({}),
@@ -17,7 +18,6 @@ const queryMocks = vi.hoisted(() => ({
   useIsDefaultDelegationRolesForChildAccount: vi.fn().mockReturnValue({
     isDefaultDelegationRolesForChildAccount: false,
   }),
-  useGetUserEntities: vi.fn().mockReturnValue({}),
 }));
 
 vi.mock('@linode/queries', async () => {
@@ -31,6 +31,14 @@ vi.mock('@linode/queries', async () => {
   };
 });
 
+vi.mock('src/queries/entities/entities', async () => {
+  const actual = await vi.importActual('src/queries/entities/entities');
+  return {
+    ...actual,
+    useAllAccountEntities: queryMocks.useAllAccountEntities,
+  };
+});
+
 vi.mock('@tanstack/react-router', async () => {
   const actual = await vi.importActual('@tanstack/react-router');
   return {
@@ -44,10 +52,6 @@ vi.mock('../../hooks/useDelegationRole', () => ({
     queryMocks.useIsDefaultDelegationRolesForChildAccount,
 }));
 
-vi.mock('../../hooks/useGetUserEntities', () => ({
-  useGetUserEntities: queryMocks.useGetUserEntities,
-}));
-
 const mockEntities = [
   accountEntityFactory.build({
     id: 7,
@@ -68,11 +72,6 @@ describe('AssignedRolesTable', () => {
     queryMocks.useParams.mockReturnValue({
       username: 'test_user',
     });
-    queryMocks.useGetUserEntities.mockReturnValue({
-      userEntities: mockEntities,
-      isLoading: false,
-      error: null,
-    });
   });
 
   it('should display no roles text if there are no roles assigned to user', async () => {
@@ -94,6 +93,10 @@ describe('AssignedRolesTable', () => {
       data: mockAccountRoles,
     });
 
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
+    });
+
     renderWithTheme(<AssignedRolesTable />);
 
     expect(screen.getByText('account_linode_admin')).toBeVisible();
@@ -118,6 +121,10 @@ describe('AssignedRolesTable', () => {
       data: mockAccountRoles,
     });
 
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
+    });
+
     renderWithTheme(<AssignedRolesTable />);
 
     const searchInput = screen.getByPlaceholderText('Search');
@@ -137,6 +144,10 @@ describe('AssignedRolesTable', () => {
       data: mockAccountRoles,
     });
 
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
+    });
+
     renderWithTheme(<AssignedRolesTable />);
 
     const searchInput = screen.getByPlaceholderText('Search');
@@ -156,6 +167,10 @@ describe('AssignedRolesTable', () => {
       data: mockAccountRoles,
     });
 
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
+    });
+
     renderWithTheme(<AssignedRolesTable />);
 
     const autocomplete = screen.getByPlaceholderText('All Assigned Roles');
@@ -179,6 +194,10 @@ describe('AssignedRolesTable', () => {
       data: mockAccountRoles,
     });
 
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
+    });
+
     renderWithTheme(<AssignedRolesTable />);
 
     expect(screen.getByText('Add New Default Roles')).toBeVisible();
diff --git a/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.tsx b/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.tsx
index 2706249e462..82da1535714 100644
--- a/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.tsx
+++ b/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.tsx
@@ -19,9 +19,9 @@ import { TableRow } from 'src/components/TableRow';
 import { TableRowEmpty } from 'src/components/TableRowEmpty/TableRowEmpty';
 import { TableSortCell } from 'src/components/TableSortCell/TableSortCell';
 import { usePaginationV2 } from 'src/hooks/usePaginationV2';
+import { useAllAccountEntities } from 'src/queries/entities/entities';
 
 import { useIsDefaultDelegationRolesForChildAccount } from '../../hooks/useDelegationRole';
-import { useGetUserEntities } from '../../hooks/useGetUserEntities';
 import { usePermissions } from '../../hooks/usePermissions';
 import { AssignedEntities } from '../../Users/UserRoles/AssignedEntities';
 import { AssignNewRoleDrawer } from '../../Users/UserRoles/AssignNewRoleDrawer';
@@ -168,11 +168,9 @@ export const AssignedRolesTable = () => {
 
   const { data: accountRoles, isLoading: accountPermissionsLoading } =
     useAccountRoles();
-
-  const { userEntities, isLoading: entitiesLoading } = useGetUserEntities({
-    username: username ?? '',
-    userRoles: assignedRoles,
-  });
+  const { data: entities, isLoading: entitiesLoading } = useAllAccountEntities(
+    {}
+  );
 
   const { filterableOptions, roles } = React.useMemo(() => {
     if (!assignedRoles || !accountRoles) {
@@ -187,13 +185,14 @@ export const AssignedRolesTable = () => {
       ...mapEntityTypesForSelect(roles, ' Roles'),
     ];
 
-    if (userEntities) {
-      const transformedEntities = groupAccountEntitiesByType(userEntities);
+    if (entities) {
+      const transformedEntities = groupAccountEntitiesByType(entities);
+
       roles = addEntitiesNamesToRoles(roles, transformedEntities);
     }
 
     return { filterableOptions, roles };
-  }, [assignedRoles, accountRoles, userEntities]);
+  }, [assignedRoles, accountRoles, entities]);
 
   const [query, setQuery] = React.useState('');
 
diff --git a/packages/manager/src/features/IAM/Shared/AssignedRolesTable/utils.ts b/packages/manager/src/features/IAM/Shared/AssignedRolesTable/utils.ts
index 5923d610e6e..d3533a80438 100644
--- a/packages/manager/src/features/IAM/Shared/AssignedRolesTable/utils.ts
+++ b/packages/manager/src/features/IAM/Shared/AssignedRolesTable/utils.ts
@@ -4,7 +4,6 @@ import type { ExtendedRoleView, RoleView } from '../types';
 import type {
   AccountEntity,
   AccountRoleType,
-  EntityId,
   EntityRoleType,
   EntityType,
   IamAccountRoles,
@@ -12,7 +11,7 @@ import type {
 } from '@linode/api-v4';
 
 export interface CombinedRoles {
-  id: EntityId[] | null;
+  id: null | number[];
   name: AccountRoleType | EntityRoleType;
 }
 
@@ -72,7 +71,7 @@ export const addEntitiesNamesToRoles = (
  */
 export const combineRoles = (data: IamUserRoles): CombinedRoles[] => {
   const combinedRoles: CombinedRoles[] = [];
-  const roleMap: Map<AccountRoleType | EntityRoleType, EntityId[] | null> =
+  const roleMap: Map<AccountRoleType | EntityRoleType, null | number[]> =
     new Map();
 
   // Add account access roles with resource_id set to null
@@ -84,7 +83,7 @@ export const combineRoles = (data: IamUserRoles): CombinedRoles[] => {
 
   // Add resource access roles with their respective resource_id
   data.entity_access.forEach(
-    (resource: { id: EntityId; roles: EntityRoleType[] }) => {
+    (resource: { id: number; roles: EntityRoleType[] }) => {
       resource.roles?.forEach((role: EntityRoleType) => {
         if (roleMap.has(role)) {
           const existingResourceIds = roleMap.get(role);
@@ -115,7 +114,7 @@ export const mapRolesToPermissions = (
 ): RoleView[] => {
   const allRoles = mapAccountPermissionsToRoles(accountPermissions);
 
-  const userRolesLookup = new Map<string, EntityId[] | null>();
+  const userRolesLookup = new Map<string, null | number[]>();
   userRoles.forEach(({ id, name }) => {
     userRolesLookup.set(name, id);
   });
diff --git a/packages/manager/src/features/IAM/Shared/Entities/utils.ts b/packages/manager/src/features/IAM/Shared/Entities/utils.ts
index 4891e977074..aab965e3fd6 100644
--- a/packages/manager/src/features/IAM/Shared/Entities/utils.ts
+++ b/packages/manager/src/features/IAM/Shared/Entities/utils.ts
@@ -55,7 +55,7 @@ export const getPlaceholder = (
 };
 
 export const mapEntitiesToOptions = (
-  entities: Pick<AccountEntity, 'id' | 'label'>[]
+  entities: { id: number; label: string }[]
 ): EntitiesOption[] => {
   return entities.map((entity) => ({
     label: entity.label,
diff --git a/packages/manager/src/features/IAM/Shared/types.ts b/packages/manager/src/features/IAM/Shared/types.ts
index 0877cab424d..7c2305a4abd 100644
--- a/packages/manager/src/features/IAM/Shared/types.ts
+++ b/packages/manager/src/features/IAM/Shared/types.ts
@@ -1,7 +1,6 @@
 import type {
   AccessType,
   AccountRoleType,
-  EntityId,
   EntityRoleType,
   IamAccessType,
   PermissionType,
@@ -9,13 +8,13 @@ import type {
 
 export interface EntitiesOption {
   label: string;
-  value: EntityId;
+  value: number;
 }
 
 export interface RoleView {
   access: 'account_access' | 'entity_access';
   description: string;
-  entity_ids: EntityId[] | null;
+  entity_ids: null | number[];
   entity_type: AccessType;
   id: AccountRoleType | EntityRoleType;
   name: AccountRoleType | EntityRoleType;
@@ -27,7 +26,7 @@ export interface ExtendedRoleView extends RoleView {
 
 export interface EntitiesRole {
   access: IamAccessType;
-  entity_id: EntityId;
+  entity_id: number;
   entity_name: string;
   entity_type: AccessType;
   id: string;
@@ -35,7 +34,7 @@ export interface EntitiesRole {
 }
 
 export interface CombinedEntity {
-  id: EntityId;
+  id: number;
   name: string;
 }
 
diff --git a/packages/manager/src/features/IAM/Shared/utilities.ts b/packages/manager/src/features/IAM/Shared/utilities.ts
index 77f6e7b2b3a..91a1b4cadbc 100644
--- a/packages/manager/src/features/IAM/Shared/utilities.ts
+++ b/packages/manager/src/features/IAM/Shared/utilities.ts
@@ -19,7 +19,6 @@ import type {
   AccountRoleType,
   APIError,
   EntityAccess,
-  EntityId,
   EntityRoleType,
   EntityType,
   IamAccess,
@@ -325,7 +324,7 @@ export const groupAccountEntitiesByType = (
 
 export const changeRoleForEntity = (
   entityRoles: EntityAccess[],
-  entityId: EntityId,
+  entityId: number,
   entityType: AccessType,
   initialRole: EntityRoleType,
   newRole: EntityRoleType
@@ -350,7 +349,7 @@ export const changeRoleForEntity = (
 
 export const toEntityAccess = (
   entityRoles: EntityAccess[],
-  entityIds: EntityId[],
+  entityIds: number[],
   roleName: EntityRoleType,
   roleType: AccessType
 ): EntityAccess[] => {
@@ -392,7 +391,7 @@ export const toEntityAccess = (
 export const deleteUserEntity = (
   entityRoles: EntityAccess[],
   roleName: EntityRoleType,
-  entityId: EntityId,
+  entityId: number,
   entityType: AccessType
 ): EntityAccess[] => {
   return entityRoles
diff --git a/packages/manager/src/features/IAM/Users/UserEntities/UserEntities.test.tsx b/packages/manager/src/features/IAM/Users/UserEntities/UserEntities.test.tsx
index 7250ecf2ebf..1858996f4ea 100644
--- a/packages/manager/src/features/IAM/Users/UserEntities/UserEntities.test.tsx
+++ b/packages/manager/src/features/IAM/Users/UserEntities/UserEntities.test.tsx
@@ -22,12 +22,12 @@ const mockEntities = [
 ];
 
 const queryMocks = vi.hoisted(() => ({
+  useAllAccountEntities: vi.fn().mockReturnValue({}),
   useParams: vi.fn().mockReturnValue({}),
   useSearch: vi.fn().mockReturnValue({}),
   useAccountRoles: vi.fn().mockReturnValue({}),
   useUserRoles: vi.fn().mockReturnValue({}),
   usePermissions: vi.fn().mockReturnValue({}),
-  useGetUserEntities: vi.fn().mockReturnValue({}),
 }));
 
 vi.mock('@linode/queries', async () => {
@@ -39,9 +39,13 @@ vi.mock('@linode/queries', async () => {
   };
 });
 
-vi.mock('../../hooks/useGetUserEntities', () => ({
-  useGetUserEntities: queryMocks.useGetUserEntities,
-}));
+vi.mock('src/queries/entities/entities', async () => {
+  const actual = await vi.importActual('src/queries/entities/entities');
+  return {
+    ...actual,
+    useAllAccountEntities: queryMocks.useAllAccountEntities,
+  };
+});
 
 vi.mock('@tanstack/react-router', async () => {
   const actual = await vi.importActual('@tanstack/react-router');
@@ -116,10 +120,8 @@ describe('UserEntities', () => {
       data: accountRolesFactory.build(),
     });
 
-    queryMocks.useGetUserEntities.mockReturnValue({
-      userEntities: mockEntities,
-      isLoading: false,
-      error: null,
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
     });
 
     renderWithTheme(<UserEntities />);
diff --git a/packages/manager/src/features/IAM/Users/UserEntities/utils.ts b/packages/manager/src/features/IAM/Users/UserEntities/utils.ts
index e13d899ceca..32bd33907b5 100644
--- a/packages/manager/src/features/IAM/Users/UserEntities/utils.ts
+++ b/packages/manager/src/features/IAM/Users/UserEntities/utils.ts
@@ -11,7 +11,7 @@ export const addEntityNamesToRoles = (
   assignedRoles: IamUserRoles,
   entities: Map<EntityType, Pick<AccountEntity, 'id' | 'label'>[]>
 ): EntitiesRole[] => {
-  const entitiesRoles = assignedRoles.entity_access ?? [];
+  const entitiesRoles = assignedRoles.entity_access;
 
   return entitiesRoles.flatMap((entityRole: EntityAccess) => {
     const entityByType = entities.get(entityRole.type as EntityType);
diff --git a/packages/manager/src/features/IAM/Users/UserRoles/UserRoles.test.tsx b/packages/manager/src/features/IAM/Users/UserRoles/UserRoles.test.tsx
index d4b76f90c1b..3565e7d17c2 100644
--- a/packages/manager/src/features/IAM/Users/UserRoles/UserRoles.test.tsx
+++ b/packages/manager/src/features/IAM/Users/UserRoles/UserRoles.test.tsx
@@ -21,12 +21,12 @@ const mockEntities = [
 ];
 
 const queryMocks = vi.hoisted(() => ({
+  useAllAccountEntities: vi.fn().mockReturnValue({}),
   useParams: vi.fn().mockReturnValue({}),
   useSearch: vi.fn().mockReturnValue({}),
   useAccountRoles: vi.fn().mockReturnValue({}),
   useUserRoles: vi.fn().mockReturnValue({}),
   usePermissions: vi.fn().mockReturnValue({}),
-  useGetUserEntities: vi.fn().mockReturnValue({}),
 }));
 
 vi.mock('@linode/queries', async () => {
@@ -38,9 +38,13 @@ vi.mock('@linode/queries', async () => {
   };
 });
 
-vi.mock('../../hooks/useGetUserEntities', () => ({
-  useGetUserEntities: queryMocks.useGetUserEntities,
-}));
+vi.mock('src/queries/entities/entities', async () => {
+  const actual = await vi.importActual('src/queries/entities/entities');
+  return {
+    ...actual,
+    useAllAccountEntities: queryMocks.useAllAccountEntities,
+  };
+});
 
 vi.mock('@tanstack/react-router', async () => {
   const actual = await vi.importActual('@tanstack/react-router');
@@ -72,11 +76,6 @@ describe('UserRoles', () => {
         is_account_admin: true,
       },
     });
-    queryMocks.useGetUserEntities.mockReturnValue({
-      userEntities: mockEntities,
-      isLoading: false,
-      error: null,
-    });
   });
 
   it('should display no roles text if no roles are assigned to user', async () => {
@@ -108,6 +107,10 @@ describe('UserRoles', () => {
       data: accountRolesFactory.build(),
     });
 
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
+    });
+
     renderWithTheme(<UserRoles />);
 
     expect(
@@ -136,6 +139,10 @@ describe('UserRoles', () => {
       data: accountRolesFactory.build(),
     });
 
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
+    });
+
     renderWithTheme(<UserRoles />);
 
     expect(screen.getByText('firewall_admin')).toBeVisible();
@@ -159,6 +166,10 @@ describe('UserRoles', () => {
       data: accountRolesFactory.build(),
     });
 
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
+    });
+
     renderWithTheme(<UserRoles />);
 
     expect(screen.getByText('account_admin')).toBeVisible();
@@ -173,6 +184,10 @@ describe('UserRoles', () => {
       data: accountRolesFactory.build(),
     });
 
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
+    });
+
     renderWithTheme(<UserRoles />);
 
     expect(screen.getByText('account_linode_admin')).toBeVisible();
diff --git a/packages/manager/src/features/IAM/hooks/useGetUserEntities.test.ts b/packages/manager/src/features/IAM/hooks/useGetUserEntities.test.ts
deleted file mode 100644
index d7856365247..00000000000
--- a/packages/manager/src/features/IAM/hooks/useGetUserEntities.test.ts
+++ /dev/null
@@ -1,407 +0,0 @@
-import { renderHook } from '@testing-library/react';
-
-import { wrapWithTheme } from 'src/utilities/testHelpers';
-
-import { useGetUserEntities } from './useGetUserEntities';
-
-import type {
-  EntityAccess,
-  EntityByPermission,
-  EntityType,
-  IamUserRoles,
-} from '@linode/api-v4';
-
-const queryMocks = vi.hoisted(() => ({
-  useQueries: vi.fn().mockReturnValue({}),
-}));
-
-const iamQueriesMock = vi.hoisted(() => ({
-  user: vi.fn().mockReturnValue({}),
-}));
-
-vi.mock('@linode/queries', async () => {
-  const actual = await vi.importActual('@linode/queries');
-  return {
-    ...actual,
-    iamQueries: iamQueriesMock,
-    useQueries: queryMocks.useQueries,
-  };
-});
-
-describe('useGetUserEntities', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-
-    iamQueriesMock.user.mockReturnValue({
-      _ctx: {
-        allUserEntities: vi.fn().mockReturnValue({
-          queryKey: ['user-entities'],
-          queryFn: vi.fn(),
-        }),
-      },
-    });
-  });
-
-  const createMockUserRoles = (
-    entityAccess: Array<{ id: number | string; roles: string[]; type: string }>
-  ): IamUserRoles => ({
-    account_access: [],
-    entity_access: entityAccess as EntityAccess[],
-  });
-
-  const createMockEntities = (
-    entities: Array<{ id: number | string; label: string; type: string }>
-  ): EntityByPermission[] =>
-    entities.map((e) => ({
-      id: e.id,
-      label: e.label,
-      type: e.type as EntityType,
-    }));
-
-  it('should return undefined entities when userRoles is undefined', () => {
-    queryMocks.useQueries.mockReturnValue([]);
-
-    const { result } = renderHook(
-      () =>
-        useGetUserEntities({
-          username: 'test-user',
-          userRoles: undefined,
-        }),
-      {
-        wrapper: (ui) => wrapWithTheme(ui),
-      }
-    );
-
-    expect(result.current.userEntities).toEqual([]);
-    expect(result.current.isLoading).toBe(false);
-  });
-
-  it('should fetch entities for all entity types in userRoles', () => {
-    const mockUserRoles = createMockUserRoles([
-      { id: 1, type: 'linode', roles: ['linode_admin'] },
-      { id: 2, type: 'volume', roles: ['volume_viewer'] },
-      { id: 3, type: 'firewall', roles: ['firewall_editor'] },
-    ]);
-
-    queryMocks.useQueries.mockReturnValue([
-      { data: [], isLoading: false, error: null },
-      { data: [], isLoading: false, error: null },
-      { data: [], isLoading: false, error: null },
-    ]);
-
-    renderHook(
-      () =>
-        useGetUserEntities({
-          username: 'test-user',
-          userRoles: mockUserRoles,
-        }),
-      {
-        wrapper: (ui) => wrapWithTheme(ui),
-      }
-    );
-
-    // Verify useQueries was called with correct configuration
-    expect(queryMocks.useQueries).toHaveBeenCalledWith(
-      expect.objectContaining({
-        queries: expect.arrayContaining([
-          expect.objectContaining({
-            enabled: true,
-            staleTime: 1 * 60 * 1000, // 1 minute
-          }),
-        ]),
-      })
-    );
-  });
-
-  it('should combine entities from multiple entity types', async () => {
-    const mockUserRoles = createMockUserRoles([
-      { id: 123, type: 'linode', roles: ['linode_admin'] },
-      { id: 456, type: 'volume', roles: ['volume_viewer'] },
-    ]);
-
-    const linodeEntities = createMockEntities([
-      { id: 123, label: 'my-linode-1', type: 'linode' },
-      { id: 124, label: 'my-linode-2', type: 'linode' },
-    ]);
-
-    const volumeEntities = createMockEntities([
-      { id: 456, label: 'my-volume-1', type: 'volume' },
-    ]);
-
-    queryMocks.useQueries.mockReturnValue([
-      { data: linodeEntities, isLoading: false, error: null },
-      { data: volumeEntities, isLoading: false, error: null },
-    ]);
-
-    const { result } = renderHook(
-      () =>
-        useGetUserEntities({
-          username: 'test-user',
-          userRoles: mockUserRoles,
-        }),
-      {
-        wrapper: (ui) => wrapWithTheme(ui),
-      }
-    );
-
-    expect(result.current.userEntities).toHaveLength(3);
-    expect(result.current.userEntities).toEqual([
-      ...linodeEntities,
-      ...volumeEntities,
-    ]);
-    expect(result.current.isLoading).toBe(false);
-  });
-
-  it('should handle loading state correctly', () => {
-    const mockUserRoles = createMockUserRoles([
-      { id: 1, type: 'linode', roles: ['linode_admin'] },
-    ]);
-
-    queryMocks.useQueries.mockReturnValue([
-      { data: undefined, isLoading: true, error: null },
-    ]);
-
-    const { result } = renderHook(
-      () =>
-        useGetUserEntities({
-          username: 'test-user',
-          userRoles: mockUserRoles,
-        }),
-      {
-        wrapper: (ui) => wrapWithTheme(ui),
-      }
-    );
-
-    expect(result.current.isLoading).toBe(true);
-    expect(result.current.userEntities).toBeUndefined();
-  });
-
-  it('should handle error state correctly', () => {
-    const mockUserRoles = createMockUserRoles([
-      { id: 1, type: 'linode', roles: ['linode_admin'] },
-    ]);
-
-    const mockError = new Error('Failed to fetch');
-    queryMocks.useQueries.mockReturnValue([
-      { data: undefined, isLoading: false, error: mockError },
-    ]);
-
-    const { result } = renderHook(
-      () =>
-        useGetUserEntities({
-          username: 'test-user',
-          userRoles: mockUserRoles,
-        }),
-      {
-        wrapper: (ui) => wrapWithTheme(ui),
-      }
-    );
-
-    expect(result.current.error).toBe(true);
-    expect(result.current.isLoading).toBe(false);
-  });
-
-  it('should handle mixed numeric and string entity IDs (for images)', async () => {
-    const mockUserRoles = createMockUserRoles([
-      { id: 123, type: 'linode', roles: ['linode_admin'] },
-      { id: 'private/456', type: 'image', roles: ['image_viewer'] },
-    ]);
-
-    const mixedEntities = [
-      createMockEntities([{ id: 123, label: 'my-linode', type: 'linode' }]),
-      createMockEntities([
-        { id: 'private/456', label: 'my-image', type: 'image' },
-      ]),
-    ];
-
-    queryMocks.useQueries.mockReturnValue([
-      { data: mixedEntities[0], isLoading: false, error: null },
-      { data: mixedEntities[1], isLoading: false, error: null },
-    ]);
-
-    const { result } = renderHook(
-      () =>
-        useGetUserEntities({
-          username: 'test-user',
-          userRoles: mockUserRoles,
-        }),
-      {
-        wrapper: (ui) => wrapWithTheme(ui),
-      }
-    );
-
-    expect(result.current.userEntities).toHaveLength(2);
-    expect(result.current.userEntities?.[0].id).toBe(123);
-    expect(result.current.userEntities?.[1].id).toBe('private/456');
-  });
-
-  it('should handle empty entity_access array', () => {
-    const mockUserRoles = createMockUserRoles([]);
-
-    queryMocks.useQueries.mockReturnValue([]);
-
-    const { result } = renderHook(
-      () =>
-        useGetUserEntities({
-          username: 'test-user',
-          userRoles: mockUserRoles,
-        }),
-      {
-        wrapper: (ui) => wrapWithTheme(ui),
-      }
-    );
-
-    expect(result.current.userEntities).toEqual([]);
-    expect(result.current.isLoading).toBe(false);
-  });
-
-  it('should set enabled to false when username is empty', () => {
-    const mockUserRoles = createMockUserRoles([
-      { id: 1, type: 'linode', roles: ['linode_admin'] },
-    ]);
-
-    queryMocks.useQueries.mockReturnValue([
-      { data: [], isLoading: false, error: null },
-    ]);
-
-    renderHook(
-      () =>
-        useGetUserEntities({
-          username: '',
-          userRoles: mockUserRoles,
-        }),
-      {
-        wrapper: (ui) => wrapWithTheme(ui),
-      }
-    );
-
-    const callArgs = queryMocks.useQueries.mock.calls[0][0];
-    expect(callArgs.queries[0].enabled).toBe(false);
-  });
-
-  it('should handle partial loading when some queries complete before others', () => {
-    const mockUserRoles = createMockUserRoles([
-      { id: 1, type: 'linode', roles: ['linode_admin'] },
-      { id: 2, type: 'volume', roles: ['volume_viewer'] },
-    ]);
-
-    queryMocks.useQueries.mockReturnValue([
-      {
-        data: [{ id: 1, label: 'linode-1', type: 'linode' }],
-        isLoading: false,
-        error: null,
-      },
-      { data: undefined, isLoading: true, error: null },
-    ]);
-
-    const { result } = renderHook(
-      () =>
-        useGetUserEntities({
-          username: 'test-user',
-          userRoles: mockUserRoles,
-        }),
-      {
-        wrapper: (ui) => wrapWithTheme(ui),
-      }
-    );
-
-    // Should show loading if any query is loading
-    expect(result.current.isLoading).toBe(true);
-    expect(result.current.userEntities).toBeUndefined();
-  });
-
-  it('should flatten nested entity arrays correctly', async () => {
-    const mockUserRoles = createMockUserRoles([
-      { id: 1, type: 'linode', roles: ['linode_admin'] },
-      { id: 2, type: 'volume', roles: ['volume_viewer'] },
-    ]);
-
-    const mockEntities1 = createMockEntities([
-      { id: 1, label: 'entity-1', type: 'linode' },
-      { id: 2, label: 'entity-2', type: 'linode' },
-    ]);
-
-    const mockEntities2 = createMockEntities([
-      { id: 3, label: 'entity-3', type: 'volume' },
-    ]);
-
-    queryMocks.useQueries.mockReturnValue([
-      { data: mockEntities1, isLoading: false, error: null },
-      { data: mockEntities2, isLoading: false, error: null },
-    ]);
-
-    const { result } = renderHook(
-      () =>
-        useGetUserEntities({
-          username: 'test-user',
-          userRoles: mockUserRoles,
-        }),
-      {
-        wrapper: (ui) => wrapWithTheme(ui),
-      }
-    );
-
-    expect(result.current.userEntities).toHaveLength(3);
-    expect(result.current.userEntities).toEqual([
-      ...mockEntities1,
-      ...mockEntities2,
-    ]);
-  });
-
-  it('should handle queries with undefined data gracefully', async () => {
-    const mockUserRoles = createMockUserRoles([
-      { id: 1, type: 'linode', roles: ['linode_admin'] },
-      { id: 2, type: 'volume', roles: ['volume_viewer'] },
-    ]);
-
-    queryMocks.useQueries.mockReturnValue([
-      { data: undefined, isLoading: false, error: null },
-      {
-        data: [{ id: 2, label: 'volume-1', type: 'volume' }],
-        isLoading: false,
-        error: null,
-      },
-    ]);
-
-    const { result } = renderHook(
-      () =>
-        useGetUserEntities({
-          username: 'test-user',
-          userRoles: mockUserRoles,
-        }),
-      {
-        wrapper: (ui) => wrapWithTheme(ui),
-      }
-    );
-
-    expect(result.current.userEntities).toHaveLength(1);
-    expect(result.current.userEntities?.[0].id).toBe(2);
-    expect(result.current.isLoading).toBe(false);
-  });
-
-  it('should call iamQueries with correct username for each entity type', () => {
-    const mockUserRoles = createMockUserRoles([
-      { id: 1, type: 'linode', roles: ['linode_admin'] },
-      { id: 2, type: 'firewall', roles: ['firewall_viewer'] },
-    ]);
-
-    queryMocks.useQueries.mockReturnValue([
-      { data: [], isLoading: false, error: null },
-      { data: [], isLoading: false, error: null },
-    ]);
-
-    renderHook(
-      () =>
-        useGetUserEntities({
-          username: 'test-user',
-          userRoles: mockUserRoles,
-        }),
-      {
-        wrapper: (ui) => wrapWithTheme(ui),
-      }
-    );
-
-    expect(iamQueriesMock.user).toHaveBeenCalledWith('test-user');
-    expect(iamQueriesMock.user()._ctx.allUserEntities).toHaveBeenCalledTimes(2);
-  });
-});
diff --git a/packages/manager/src/features/IAM/hooks/useGetUserEntities.ts b/packages/manager/src/features/IAM/hooks/useGetUserEntities.ts
deleted file mode 100644
index 0874eb022d0..00000000000
--- a/packages/manager/src/features/IAM/hooks/useGetUserEntities.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { iamQueries, useQueries } from '@linode/queries';
-import * as React from 'react';
-
-import type { IamUserRoles } from '@linode/api-v4';
-
-interface UseGetUserEntitiesProps {
-  username: string;
-  userRoles: IamUserRoles | undefined;
-}
-
-/**
- * This hook gets all entities a user has the lowest level of access to.
- *
- * In order to get all entities for an account, use the useAllAccountEntities hook.
- */
-export const useGetUserEntities = (props: UseGetUserEntitiesProps) => {
-  const { userRoles, username } = props;
-
-  /**
-   * Get the types of entities the user has access to by mapping over the user roles.
-   * This is used to determine which entity types to query for.
-   */
-  const entityTypes = React.useMemo(() => {
-    return userRoles?.entity_access?.map((entity) => entity.type) ?? [];
-  }, [userRoles]);
-
-  /**
-   * Get the entities for each entity type via /iam/users/${username}/entities/${entityType}
-   * While this endpoint can be filtered by permission, omitting the permission parameter will return all entities the user has any access to, starting at the lowest level of access (view_{entity_type}).
-   */
-  const entityQueries = useQueries({
-    queries: entityTypes.map((type) => ({
-      ...iamQueries.user(username ?? '')._ctx.allUserEntities(type),
-      enabled: !!username,
-      // Because entities can be added or removed from the account at any time, and we don't invalidate the query when this happens,
-      // we need to set a short stale time to ensure the data is up to date.
-      staleTime: 1 * 60 * 1000, // 1 minute stale time
-    })),
-  });
-
-  /**
-   * Combine the entities from each entity type into a single array.
-   */
-  const { entities, isLoading, error } = React.useMemo(() => {
-    const isLoading = entityQueries.some((q) => q.isLoading);
-    const error = entityQueries.some((q) => q.error);
-
-    if (isLoading) {
-      return { entities: undefined, isLoading: true };
-    }
-
-    const entities = entityQueries.map((q) => q.data || []).flat();
-
-    return { entities, error, isLoading: false };
-  }, [entityQueries]);
-
-  return { userEntities: entities, isLoading, error };
-};
diff --git a/packages/queries/src/iam/keys.ts b/packages/queries/src/iam/keys.ts
index a57374d04e7..41068e0d9d9 100644
--- a/packages/queries/src/iam/keys.ts
+++ b/packages/queries/src/iam/keys.ts
@@ -1,7 +1,6 @@
 import {
   getAccountRoles,
   getUserAccountPermissions,
-  getUserEntities,
   getUserEntitiesByPermission,
   getUserEntityPermissions,
   getUserRoles,
@@ -13,7 +12,6 @@ import type {
   AccessType,
   EntityByPermission,
   GetEntitiesByPermissionParams,
-  Params,
   PermissionType,
 } from '@linode/api-v4';
 
@@ -59,20 +57,6 @@ export const iamQueries = createQueryKeys('iam', {
           }).then((res) => res.data ?? []),
         queryKey: [entityType, permission],
       }),
-      userEntities: (entityType: AccessType, params: Params = {}) => ({
-        queryFn: () =>
-          getUserEntities({ username, entityType, params }).then(
-            (res) => res.data,
-          ),
-        queryKey: [entityType, params],
-      }),
-      allUserEntities: (entityType: AccessType) => ({
-        queryFn: () =>
-          getAll<EntityByPermission>((params) =>
-            getUserEntities({ username, entityType, params }),
-          )().then((data) => data.data),
-        queryKey: [entityType, 'all'],
-      }),
     },
     queryKey: [username],
   }),

From 9147732d6ed515506fb3e536e29099aae6199b87 Mon Sep 17 00:00:00 2001
From: Alban Bailly <130582365+abailly-akamai@users.noreply.github.com>
Date: Thu, 4 Dec 2025 17:20:31 +0100
Subject: [PATCH 76/91] fix: [UIE-9661] - oAuth callback improvements (#13105)

* oAuth callback improvements

* cleanup
---
 packages/manager/src/OAuth/OAuthCallback.tsx  | 66 ++++++++++++++-----
 packages/manager/src/OAuth/oauth.ts           | 13 ++--
 packages/manager/src/OAuth/types.ts           |  2 +-
 .../src/features/IAM/hooks/useIsIAMEnabled.ts |  4 +-
 packages/manager/src/routes/auth/index.ts     |  7 ++
 5 files changed, 70 insertions(+), 22 deletions(-)

diff --git a/packages/manager/src/OAuth/OAuthCallback.tsx b/packages/manager/src/OAuth/OAuthCallback.tsx
index 454bea3f446..28a3ff2ea49 100644
--- a/packages/manager/src/OAuth/OAuthCallback.tsx
+++ b/packages/manager/src/OAuth/OAuthCallback.tsx
@@ -1,11 +1,14 @@
 import * as Sentry from '@sentry/react';
 import { useNavigate } from '@tanstack/react-router';
+import { useSearch } from '@tanstack/react-router';
 import React from 'react';
 
 import { SplashScreen } from 'src/components/SplashScreen';
 
 import { clearStorageAndRedirectToLogout, handleOAuthCallback } from './oauth';
 
+import type { LinkProps } from '@tanstack/react-router';
+
 /**
  * Login will redirect back to Cloud Manager with a URL like:
  * https://cloud.linode.com/oauth/callback?returnTo=%2F&state=066a6ad9-b19a-43bb-b99a-ef0b5d4fc58d&code=42ddf75dfa2cacbad897
@@ -14,24 +17,57 @@ import { clearStorageAndRedirectToLogout, handleOAuthCallback } from './oauth';
  */
 export const OAuthCallback = () => {
   const navigate = useNavigate();
-  const authenticate = async () => {
-    try {
-      const { returnTo } = await handleOAuthCallback({
-        params: location.search,
-      });
-
-      navigate({ to: returnTo });
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.error(error);
-      Sentry.captureException(error);
-      clearStorageAndRedirectToLogout();
-    }
-  };
+  const search = useSearch({
+    from: '/oauth/callback',
+  });
+
+  const hasStartedAuth = React.useRef(false);
+  const isAuthenticating = React.useRef(false);
 
   React.useEffect(() => {
+    // Prevent running if already started or currently running
+    if (hasStartedAuth.current || isAuthenticating.current) {
+      return;
+    }
+
+    hasStartedAuth.current = true;
+    isAuthenticating.current = true;
+
+    const authenticate = async () => {
+      try {
+        const { returnTo } = await handleOAuthCallback({
+          params: search,
+        });
+
+        // None of these paths are valid return destinations
+        const invalidReturnToPaths: LinkProps['to'][] = [
+          '/logout',
+          '/admin/callback',
+          '/oauth/callback',
+          '/cancel',
+        ];
+
+        const isInvalidReturnTo =
+          !returnTo || invalidReturnToPaths.some((path) => returnTo === path);
+
+        if (isInvalidReturnTo) {
+          navigate({ to: '/' });
+          return;
+        }
+
+        navigate({ to: returnTo });
+      } catch (error) {
+        // eslint-disable-next-line no-console
+        console.error(error);
+        Sentry.captureException(error);
+        clearStorageAndRedirectToLogout();
+      } finally {
+        isAuthenticating.current = false;
+      }
+    };
+
     authenticate();
-  }, []);
+  }, [navigate, search]);
 
   return <SplashScreen />;
 };
diff --git a/packages/manager/src/OAuth/oauth.ts b/packages/manager/src/OAuth/oauth.ts
index 85b08c4618b..3d111dbecbe 100644
--- a/packages/manager/src/OAuth/oauth.ts
+++ b/packages/manager/src/OAuth/oauth.ts
@@ -187,10 +187,13 @@ export async function redirectToLogin() {
  * @returns Some information about the new session because authentication was successfull
  */
 export async function handleOAuthCallback(options: AuthCallbackOptions) {
+  const paramsObject =
+    typeof options.params === 'string'
+      ? getQueryParamsFromQueryString(options.params)
+      : options.params;
+
   const { data: params, error: parseParamsError } = await tryCatch(
-    OAuthCallbackParamsSchema.validate(
-      getQueryParamsFromQueryString(options.params)
-    )
+    OAuthCallbackParamsSchema.validate(paramsObject)
   );
 
   if (parseParamsError) {
@@ -296,7 +299,9 @@ export async function handleLoginAsCustomerCallback(
 ) {
   const { data: params, error } = await tryCatch(
     LoginAsCustomerCallbackParamsSchema.validate(
-      getQueryParamsFromQueryString(options.params)
+      typeof options.params === 'string'
+        ? getQueryParamsFromQueryString(options.params)
+        : options.params
     )
   );
 
diff --git a/packages/manager/src/OAuth/types.ts b/packages/manager/src/OAuth/types.ts
index 6dd3e5d14a4..e0b5b0e3fe1 100644
--- a/packages/manager/src/OAuth/types.ts
+++ b/packages/manager/src/OAuth/types.ts
@@ -61,7 +61,7 @@ export interface AuthCallbackOptions {
   /**
    * The raw search or has params sent by the login server
    */
-  params: string;
+  params: Record<string, unknown> | string;
 }
 
 /**
diff --git a/packages/manager/src/features/IAM/hooks/useIsIAMEnabled.ts b/packages/manager/src/features/IAM/hooks/useIsIAMEnabled.ts
index 30024a756b7..8d5fc172f1e 100644
--- a/packages/manager/src/features/IAM/hooks/useIsIAMEnabled.ts
+++ b/packages/manager/src/features/IAM/hooks/useIsIAMEnabled.ts
@@ -50,12 +50,12 @@ export const checkIAMEnabled = async (
   flags: FlagSet,
   profile: Profile | undefined
 ): Promise<boolean> => {
-  if (!flags?.iam?.enabled) {
+  if (!flags?.iam?.enabled || !profile) {
     return false;
   }
 
   try {
-    if (profile?.username) {
+    if (profile.username) {
       // For restricted users ONLY, get permissions
       const permissions = await queryClient.ensureQueryData(
         queryOptions(iamQueries.user(profile.username)._ctx.accountPermissions)
diff --git a/packages/manager/src/routes/auth/index.ts b/packages/manager/src/routes/auth/index.ts
index 8b91f930a0d..43ad01f2c6f 100644
--- a/packages/manager/src/routes/auth/index.ts
+++ b/packages/manager/src/routes/auth/index.ts
@@ -7,6 +7,12 @@ import { OAuthCallback } from 'src/OAuth/OAuthCallback';
 
 import { rootRoute } from '../root';
 
+interface OAuthCallbackSearch {
+  code?: string;
+  returnTo?: string;
+  state?: string;
+}
+
 interface CancelLandingSearch {
   survey_link?: string;
 }
@@ -34,6 +40,7 @@ const oauthCallbackRoute = createRoute({
   getParentRoute: () => rootRoute,
   path: 'oauth/callback',
   component: OAuthCallback,
+  validateSearch: (search: OAuthCallbackSearch) => search,
 });
 
 export {

From fc409271ad0ea242c0b0ed0131352edf64ddc0fd Mon Sep 17 00:00:00 2001
From: Purvesh Makode <pmakode@akamai.com>
Date: Fri, 5 Dec 2025 14:04:57 +0530
Subject: [PATCH 77/91] upcoming: [UIE-9730] - Add Beta/New Feature Chip
 Support for RuleSets and Prefix Lists (#13164)

* Update tests and fix typo

* Added changeset: Integrate Prefix List details drawer with Edit and Add Rule drawer

* Add tests for handleOpenPrefixListDrawer call on click of View Details

* Update ruleset details drawer button text from cancel to close

* Change from Link to LinkButton

* Update mock protocol

* Add beta or new feature chip support for firewall RS & PL

* Add tests and do not display chip for edit mode

* Added changeset: Add Beta/New feature Chip support for RuleSets and Prefix Lists
---
 ...r-13164-upcoming-features-1764838771826.md |  5 +++
 .../Rules/FirewallPrefixListDrawer.tsx        | 19 +++++++--
 .../Rules/FirewallRuleDrawer.test.tsx         | 21 ++++++++++
 .../Rules/FirewallRuleDrawer.tsx              | 29 +++++++++++--
 .../Rules/MultiplePrefixListSelect.tsx        | 14 +++++--
 .../src/features/Firewalls/shared.test.tsx    | 41 +++++++++++++++++++
 .../manager/src/features/Firewalls/shared.tsx | 23 ++++++++++-
 packages/ui/src/components/Drawer/Drawer.tsx  |  6 ++-
 8 files changed, 146 insertions(+), 12 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13164-upcoming-features-1764838771826.md

diff --git a/packages/manager/.changeset/pr-13164-upcoming-features-1764838771826.md b/packages/manager/.changeset/pr-13164-upcoming-features-1764838771826.md
new file mode 100644
index 00000000000..8276febb6be
--- /dev/null
+++ b/packages/manager/.changeset/pr-13164-upcoming-features-1764838771826.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Add Beta/New feature Chip support for RuleSets and Prefix Lists ([#13164](https://github.com/linode/manager/pull/13164))
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx
index a1292f39f11..083634c3063 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx
@@ -7,7 +7,10 @@ import ArrowLeftIcon from 'src/assets/icons/arrow-left.svg';
 import { CopyTooltip } from 'src/components/CopyTooltip/CopyTooltip';
 import { DateTimeDisplay } from 'src/components/DateTimeDisplay';
 
-import { useIsFirewallRulesetsPrefixlistsEnabled } from '../../shared';
+import {
+  getFeatureChip,
+  useIsFirewallRulesetsPrefixlistsEnabled,
+} from '../../shared';
 import {
   getPrefixListType,
   PREFIXLIST_MARKED_FOR_DELETION_TEXT,
@@ -42,8 +45,11 @@ export const FirewallPrefixListDrawer = React.memo(
     const { category, context, onClose, isOpen, selectedPrefixListLabel } =
       props;
 
-    const { isFirewallRulesetsPrefixlistsFeatureEnabled } =
-      useIsFirewallRulesetsPrefixlistsEnabled();
+    const {
+      isFirewallRulesetsPrefixlistsFeatureEnabled,
+      isFirewallRulesetsPrefixListsBetaEnabled,
+      isFirewallRulesetsPrefixListsGAEnabled,
+    } = useIsFirewallRulesetsPrefixlistsEnabled();
     const { classes } = useStyles();
 
     const { data, error, isFetching } = useAllFirewallPrefixListsQuery(
@@ -118,6 +124,13 @@ export const FirewallPrefixListDrawer = React.memo(
         onClose={() => onClose({ closeAll: true })}
         open={isOpen}
         title={titleText}
+        titleSuffix={
+          getFeatureChip({
+            isFirewallRulesetsPrefixlistsFeatureEnabled,
+            isFirewallRulesetsPrefixListsBetaEnabled,
+            isFirewallRulesetsPrefixListsGAEnabled,
+          }) ?? undefined
+        }
       >
         <Box mt={2}>
           {prefixListDetails && (
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
index 57b88c41801..7e63e292910 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
@@ -1,4 +1,5 @@
 import { capitalize } from '@linode/utilities';
+import { within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import * as React from 'react';
 
@@ -272,6 +273,26 @@ describe('ViewRuleSetDetailsDrawer', () => {
   );
 });
 
+describe('EditRuleDrawer', () => {
+  it('should not show the Firewall RS & PL feature chip in the title in Edit mode', () => {
+    spy.mockReturnValue({
+      isFirewallRulesetsPrefixlistsFeatureEnabled: true,
+      isFirewallRulesetsPrefixListsBetaEnabled: true,
+      isFirewallRulesetsPrefixListsLAEnabled: false,
+      isFirewallRulesetsPrefixListsGAEnabled: false,
+    });
+
+    const { getByTestId } = renderWithTheme(
+      <FirewallRuleDrawer {...props} mode="edit" />
+    );
+
+    const titleContainer = getByTestId('drawer-title-container');
+
+    // The beta (chip) should NOT be in the title area
+    expect(within(titleContainer).queryByText('beta')).not.toBeInTheDocument();
+  });
+});
+
 describe('utilities', () => {
   describe('formValueToIPs', () => {
     it('returns a complete set of IPs given a string form value', () => {
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
index ec7d525a2f0..91a6ba75d78 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
@@ -6,7 +6,10 @@ import * as React from 'react';
 
 import { SelectionCard } from 'src/components/SelectionCard/SelectionCard';
 
-import { useIsFirewallRulesetsPrefixlistsEnabled } from '../../shared';
+import {
+  getFeatureChip,
+  useIsFirewallRulesetsPrefixlistsEnabled,
+} from '../../shared';
 import {
   formValueToIPs,
   getInitialFormValues,
@@ -50,8 +53,11 @@ export const FirewallRuleDrawer = React.memo(
       ruleToModifyOrView,
     } = props;
 
-    const { isFirewallRulesetsPrefixlistsFeatureEnabled } =
-      useIsFirewallRulesetsPrefixlistsEnabled();
+    const {
+      isFirewallRulesetsPrefixlistsFeatureEnabled,
+      isFirewallRulesetsPrefixListsBetaEnabled,
+      isFirewallRulesetsPrefixListsGAEnabled,
+    } = useIsFirewallRulesetsPrefixlistsEnabled();
 
     /**
      * State for the type of entity being created: either a firewall 'rule' or
@@ -189,8 +195,23 @@ export const FirewallRuleDrawer = React.memo(
       return errors;
     };
 
+    const featureChip =
+      getFeatureChip({
+        isFirewallRulesetsPrefixlistsFeatureEnabled,
+        isFirewallRulesetsPrefixListsBetaEnabled,
+        isFirewallRulesetsPrefixListsGAEnabled,
+      }) ?? undefined;
+
+    // Do not show the Firewall RS & PL feature chip in Edit mode drawer title
+    const titleSuffix = mode === 'edit' ? undefined : featureChip;
+
     return (
-      <Drawer onClose={onClose} open={isOpen} title={title}>
+      <Drawer
+        onClose={onClose}
+        open={isOpen}
+        title={title}
+        titleSuffix={titleSuffix}
+      >
         {mode === 'create' && isFirewallRulesetsPrefixlistsFeatureEnabled && (
           <Grid container spacing={2}>
             {firewallRuleCreateOptions.map((option) => (
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MultiplePrefixListSelect.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MultiplePrefixListSelect.tsx
index 91525de7216..67e3312427f 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MultiplePrefixListSelect.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MultiplePrefixListSelect.tsx
@@ -1,7 +1,6 @@
 import { useAllFirewallPrefixListsQuery } from '@linode/queries';
 import {
   Autocomplete,
-  BetaChip,
   Box,
   Button,
   Checkbox,
@@ -15,7 +14,10 @@ import Grid from '@mui/material/Grid';
 import * as React from 'react';
 import { makeStyles } from 'tss-react/mui';
 
-import { useIsFirewallRulesetsPrefixlistsEnabled } from 'src/features/Firewalls/shared';
+import {
+  getFeatureChip,
+  useIsFirewallRulesetsPrefixlistsEnabled,
+} from 'src/features/Firewalls/shared';
 
 import { getPrefixListType, groupPriority } from './shared';
 
@@ -121,7 +123,9 @@ export const MultiplePrefixListSelect = React.memo(
     const {
       isFirewallRulesetsPrefixlistsFeatureEnabled,
       isFirewallRulesetsPrefixListsBetaEnabled,
+      isFirewallRulesetsPrefixListsGAEnabled,
     } = useIsFirewallRulesetsPrefixlistsEnabled();
+
     const { data, isLoading } = useAllFirewallPrefixListsQuery(
       isFirewallRulesetsPrefixlistsFeatureEnabled
     );
@@ -326,7 +330,11 @@ export const MultiplePrefixListSelect = React.memo(
         {pls.length > 0 && (
           <Box display="flex">
             <InputLabel sx={{ margin: 0 }}>Prefix List</InputLabel>
-            {isFirewallRulesetsPrefixListsBetaEnabled && <BetaChip />}
+            {getFeatureChip({
+              isFirewallRulesetsPrefixlistsFeatureEnabled,
+              isFirewallRulesetsPrefixListsBetaEnabled,
+              isFirewallRulesetsPrefixListsGAEnabled,
+            })}
           </Box>
         )}
         <Stack spacing={1}>
diff --git a/packages/manager/src/features/Firewalls/shared.test.tsx b/packages/manager/src/features/Firewalls/shared.test.tsx
index 76ea95c6fe5..9a3605af7a0 100644
--- a/packages/manager/src/features/Firewalls/shared.test.tsx
+++ b/packages/manager/src/features/Firewalls/shared.test.tsx
@@ -11,6 +11,7 @@ import {
   buildPrefixListReferenceMap,
   generateAddressesLabel,
   generateAddressesLabelV2,
+  getFeatureChip,
   predefinedFirewallFromRule,
   useIsFirewallRulesetsPrefixlistsEnabled,
 } from './shared';
@@ -442,3 +443,43 @@ describe('useIsFirewallRulesetsPrefixlistsEnabled', () => {
     });
   });
 });
+
+describe('getFeatureChip', () => {
+  it('returns null if RS & PL feature is disabled', () => {
+    const result = getFeatureChip({
+      isFirewallRulesetsPrefixlistsFeatureEnabled: false,
+      isFirewallRulesetsPrefixListsBetaEnabled: false,
+      isFirewallRulesetsPrefixListsGAEnabled: false,
+    });
+    expect(result).toBeNull();
+  });
+
+  it('returns BetaChip if Firewall RS & PL feature is enabled and Beta is true', () => {
+    const result = getFeatureChip({
+      isFirewallRulesetsPrefixlistsFeatureEnabled: true,
+      isFirewallRulesetsPrefixListsBetaEnabled: true,
+      isFirewallRulesetsPrefixListsGAEnabled: false,
+    });
+    const { getByText } = renderWithTheme(<>{result}</>);
+    expect(getByText('beta')).toBeVisible();
+  });
+
+  it('returns NewFeatureChip if Firewall RS & PL feature is enabled, GA is true, and Beta is false', () => {
+    const result = getFeatureChip({
+      isFirewallRulesetsPrefixlistsFeatureEnabled: true,
+      isFirewallRulesetsPrefixListsBetaEnabled: false,
+      isFirewallRulesetsPrefixListsGAEnabled: true,
+    });
+    const { getByText } = renderWithTheme(<>{result}</>);
+    expect(getByText('new')).toBeVisible();
+  });
+
+  it('returns null if feature is enabled but neither Beta nor GA', () => {
+    const result = getFeatureChip({
+      isFirewallRulesetsPrefixlistsFeatureEnabled: true,
+      isFirewallRulesetsPrefixListsBetaEnabled: false,
+      isFirewallRulesetsPrefixListsGAEnabled: false,
+    });
+    expect(result).toBeNull();
+  });
+});
diff --git a/packages/manager/src/features/Firewalls/shared.tsx b/packages/manager/src/features/Firewalls/shared.tsx
index f9696d68960..289f0db6e39 100644
--- a/packages/manager/src/features/Firewalls/shared.tsx
+++ b/packages/manager/src/features/Firewalls/shared.tsx
@@ -1,4 +1,4 @@
-import { Box, Chip, Tooltip } from '@linode/ui';
+import { BetaChip, Box, Chip, NewFeatureChip, Tooltip } from '@linode/ui';
 import { capitalize, truncateAndJoinList } from '@linode/utilities';
 import React from 'react';
 
@@ -580,3 +580,24 @@ export const useIsFirewallRulesetsPrefixlistsEnabled = () => {
       flags.fwRulesetsPrefixLists?.ga ?? false,
   };
 };
+
+/**
+ * Returns the feature chip for Firewall Rulesets & Prefix Lists.
+ *
+ * - Shows `<BetaChip />` if the feature is in Beta.
+ * - Shows `<NewFeatureChip />` if the feature is in GA.
+ * - Returns `null` if the feature is disabled OR if the feature is enabled but no chip applies.
+ */
+export const getFeatureChip = ({
+  isFirewallRulesetsPrefixlistsFeatureEnabled,
+  isFirewallRulesetsPrefixListsBetaEnabled,
+  isFirewallRulesetsPrefixListsGAEnabled,
+}: Omit<
+  ReturnType<typeof useIsFirewallRulesetsPrefixlistsEnabled>,
+  'isFirewallRulesetsPrefixListsLAEnabled'
+>) => {
+  if (!isFirewallRulesetsPrefixlistsFeatureEnabled) return null;
+  if (isFirewallRulesetsPrefixListsBetaEnabled) return <BetaChip />;
+  if (isFirewallRulesetsPrefixListsGAEnabled) return <NewFeatureChip />;
+  return null;
+};
diff --git a/packages/ui/src/components/Drawer/Drawer.tsx b/packages/ui/src/components/Drawer/Drawer.tsx
index 8caad7bdd8a..eb9f423a13b 100644
--- a/packages/ui/src/components/Drawer/Drawer.tsx
+++ b/packages/ui/src/components/Drawer/Drawer.tsx
@@ -154,7 +154,11 @@ export const Drawer = React.forwardRef<HTMLDivElement, DrawerProps>(
         >
           <Grid>
             {isFetching ? null : (
-              <Box alignItems="center" display="flex">
+              <Box
+                alignItems="center"
+                data-testid="drawer-title-container"
+                display="flex"
+              >
                 <Typography
                   data-qa-drawer-title={lastTitleRef.current}
                   data-testid="drawer-title"

From 5f1733576e0cb507c38e486e0d9ecc1460d4a99d Mon Sep 17 00:00:00 2001
From: Dmytro Chyrva <dchyrva@akamai.com>
Date: Fri, 5 Dec 2025 10:09:29 +0100
Subject: [PATCH 78/91] new: STORIF-142 - Volume metrics hiding condition
 added. (#13162)

---
 .../manager/src/features/Volumes/VolumeDetails/VolumeDetails.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/manager/src/features/Volumes/VolumeDetails/VolumeDetails.tsx b/packages/manager/src/features/Volumes/VolumeDetails/VolumeDetails.tsx
index bff265fc5c7..b17f205a1e4 100644
--- a/packages/manager/src/features/Volumes/VolumeDetails/VolumeDetails.tsx
+++ b/packages/manager/src/features/Volumes/VolumeDetails/VolumeDetails.tsx
@@ -27,6 +27,7 @@ export const VolumeDetails = () => {
     {
       to: '/volumes/$volumeId/metrics',
       title: 'Metrics',
+      hide: !aclpServices?.blockstorage?.metrics?.enabled,
       chip: aclpServices?.blockstorage?.metrics?.beta ? <BetaChip /> : null,
     },
   ]);

From 35b8d8b72ed2f9e964d45697099d9fead6fba0fa Mon Sep 17 00:00:00 2001
From: Dajahi Wiley <114682940+dwiley-akamai@users.noreply.github.com>
Date: Fri, 5 Dec 2025 09:33:47 -0500
Subject: [PATCH 79/91] =?UTF-8?q?upcoming:=20[UIE-9531]=20=E2=80=93=20Prev?=
 =?UTF-8?q?ent=20referencing=20of=20RuleSet=20by=20a=20FW=20more=20than=20?=
 =?UTF-8?q?once=20(#13169)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Prop drilling to make FW inbound and outbound rules available in FirewallRuleSetForm; filter out ruleset from dropdown if it is already present in the FW inbound and outbound rules

* Added changeset: Ensure a firewall can only reference a RuleSet once

---------

Co-authored-by: Dajahi Wiley <dwiley@linode.com>
---
 .../pr-13169-upcoming-features-1764884932241.md       |  5 +++++
 .../FirewallDetail/Rules/FirewallRuleDrawer.test.tsx  |  1 +
 .../FirewallDetail/Rules/FirewallRuleDrawer.tsx       |  2 ++
 .../FirewallDetail/Rules/FirewallRuleDrawer.types.ts  |  2 ++
 .../FirewallDetail/Rules/FirewallRuleSetForm.tsx      | 11 +++++++++--
 .../FirewallDetail/Rules/FirewallRulesLanding.tsx     |  4 ++++
 6 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13169-upcoming-features-1764884932241.md

diff --git a/packages/manager/.changeset/pr-13169-upcoming-features-1764884932241.md b/packages/manager/.changeset/pr-13169-upcoming-features-1764884932241.md
new file mode 100644
index 00000000000..c7d3a1b5e6f
--- /dev/null
+++ b/packages/manager/.changeset/pr-13169-upcoming-features-1764884932241.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Ensure a firewall can only reference a RuleSet once ([#13169](https://github.com/linode/manager/pull/13169))
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
index 7e63e292910..49b8b354781 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
@@ -61,6 +61,7 @@ const props: FirewallRuleDrawerProps = {
   category: 'inbound',
   isOpen: true,
   mode: 'create',
+  inboundAndOutboundRules: [],
   handleOpenPrefixListDrawer: mockHandleOpenPrefixListDrawer,
   onClose: mockOnClose,
   onSubmit: mockOnSubmit,
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
index 91a6ba75d78..b766d7eb77a 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx
@@ -50,6 +50,7 @@ export const FirewallRuleDrawer = React.memo(
       isOpen,
       mode,
       onClose,
+      inboundAndOutboundRules,
       ruleToModifyOrView,
     } = props;
 
@@ -324,6 +325,7 @@ export const FirewallRuleDrawer = React.memo(
                         'ruleset'
                       );
                     }}
+                    inboundAndOutboundRules={inboundAndOutboundRules}
                     ruleErrors={ruleToModifyOrView?.errors}
                     {...formikProps}
                   />
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts
index bd09e974484..b3ded393408 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.types.ts
@@ -18,6 +18,7 @@ export interface FirewallRuleDrawerProps {
     plRuleRef: PrefixListRuleReference,
     contextType: PrefixListDrawerContext['type']
   ) => void;
+  inboundAndOutboundRules: FirewallRuleType[];
   isOpen: boolean;
   mode: FirewallRuleDrawerMode;
   onClose: () => void;
@@ -67,5 +68,6 @@ export interface FirewallRuleSetFormProps
     prefixListLabel: string,
     plRuleRef: PrefixListRuleReference
   ) => void;
+  inboundAndOutboundRules: FirewallRuleType[];
   ruleErrors?: FirewallRuleError[];
 }
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx
index a07f89d38cc..1fec51c09c6 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleSetForm.tsx
@@ -27,13 +27,14 @@ export const FirewallRuleSetForm = React.memo(
   (props: FirewallRuleSetFormProps) => {
     const {
       category,
+      closeDrawer,
       errors,
       handleOpenPrefixListDrawer,
       handleSubmit,
+      inboundAndOutboundRules,
       setFieldTouched,
       setFieldValue,
       touched,
-      closeDrawer,
       values,
     } = props;
 
@@ -59,7 +60,13 @@ export const FirewallRuleSetForm = React.memo(
       () =>
         ruleSets
           // TODO: Firewall RuleSets: Remove this client-side filter once the API supports filtering by the 'type' field
-          .filter((ruleSet) => ruleSet.type === category) // Display only rule sets applicable to the given category
+          .filter(
+            (ruleSet) =>
+              ruleSet.type === category &&
+              !inboundAndOutboundRules.some(
+                (rule) => rule.ruleset === ruleSet.id
+              )
+          ) // Display only rule sets applicable to the given category and filter out rule sets already referenced by the FW
           .map((ruleSet) => ({
             label: ruleSet.label,
             value: ruleSet.id,
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRulesLanding.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRulesLanding.tsx
index f72ac14d99c..517d7d90aeb 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRulesLanding.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRulesLanding.tsx
@@ -547,6 +547,10 @@ export const FirewallRulesLanding = React.memo((props: Props) => {
             modeViewedFrom: ruleDrawer.mode,
           });
         }}
+        inboundAndOutboundRules={[
+          ...(rules.inbound ?? []),
+          ...(rules.outbound ?? []),
+        ]}
         isOpen={
           location.pathname.endsWith('add/inbound') ||
           location.pathname.endsWith('add/outbound') ||

From 80f3ba8b8ea0ac9667bfe087ef6bfdc72c733573 Mon Sep 17 00:00:00 2001
From: mduda-akamai <mduda@akamai.com>
Date: Fri, 5 Dec 2025 15:47:01 +0100
Subject: [PATCH 80/91] change: [DPS-35650] Logs: minor UI fixes and
 improvements (#13166)

---
 .../pr-13166-changed-1764854054943.md         |  5 ++
 .../e2e/core/delivery/create-stream.spec.ts   |  2 +-
 .../e2e/core/delivery/edit-stream.spec.ts     |  4 +-
 .../cypress/support/constants/delivery.ts     |  2 +-
 .../src/components/PrimaryNav/PrimaryNav.tsx  |  8 +--
 packages/manager/src/factories/delivery.ts    |  2 +-
 .../src/features/Delivery/DeliveryLanding.tsx |  1 +
 .../DestinationCreate.test.tsx                | 12 ++--
 .../DestinationForm/DestinationCreate.tsx     |  1 +
 .../DestinationForm/DestinationEdit.test.tsx  |  2 +-
 .../DestinationForm/DestinationEdit.tsx       |  1 +
 .../DestinationForm/DestinationForm.tsx       | 14 ++--
 .../Destinations/DestinationTableRow.tsx      |  8 +--
 .../Destinations/DestinationsLanding.tsx      |  4 +-
 .../DestinationsLandingEmptyStateData.ts      | 18 +++--
 .../DeliveryTabHeader/DeliveryTabHeader.tsx   |  2 +-
 .../Shared/FormSubmitBar/FormSubmitBar.tsx    | 69 +++++++++++--------
 .../Shared/LinkWithTooltipAndEllipsis.tsx     | 58 ++++++++++++++++
 .../src/features/Delivery/Shared/types.ts     |  2 +-
 .../StreamFormCheckoutBar.test.tsx            |  6 +-
 .../StreamFormClustersTableContent.tsx        |  6 +-
 .../Delivery/StreamFormDelivery.test.tsx      |  4 +-
 .../Delivery/StreamFormDelivery.tsx           | 41 +++++++++--
 .../Streams/StreamForm/StreamCreate.test.tsx  |  4 +-
 .../Streams/StreamForm/StreamCreate.tsx       |  1 +
 .../Streams/StreamForm/StreamEdit.test.tsx    |  6 +-
 .../Streams/StreamForm/StreamEdit.tsx         |  1 +
 .../Streams/StreamForm/StreamForm.tsx         | 10 ++-
 .../StreamForm/StreamFormGeneralInfo.test.tsx | 12 ++--
 .../StreamForm/StreamFormGeneralInfo.tsx      |  7 +-
 .../Delivery/Streams/StreamTableRow.tsx       |  8 +--
 .../Delivery/Streams/StreamsLanding.tsx       | 10 +--
 .../Streams/StreamsLandingEmptyStateData.ts   | 18 +++--
 .../pr-13166-changed-1764854111433.md         |  5 ++
 packages/validation/src/delivery.schema.ts    | 23 +++++--
 35 files changed, 270 insertions(+), 107 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13166-changed-1764854054943.md
 create mode 100644 packages/manager/src/features/Delivery/Shared/LinkWithTooltipAndEllipsis.tsx
 create mode 100644 packages/validation/.changeset/pr-13166-changed-1764854111433.md

diff --git a/packages/manager/.changeset/pr-13166-changed-1764854054943.md b/packages/manager/.changeset/pr-13166-changed-1764854054943.md
new file mode 100644
index 00000000000..b292049b2a3
--- /dev/null
+++ b/packages/manager/.changeset/pr-13166-changed-1764854054943.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Changed
+---
+
+Logs: Many minor UI fixes and improvements ([#13166](https://github.com/linode/manager/pull/13166))
diff --git a/packages/manager/cypress/e2e/core/delivery/create-stream.spec.ts b/packages/manager/cypress/e2e/core/delivery/create-stream.spec.ts
index 1ca9b4cb643..c5327ed7854 100644
--- a/packages/manager/cypress/e2e/core/delivery/create-stream.spec.ts
+++ b/packages/manager/cypress/e2e/core/delivery/create-stream.spec.ts
@@ -166,7 +166,7 @@ describe('Create Stream', () => {
     });
   });
 
-  describe('given Kubernetes Audit Logs Stream Type', () => {
+  describe('given Kubernetes API Audit Logs Stream Type', () => {
     it('selects clusters and creates new stream', () => {
       // Mock API responses
       mockGetDestinations([mockDestination]);
diff --git a/packages/manager/cypress/e2e/core/delivery/edit-stream.spec.ts b/packages/manager/cypress/e2e/core/delivery/edit-stream.spec.ts
index 9006b1935be..ee47317290e 100644
--- a/packages/manager/cypress/e2e/core/delivery/edit-stream.spec.ts
+++ b/packages/manager/cypress/e2e/core/delivery/edit-stream.spec.ts
@@ -143,7 +143,7 @@ describe('Edit Stream', () => {
     });
   });
 
-  describe('given Kubernetes Audit Logs Stream Type', () => {
+  describe('given Kubernetes API Audit Logs Stream Type', () => {
     it('edits stream label and clusters and saves', () => {
       // Mock API responses
       mockGetDestinations([mockDestination]);
@@ -192,7 +192,7 @@ describe('Edit Stream', () => {
       cy.findByLabelText('Stream Type')
         .should('be.visible')
         .should('be.disabled')
-        .should('have.attr', 'value', 'Kubernetes Audit Logs');
+        .should('have.attr', 'value', 'Kubernetes API Audit Logs');
 
       // Clusters table should be visible
       cy.findByText('Clusters').should('be.visible');
diff --git a/packages/manager/cypress/support/constants/delivery.ts b/packages/manager/cypress/support/constants/delivery.ts
index ad60d8d68fd..a45d0f343eb 100644
--- a/packages/manager/cypress/support/constants/delivery.ts
+++ b/packages/manager/cypress/support/constants/delivery.ts
@@ -15,7 +15,7 @@ export const mockDestinationPayload: CreateDestinationPayload = {
   type: destinationType.AkamaiObjectStorage,
   details: {
     host: randomString(),
-    bucket_name: randomString(),
+    bucket_name: randomLabel(),
     access_key_id: randomString(),
     access_key_secret: randomString(),
     path: '/',
diff --git a/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx b/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx
index 7e35cbfb6ab..b8eeba617d8 100644
--- a/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx
+++ b/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx
@@ -248,16 +248,16 @@ export const PrimaryNav = (props: PrimaryNavProps) => {
                 to: '/alerts',
                 isBeta: flags.aclpAlerting?.beta,
               },
-              {
-                display: 'Longview',
-                to: '/longview',
-              },
               {
                 display: 'Logs',
                 hide: !isACLPLogsEnabled,
                 to: '/logs/delivery',
                 isBeta: isACLPLogsBeta,
               },
+              {
+                display: 'Longview',
+                to: '/longview',
+              },
             ],
             name: 'Monitor',
           },
diff --git a/packages/manager/src/factories/delivery.ts b/packages/manager/src/factories/delivery.ts
index f26c05bc914..94c422631cd 100644
--- a/packages/manager/src/factories/delivery.ts
+++ b/packages/manager/src/factories/delivery.ts
@@ -6,7 +6,7 @@ import type { Destination } from '@linode/api-v4';
 export const destinationFactory = Factory.Sync.makeFactory<Destination>({
   details: {
     access_key_id: 'Access Id',
-    bucket_name: 'Bucket Name',
+    bucket_name: 'destinations-bucket-name',
     host: '3000',
     path: 'file',
   },
diff --git a/packages/manager/src/features/Delivery/DeliveryLanding.tsx b/packages/manager/src/features/Delivery/DeliveryLanding.tsx
index b4ec8e7fb4b..a9dbf37dda2 100644
--- a/packages/manager/src/features/Delivery/DeliveryLanding.tsx
+++ b/packages/manager/src/features/Delivery/DeliveryLanding.tsx
@@ -30,6 +30,7 @@ export const DeliveryLanding = React.memo(() => {
     breadcrumbProps: {
       pathname: '/logs/delivery',
     },
+    docsLink: 'https://techdocs.akamai.com/cloud-computing/docs/log-delivery',
     removeCrumbX: 1,
     entity: 'Delivery',
     title: 'Logs', // TODO: Change to "Delivery" all "Logs" occurrences after adding LogsLanding page
diff --git a/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationCreate.test.tsx b/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationCreate.test.tsx
index 1d625731fa8..5d98fe50105 100644
--- a/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationCreate.test.tsx
+++ b/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationCreate.test.tsx
@@ -47,9 +47,9 @@ describe('DestinationCreate', () => {
       const destinationNameInput = screen.getByLabelText('Destination Name');
       await userEvent.type(destinationNameInput, 'Test');
       const hostInput = screen.getByLabelText('Host');
-      await userEvent.type(hostInput, 'Test');
+      await userEvent.type(hostInput, 'test');
       const bucketInput = screen.getByLabelText('Bucket');
-      await userEvent.type(bucketInput, 'Test');
+      await userEvent.type(bucketInput, 'test');
       const accessKeyIDInput = screen.getByLabelText('Access Key ID');
       await userEvent.type(accessKeyIDInput, 'Test');
       const secretAccessKeyInput = screen.getByLabelText('Secret Access Key');
@@ -58,8 +58,8 @@ describe('DestinationCreate', () => {
       await userEvent.type(logPathPrefixInput, 'Test');
 
       expect(destinationNameInput).toHaveValue('Test');
-      expect(hostInput).toHaveValue('Test');
-      expect(bucketInput).toHaveValue('Test');
+      expect(hostInput).toHaveValue('test');
+      expect(bucketInput).toHaveValue('test');
       expect(accessKeyIDInput).toHaveValue('Test');
       expect(secretAccessKeyInput).toHaveValue('Test');
       expect(logPathPrefixInput).toHaveValue('Test');
@@ -114,9 +114,9 @@ describe('DestinationCreate', () => {
       const destinationNameInput = screen.getByLabelText('Destination Name');
       await userEvent.type(destinationNameInput, 'Test');
       const hostInput = screen.getByLabelText('Host');
-      await userEvent.type(hostInput, 'Test');
+      await userEvent.type(hostInput, 'test');
       const bucketInput = screen.getByLabelText('Bucket');
-      await userEvent.type(bucketInput, 'Test');
+      await userEvent.type(bucketInput, 'test');
       const accessKeyIDInput = screen.getByLabelText('Access Key ID');
       await userEvent.type(accessKeyIDInput, 'Test');
       const secretAccessKeyInput = screen.getByLabelText('Secret Access Key');
diff --git a/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationCreate.tsx b/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationCreate.tsx
index e5e64e0bf37..11796efa544 100644
--- a/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationCreate.tsx
+++ b/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationCreate.tsx
@@ -32,6 +32,7 @@ export const DestinationCreate = () => {
         },
       ],
     },
+    docsLink: 'https://techdocs.akamai.com/cloud-computing/docs/log-delivery',
     removeCrumbX: [1, 2],
     title: 'Create Destination',
   };
diff --git a/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationEdit.test.tsx b/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationEdit.test.tsx
index 561272ddc52..04e577c91f9 100644
--- a/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationEdit.test.tsx
+++ b/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationEdit.test.tsx
@@ -52,7 +52,7 @@ describe('DestinationEdit', () => {
       assertInputHasValue('Destination Name', 'Destination 123');
     });
     assertInputHasValue('Host', '3000');
-    assertInputHasValue('Bucket', 'Bucket Name');
+    assertInputHasValue('Bucket', 'destinations-bucket-name');
     assertInputHasValue('Access Key ID', 'Access Id');
     assertInputHasValue('Secret Access Key', '');
     assertInputHasValue('Log Path Prefix', 'file');
diff --git a/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationEdit.tsx b/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationEdit.tsx
index 32af3c9908a..6d30c3cb7a3 100644
--- a/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationEdit.tsx
+++ b/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationEdit.tsx
@@ -46,6 +46,7 @@ export const DestinationEdit = () => {
         },
       ],
     },
+    docsLink: 'https://techdocs.akamai.com/cloud-computing/docs/log-delivery',
     removeCrumbX: [1, 2],
     title: `Edit Destination ${destinationId}`,
   };
diff --git a/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationForm.tsx b/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationForm.tsx
index 92bcc1bcbed..b03e7c93395 100644
--- a/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationForm.tsx
+++ b/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationForm.tsx
@@ -1,6 +1,6 @@
 import { destinationType } from '@linode/api-v4';
 import { Autocomplete, Paper, TextField } from '@linode/ui';
-import { capitalize } from '@linode/utilities';
+import { capitalize, scrollErrorIntoViewV2 } from '@linode/utilities';
 import Grid from '@mui/material/Grid';
 import * as React from 'react';
 import { useEffect } from 'react';
@@ -35,6 +35,7 @@ export const DestinationForm = (props: DestinationFormProps) => {
     setDestinationVerified,
   } = useVerifyDestination();
 
+  const formRef = React.useRef<HTMLFormElement>(null);
   const { control, handleSubmit } = useFormContext<DestinationFormType>();
   const destination = useWatch({
     control,
@@ -45,7 +46,7 @@ export const DestinationForm = (props: DestinationFormProps) => {
   }, [destination, setDestinationVerified]);
 
   return (
-    <form id="destinationForm">
+    <form id="destinationForm" ref={formRef}>
       <Grid container spacing={2}>
         <Grid size={{ lg: 9, md: 12, sm: 12, xs: 12 }}>
           <Paper>
@@ -107,9 +108,12 @@ export const DestinationForm = (props: DestinationFormProps) => {
             isSubmitting={isSubmitting}
             isTesting={isVerifyingDestination}
             mode={mode}
-            onSubmit={handleSubmit(onSubmit)}
-            onTestConnection={handleSubmit(() =>
-              verifyDestination(destination)
+            onSubmit={handleSubmit(onSubmit, () =>
+              scrollErrorIntoViewV2(formRef)
+            )}
+            onTestConnection={handleSubmit(
+              () => verifyDestination(destination),
+              () => scrollErrorIntoViewV2(formRef)
             )}
           />
         </Grid>
diff --git a/packages/manager/src/features/Delivery/Destinations/DestinationTableRow.tsx b/packages/manager/src/features/Delivery/Destinations/DestinationTableRow.tsx
index 4c6a850a217..ec5e03ef2b0 100644
--- a/packages/manager/src/features/Delivery/Destinations/DestinationTableRow.tsx
+++ b/packages/manager/src/features/Delivery/Destinations/DestinationTableRow.tsx
@@ -2,11 +2,11 @@ import { Hidden } from '@linode/ui';
 import * as React from 'react';
 
 import { DateTimeDisplay } from 'src/components/DateTimeDisplay';
-import { Link } from 'src/components/Link';
 import { TableCell } from 'src/components/TableCell';
 import { TableRow } from 'src/components/TableRow';
 import { getDestinationTypeOption } from 'src/features/Delivery/deliveryUtils';
 import { DestinationActionMenu } from 'src/features/Delivery/Destinations/DestinationActionMenu';
+import { LinkWithTooltipAndEllipsis } from 'src/features/Delivery/Shared/LinkWithTooltipAndEllipsis';
 
 import type { Destination } from '@linode/api-v4';
 import type { DestinationHandlers } from 'src/features/Delivery/Destinations/DestinationActionMenu';
@@ -23,18 +23,18 @@ export const DestinationTableRow = React.memo(
     return (
       <TableRow key={id}>
         <TableCell>
-          <Link
+          <LinkWithTooltipAndEllipsis
             pendoId="Logs Delivery Destinations-Name"
             to={`/logs/delivery/destinations/${id}/edit`}
           >
             {destination.label}
-          </Link>
+          </LinkWithTooltipAndEllipsis>
         </TableCell>
         <TableCell>
           {getDestinationTypeOption(destination.type)?.label}
         </TableCell>
         <TableCell>{id}</TableCell>
-        <Hidden smDown>
+        <Hidden mdDown>
           <TableCell>
             <DateTimeDisplay value={destination.created} />
           </TableCell>
diff --git a/packages/manager/src/features/Delivery/Destinations/DestinationsLanding.tsx b/packages/manager/src/features/Delivery/Destinations/DestinationsLanding.tsx
index 78fa105b513..a0263faa8ac 100644
--- a/packages/manager/src/features/Delivery/Destinations/DestinationsLanding.tsx
+++ b/packages/manager/src/features/Delivery/Destinations/DestinationsLanding.tsx
@@ -63,7 +63,6 @@ export const DestinationsLanding = () => {
   const {
     data: destinations,
     isLoading,
-    isFetching,
     error,
   } = useDestinationsQuery(
     {
@@ -122,7 +121,6 @@ export const DestinationsLanding = () => {
     <Paper>
       <DeliveryTabHeader
         entity="Destination"
-        isSearching={isFetching}
         onButtonClick={navigateToCreate}
         onSearch={onSearch}
         searchValue={search?.label ?? ''}
@@ -159,7 +157,7 @@ export const DestinationsLanding = () => {
                 >
                   ID
                 </TableSortCell>
-                <Hidden smDown>
+                <Hidden mdDown>
                   <TableSortCell
                     active={orderBy === 'created'}
                     direction={order}
diff --git a/packages/manager/src/features/Delivery/Destinations/DestinationsLandingEmptyStateData.ts b/packages/manager/src/features/Delivery/Destinations/DestinationsLandingEmptyStateData.ts
index d42329e9063..0a404921f66 100644
--- a/packages/manager/src/features/Delivery/Destinations/DestinationsLandingEmptyStateData.ts
+++ b/packages/manager/src/features/Delivery/Destinations/DestinationsLandingEmptyStateData.ts
@@ -1,3 +1,8 @@
+import {
+  docsLink,
+  guidesMoreLinkText,
+} from 'src/utilities/emptyStateLandingUtils';
+
 import type {
   ResourcesHeaders,
   ResourcesLinks,
@@ -16,10 +21,15 @@ export const linkAnalyticsEvent: ResourcesLinks['linkAnalyticsEvent'] = {
 };
 
 export const gettingStartedGuides: ResourcesLinkSection = {
-  links: [],
+  links: [
+    {
+      text: 'Getting started guide',
+      to: 'https://techdocs.akamai.com/cloud-computing/docs/log-delivery',
+    },
+  ],
   moreInfo: {
-    text: '',
-    to: '',
+    text: guidesMoreLinkText,
+    to: docsLink,
   },
-  title: '',
+  title: 'Getting Started Guides',
 };
diff --git a/packages/manager/src/features/Delivery/Shared/DeliveryTabHeader/DeliveryTabHeader.tsx b/packages/manager/src/features/Delivery/Shared/DeliveryTabHeader/DeliveryTabHeader.tsx
index 790cf51fdb3..ddcb23fbca0 100644
--- a/packages/manager/src/features/Delivery/Shared/DeliveryTabHeader/DeliveryTabHeader.tsx
+++ b/packages/manager/src/features/Delivery/Shared/DeliveryTabHeader/DeliveryTabHeader.tsx
@@ -31,7 +31,7 @@ export const DeliveryTabHeader = ({
   entity,
   onButtonClick,
   spacingBottom = 24,
-  isSearching,
+  isSearching = false,
   selectList,
   onSelect,
   selectValue,
diff --git a/packages/manager/src/features/Delivery/Shared/FormSubmitBar/FormSubmitBar.tsx b/packages/manager/src/features/Delivery/Shared/FormSubmitBar/FormSubmitBar.tsx
index ffe50588f9a..640d6093ce5 100644
--- a/packages/manager/src/features/Delivery/Shared/FormSubmitBar/FormSubmitBar.tsx
+++ b/packages/manager/src/features/Delivery/Shared/FormSubmitBar/FormSubmitBar.tsx
@@ -70,35 +70,48 @@ export const FormSubmitBar = (props: StreamFormSubmitBarProps) => {
             Stream provisioning may take up to 45 minutes.
           </Typography>
         )}
-        <Button
-          buttonType="outlined"
-          data-pendo-id={`${pagePendoId}-Test Connection`}
-          disabled={disableTestConnection}
-          loading={isTesting}
-          onClick={onTestConnection}
-          sx={(theme) => ({
-            mt: `${theme.spacingFunction(24)} !important`,
-            [theme.breakpoints.down('lg')]: {
-              alignSelf: 'flex-end',
-            },
-          })}
+        <Stack
+          direction={{
+            base: 'column',
+            lg: 'column',
+            md: 'row',
+            sm: 'row',
+            xs: 'row',
+          }}
+          justifyContent={{ md: 'flex-end', sm: 'flex-end', xs: 'flex-end' }}
+          spacing={2}
+          sx={{ mt: '0 !important' }}
         >
-          Test Connection
-        </Button>
-        <Button
-          buttonType="primary"
-          data-pendo-id={`${pagePendoId}-${buttonLabel}`}
-          disabled={!enableSubmit}
-          loading={isSubmitting}
-          onClick={onSubmit}
-          sx={(theme) => ({
-            [theme.breakpoints.down('lg')]: {
-              alignSelf: 'flex-end',
-            },
-          })}
-        >
-          {buttonLabel}
-        </Button>
+          <Button
+            buttonType="outlined"
+            data-pendo-id={`${pagePendoId}-Test Connection`}
+            disabled={disableTestConnection}
+            loading={isTesting}
+            onClick={onTestConnection}
+            sx={(theme) => ({
+              mt: `${theme.spacingFunction(24)} !important`,
+              [theme.breakpoints.down('lg')]: {
+                alignSelf: 'flex-end',
+              },
+            })}
+          >
+            Test Connection
+          </Button>
+          <Button
+            buttonType="primary"
+            data-pendo-id={`${pagePendoId}-${buttonLabel}`}
+            disabled={!enableSubmit}
+            loading={isSubmitting}
+            onClick={onSubmit}
+            sx={(theme) => ({
+              [theme.breakpoints.down('lg')]: {
+                alignSelf: 'flex-end',
+              },
+            })}
+          >
+            {buttonLabel}
+          </Button>
+        </Stack>
         {formType === 'stream' && (
           <Typography mb={1}>
             By using this service, you acknowledge your obligations under the
diff --git a/packages/manager/src/features/Delivery/Shared/LinkWithTooltipAndEllipsis.tsx b/packages/manager/src/features/Delivery/Shared/LinkWithTooltipAndEllipsis.tsx
new file mode 100644
index 00000000000..3e7f96dc1c0
--- /dev/null
+++ b/packages/manager/src/features/Delivery/Shared/LinkWithTooltipAndEllipsis.tsx
@@ -0,0 +1,58 @@
+import { Tooltip } from '@linode/ui';
+import { styled } from '@mui/material/styles';
+import * as React from 'react';
+import { useEffect, useRef, useState } from 'react';
+
+import { Link } from 'src/components/Link';
+
+const StyledLink = styled(Link, { label: 'StyledLink' })(({ theme }) => ({
+  overflow: 'hidden',
+  textOverflow: 'ellipsis',
+  display: 'inline-block',
+  maxWidth: 350,
+  [theme.breakpoints.down('lg')]: {
+    maxWidth: 200,
+  },
+  [theme.breakpoints.down('sm')]: {
+    maxWidth: 120,
+  },
+  whiteSpace: 'nowrap',
+}));
+
+interface EllipsisLinkWithTooltipProps {
+  children: string;
+  className?: string;
+  pendoId?: string;
+  style?: React.CSSProperties;
+  to: string;
+}
+
+export const LinkWithTooltipAndEllipsis = (
+  props: EllipsisLinkWithTooltipProps
+) => {
+  const { to, children, pendoId, className, style } = props;
+
+  const linkRef = useRef<HTMLAnchorElement>(null);
+  const [showTooltip, setShowTooltip] = useState(false);
+
+  useEffect(() => {
+    const linkElement = linkRef.current;
+    if (linkElement) {
+      setShowTooltip(linkElement.scrollWidth > linkElement.clientWidth);
+    }
+  }, [children]);
+
+  return (
+    <Tooltip disableHoverListener={!showTooltip} title={children}>
+      <StyledLink
+        className={className}
+        pendoId={pendoId}
+        ref={linkRef}
+        style={style}
+        to={to}
+      >
+        {children}
+      </StyledLink>
+    </Tooltip>
+  );
+};
diff --git a/packages/manager/src/features/Delivery/Shared/types.ts b/packages/manager/src/features/Delivery/Shared/types.ts
index 8c447865f22..205e44573bd 100644
--- a/packages/manager/src/features/Delivery/Shared/types.ts
+++ b/packages/manager/src/features/Delivery/Shared/types.ts
@@ -33,7 +33,7 @@ export const streamTypeOptions: AutocompleteOption[] = [
   },
   {
     value: streamType.LKEAuditLogs,
-    label: 'Kubernetes Audit Logs',
+    label: 'Kubernetes API Audit Logs',
   },
 ];
 
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/CheckoutBar/StreamFormCheckoutBar.test.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/CheckoutBar/StreamFormCheckoutBar.test.tsx
index 0d1da0680ce..fcd91ae3c84 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/CheckoutBar/StreamFormCheckoutBar.test.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/CheckoutBar/StreamFormCheckoutBar.test.tsx
@@ -87,10 +87,10 @@ describe.skip('StreamFormCheckoutBar', () => {
 
     // change form type value
     await userEvent.click(streamTypesAutocomplete);
-    const kubernetesAuditLogs = await screen.findByText(
-      'Kubernetes Audit Logs'
+    const kubernetesApiAuditLogs = await screen.findByText(
+      'Kubernetes API Audit Logs'
     );
-    await userEvent.click(kubernetesAuditLogs);
+    await userEvent.click(kubernetesApiAuditLogs);
 
     expect(getDeliveryPriceContext()).not.toEqual(initialPrice);
   });
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClustersTableContent.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClustersTableContent.tsx
index 4022d10e819..5fad7cd8d3d 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClustersTableContent.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClustersTableContent.tsx
@@ -40,7 +40,7 @@ export const StreamFormClusterTableContent = ({
   const selectedIds = field.value || [];
 
   const isAllSelected =
-    selectedIds.length === (idsWithLogsEnabled?.length ?? 0);
+    selectedIds.length > 0 && selectedIds.length === idsWithLogsEnabled?.length;
   const isIndeterminate = selectedIds.length > 0 && !isAllSelected;
 
   const toggleAllClusters = () => {
@@ -66,7 +66,9 @@ export const StreamFormClusterTableContent = ({
               <Checkbox
                 aria-label="Toggle all clusters"
                 checked={isAllSelected}
-                disabled={isAutoAddAllClustersEnabled}
+                disabled={
+                  isAutoAddAllClustersEnabled || !idsWithLogsEnabled?.length
+                }
                 indeterminate={isIndeterminate}
                 onChange={toggleAllClusters}
                 sx={{ m: 0 }}
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.test.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.test.tsx
index 13c18086d6e..656b8b70792 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.test.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.test.tsx
@@ -158,9 +158,9 @@ describe('StreamFormDelivery', () => {
 
     // Type the test value inside the input
     const bucketInput = screen.getByLabelText('Bucket');
-    await userEvent.type(bucketInput, 'Test');
+    await userEvent.type(bucketInput, 'test');
 
-    expect(bucketInput.getAttribute('value')).toEqual('Test');
+    expect(bucketInput.getAttribute('value')).toEqual('test');
   });
 
   it('should render Access Key ID input after adding a new destination name and allow to type text', async () => {
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.tsx
index 8dfe9f7c400..8a00438d52d 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.tsx
@@ -6,6 +6,7 @@ import {
   CircleProgress,
   ErrorState,
   Paper,
+  Stack,
   Typography,
 } from '@linode/ui';
 import { capitalize } from '@linode/utilities';
@@ -176,13 +177,39 @@ export const StreamFormDelivery = (props: StreamFormDeliveryProps) => {
               const { id, ...optionProps } = props;
               return (
                 <li data-pendo-id={option.pendoId} {...optionProps} key={id}>
-                  {option.create ? (
-                    <>
-                      <strong>Create&nbsp;</strong> &quot;{option.label}&quot;
-                    </>
-                  ) : (
-                    option.label
-                  )}
+                  <Stack
+                    alignItems="center"
+                    direction="row"
+                    justifyContent="space-between"
+                    width="100%"
+                  >
+                    <Stack direction="column">
+                      <Box
+                        sx={{
+                          fontWeight: theme.tokens.font.FontWeight.Semibold,
+                        }}
+                      >
+                        {option.create ? (
+                          <span>
+                            <strong>Create&nbsp;</strong> &quot;{option.label}
+                            &quot;
+                          </span>
+                        ) : (
+                          option.label
+                        )}
+                      </Box>
+                      {option.id && (
+                        <Box
+                          sx={{
+                            color:
+                              theme.tokens.component.Dropdown.Text.Description,
+                          }}
+                        >
+                          ID: {option.id}
+                        </Box>
+                      )}
+                    </Stack>
+                  </Stack>
                 </li>
               );
             }}
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamCreate.test.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamCreate.test.tsx
index fddc01e4afc..4f329004c26 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamCreate.test.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamCreate.test.tsx
@@ -56,9 +56,9 @@ describe('StreamCreate', () => {
         await waitFor(() => {
           expect(hostInput).toBeDefined();
         });
-        await userEvent.type(hostInput, 'Test');
+        await userEvent.type(hostInput, 'test');
         const bucketInput = screen.getByLabelText('Bucket');
-        await userEvent.type(bucketInput, 'Test');
+        await userEvent.type(bucketInput, 'test');
         const accessKeyIDInput = screen.getByLabelText('Access Key ID');
         await userEvent.type(accessKeyIDInput, 'Test');
         const secretAccessKeyInput = screen.getByLabelText('Secret Access Key');
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamCreate.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamCreate.tsx
index 2b13c9a0655..6aa64e6aebd 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamCreate.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamCreate.tsx
@@ -25,6 +25,7 @@ export const StreamCreate = () => {
         },
       ],
     },
+    docsLink: 'https://techdocs.akamai.com/cloud-computing/docs/log-delivery',
     removeCrumbX: [1, 2],
     title: 'Create Stream',
   };
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.test.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.test.tsx
index 580b5590109..0b924f69c19 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.test.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.test.tsx
@@ -65,7 +65,7 @@ describe('StreamEdit', () => {
     // Host:
     expect(screen.getByText('3000')).toBeVisible();
     // Bucket:
-    expect(screen.getByText('Bucket Name')).toBeVisible();
+    expect(screen.getByText('destinations-bucket-name')).toBeVisible();
     // Access Key ID:
     expect(screen.getByTestId('access-key-id')).toHaveTextContent(
       '*****************'
@@ -97,9 +97,9 @@ describe('StreamEdit', () => {
         await waitFor(() => {
           expect(hostInput).toBeDefined();
         });
-        await userEvent.type(hostInput, 'Test');
+        await userEvent.type(hostInput, 'test');
         const bucketInput = screen.getByLabelText('Bucket');
-        await userEvent.type(bucketInput, 'Test');
+        await userEvent.type(bucketInput, 'test');
         const accessKeyIDInput = screen.getByLabelText('Access Key ID');
         await userEvent.type(accessKeyIDInput, 'Test');
         const secretAccessKeyInput = screen.getByLabelText('Secret Access Key');
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.tsx
index 57eeaaf2e8b..ccdb5bf11ce 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.tsx
@@ -43,6 +43,7 @@ export const StreamEdit = () => {
         },
       ],
     },
+    docsLink: 'https://techdocs.akamai.com/cloud-computing/docs/log-delivery',
     removeCrumbX: [1, 2],
     title: `Edit Stream ${streamId}`,
   };
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamForm.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamForm.tsx
index 62ebd97048c..6ac55bb6ff8 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamForm.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamForm.tsx
@@ -9,6 +9,7 @@ import {
   useUpdateStreamMutation,
 } from '@linode/queries';
 import { Stack } from '@linode/ui';
+import { scrollErrorIntoViewV2 } from '@linode/utilities';
 import Grid from '@mui/material/Grid';
 import { useNavigate } from '@tanstack/react-router';
 import { enqueueSnackbar } from 'notistack';
@@ -52,6 +53,7 @@ export const StreamForm = (props: StreamFormProps) => {
     setDestinationVerified,
   } = useVerifyDestination();
 
+  const formRef = React.useRef<HTMLFormElement>(null);
   const form = useFormContext<StreamAndDestinationFormType>();
   const { control, handleSubmit, trigger } = form;
 
@@ -170,11 +172,13 @@ export const StreamForm = (props: StreamFormProps) => {
 
     if (isValid) {
       await verifyDestination(destination);
+    } else {
+      scrollErrorIntoViewV2(formRef);
     }
   };
 
   return (
-    <form>
+    <form ref={formRef}>
       <Grid container spacing={2}>
         <Grid size={{ lg: 9, md: 12, sm: 12, xs: 12 }}>
           <Stack spacing={2}>
@@ -198,7 +202,9 @@ export const StreamForm = (props: StreamFormProps) => {
             isSubmitting={isSubmitting}
             isTesting={isVerifyingDestination}
             mode={mode}
-            onSubmit={handleSubmit(onSubmit)}
+            onSubmit={handleSubmit(onSubmit, () =>
+              scrollErrorIntoViewV2(formRef)
+            )}
             onTestConnection={handleTestConnection}
           />
         </Grid>
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamFormGeneralInfo.test.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamFormGeneralInfo.test.tsx
index c385377d3e4..4ca55775ecf 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamFormGeneralInfo.test.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamFormGeneralInfo.test.tsx
@@ -43,14 +43,16 @@ describe('StreamFormGeneralInfo', () => {
       // Open the dropdown
       await userEvent.click(streamTypesAutocomplete);
 
-      // Select the "Kubernetes Audit Logs" option
-      const kubernetesAuditLogs = await screen.findByText(
-        'Kubernetes Audit Logs'
+      // Select the "Kubernetes API Audit Logs" option
+      const kubernetesApiAuditLogs = await screen.findByText(
+        'Kubernetes API Audit Logs'
       );
-      await userEvent.click(kubernetesAuditLogs);
+      await userEvent.click(kubernetesApiAuditLogs);
 
       await waitFor(() => {
-        expect(streamTypesAutocomplete).toHaveValue('Kubernetes Audit Logs');
+        expect(streamTypesAutocomplete).toHaveValue(
+          'Kubernetes API Audit Logs'
+        );
       });
     });
   });
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamFormGeneralInfo.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamFormGeneralInfo.tsx
index f2e511450f3..bf2def9dc75 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamFormGeneralInfo.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamFormGeneralInfo.tsx
@@ -60,7 +60,10 @@ export const StreamFormGeneralInfo = (props: StreamFormGeneralInfoProps) => {
 
   const updateStreamDetails = (value: string) => {
     if (value === streamType.LKEAuditLogs) {
-      setValue('stream.details.is_auto_add_all_clusters_enabled', false);
+      setValue('stream.details', {
+        cluster_ids: [],
+        is_auto_add_all_clusters_enabled: false,
+      });
     } else {
       setValue('stream.details', null);
     }
@@ -135,7 +138,7 @@ export const StreamFormGeneralInfo = (props: StreamFormGeneralInfoProps) => {
       <Typography
         sx={{
           mt: theme.spacingFunction(16),
-          maxWidth: 480,
+          maxWidth: 440,
           whiteSpace: 'preserve-spaces',
         }}
       >
diff --git a/packages/manager/src/features/Delivery/Streams/StreamTableRow.tsx b/packages/manager/src/features/Delivery/Streams/StreamTableRow.tsx
index 91ebdd2e986..8184c7f33f9 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamTableRow.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamTableRow.tsx
@@ -2,7 +2,6 @@ import { Hidden } from '@linode/ui';
 import * as React from 'react';
 
 import { DateTimeDisplay } from 'src/components/DateTimeDisplay';
-import { Link } from 'src/components/Link';
 import { StatusIcon } from 'src/components/StatusIcon/StatusIcon';
 import { TableCell } from 'src/components/TableCell';
 import { TableRow } from 'src/components/TableRow';
@@ -10,6 +9,7 @@ import {
   getDestinationTypeOption,
   getStreamTypeOption,
 } from 'src/features/Delivery/deliveryUtils';
+import { LinkWithTooltipAndEllipsis } from 'src/features/Delivery/Shared/LinkWithTooltipAndEllipsis';
 import { StreamActionMenu } from 'src/features/Delivery/Streams/StreamActionMenu';
 
 import type { Stream, StreamStatus } from '@linode/api-v4';
@@ -26,12 +26,12 @@ export const StreamTableRow = React.memo((props: StreamTableRowProps) => {
   return (
     <TableRow key={id}>
       <TableCell>
-        <Link
+        <LinkWithTooltipAndEllipsis
           pendoId="Logs Delivery Streams-Name"
           to={`/logs/delivery/streams/${id}/edit`}
         >
           {stream.label}
-        </Link>
+        </LinkWithTooltipAndEllipsis>
       </TableCell>
       <TableCell>{getStreamTypeOption(stream.type)?.label}</TableCell>
       <TableCell statusCell>
@@ -39,7 +39,7 @@ export const StreamTableRow = React.memo((props: StreamTableRowProps) => {
         {humanizeStreamStatus(status)}
       </TableCell>
       <TableCell>{id}</TableCell>
-      <Hidden smDown>
+      <Hidden mdDown>
         <TableCell>
           {getDestinationTypeOption(stream.destinations[0]?.type)?.label}
         </TableCell>
diff --git a/packages/manager/src/features/Delivery/Streams/StreamsLanding.tsx b/packages/manager/src/features/Delivery/Streams/StreamsLanding.tsx
index 8316af51819..1a2b4729691 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamsLanding.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamsLanding.tsx
@@ -73,7 +73,6 @@ export const StreamsLanding = () => {
   const {
     data: streams,
     isLoading,
-    isFetching,
     error,
   } = useStreamsQuery(
     {
@@ -180,7 +179,6 @@ export const StreamsLanding = () => {
     <Paper>
       <DeliveryTabHeader
         entity="Stream"
-        isSearching={isFetching}
         onButtonClick={navigateToCreate}
         onSearch={onSearch}
         onSelect={onSelect}
@@ -188,7 +186,6 @@ export const StreamsLanding = () => {
         selectList={streamStatusOptions}
         selectValue={search?.status}
       />
-
       {isLoading ? (
         <CircleProgress />
       ) : (
@@ -201,7 +198,10 @@ export const StreamsLanding = () => {
                   direction={order}
                   handleClick={handleOrderChange}
                   label="label"
-                  sx={{ width: '30%' }}
+                  sx={{
+                    width: '30%',
+                    maxWidth: '30%',
+                  }}
                 >
                   Name
                 </TableSortCell>
@@ -229,7 +229,7 @@ export const StreamsLanding = () => {
                 >
                   ID
                 </TableSortCell>
-                <Hidden smDown>
+                <Hidden mdDown>
                   <TableCell>Destination Type</TableCell>
                 </Hidden>
                 <Hidden lgDown>
diff --git a/packages/manager/src/features/Delivery/Streams/StreamsLandingEmptyStateData.ts b/packages/manager/src/features/Delivery/Streams/StreamsLandingEmptyStateData.ts
index c62f70d5607..bf4d039cea6 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamsLandingEmptyStateData.ts
+++ b/packages/manager/src/features/Delivery/Streams/StreamsLandingEmptyStateData.ts
@@ -1,3 +1,8 @@
+import {
+  docsLink,
+  guidesMoreLinkText,
+} from 'src/utilities/emptyStateLandingUtils';
+
 import type {
   ResourcesHeaders,
   ResourcesLinks,
@@ -16,10 +21,15 @@ export const linkAnalyticsEvent: ResourcesLinks['linkAnalyticsEvent'] = {
 };
 
 export const gettingStartedGuides: ResourcesLinkSection = {
-  links: [],
+  links: [
+    {
+      text: 'Getting started guide',
+      to: 'https://techdocs.akamai.com/cloud-computing/docs/log-delivery',
+    },
+  ],
   moreInfo: {
-    text: '',
-    to: '',
+    text: guidesMoreLinkText,
+    to: docsLink,
   },
-  title: '',
+  title: 'Getting Started Guides',
 };
diff --git a/packages/validation/.changeset/pr-13166-changed-1764854111433.md b/packages/validation/.changeset/pr-13166-changed-1764854111433.md
new file mode 100644
index 00000000000..a4e04eb3b87
--- /dev/null
+++ b/packages/validation/.changeset/pr-13166-changed-1764854111433.md
@@ -0,0 +1,5 @@
+---
+"@linode/validation": Changed
+---
+
+Validate Bucket name in Destination Form for forbidden characters ([#13166](https://github.com/linode/manager/pull/13166))
diff --git a/packages/validation/src/delivery.schema.ts b/packages/validation/src/delivery.schema.ts
index ab6273b4ba2..b0a2fa52127 100644
--- a/packages/validation/src/delivery.schema.ts
+++ b/packages/validation/src/delivery.schema.ts
@@ -60,8 +60,18 @@ const customHTTPsDetailsSchema = object({
 const akamaiObjectStorageDetailsBaseSchema = object({
   host: string().max(maxLength, maxLengthMessage).required('Host is required.'),
   bucket_name: string()
-    .max(maxLength, maxLengthMessage)
-    .required('Bucket name is required.'),
+    .required('Bucket name is required.')
+    .min(3, 'Bucket name must be between 3 and 63 characters.')
+    .matches(/^\S*$/, 'Bucket name must not contain spaces.')
+    .matches(
+      /^[a-z0-9].*[a-z0-9]$/,
+      'Bucket name must start and end with a lowercase letter or number.',
+    )
+    .matches(
+      /^(?!.*[.-]{2})[a-z0-9.-]+$/,
+      'Bucket name must contain only lowercase letters, numbers, periods (.), and hyphens (-). Adjacent periods and hyphens are not allowed.',
+    )
+    .max(63, 'Bucket name must be between 3 and 63 characters.'),
   path: string().max(maxLength, maxLengthMessage).defined(),
   access_key_id: string()
     .max(maxLength, maxLengthMessage)
@@ -135,11 +145,16 @@ export const updateDestinationSchema = createDestinationSchema
   });
 
 // Logs Delivery Stream
+const clusterRequiredMessage = 'At least one cluster must be selected.';
 
 const streamDetailsBase = object({
   cluster_ids: array()
-    .of(number().defined())
-    .min(1, 'At least one cluster must be selected.'),
+    .of(number().defined(clusterRequiredMessage))
+    .when('is_auto_add_all_clusters_enabled', {
+      is: false,
+      then: (schema) =>
+        schema.min(1, clusterRequiredMessage).required(clusterRequiredMessage),
+    }),
   is_auto_add_all_clusters_enabled: boolean(),
 });
 

From e893249b979579a4660e2deeb4f87b8d01a859fb Mon Sep 17 00:00:00 2001
From: Dajahi Wiley <114682940+dwiley-akamai@users.noreply.github.com>
Date: Fri, 5 Dec 2025 15:19:05 -0500
Subject: [PATCH 81/91] =?UTF-8?q?upcoming:=20[UIE-9640]=20=E2=80=93=20Upda?=
 =?UTF-8?q?te=20`useIsFirewallRulesetsPrefixlistsEnabled`=20to=20include?=
 =?UTF-8?q?=20account=20capability=20check=20(#13156)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...r-13156-upcoming-features-1764708047549.md |  5 ++
 packages/api-v4/src/account/types.ts          |  1 +
 ...r-13156-upcoming-features-1764708766786.md |  5 ++
 .../src/features/Firewalls/shared.test.tsx    | 62 ++++++++++++++++++-
 .../manager/src/features/Firewalls/shared.tsx | 47 +++++++++++---
 5 files changed, 109 insertions(+), 11 deletions(-)
 create mode 100644 packages/api-v4/.changeset/pr-13156-upcoming-features-1764708047549.md
 create mode 100644 packages/manager/.changeset/pr-13156-upcoming-features-1764708766786.md

diff --git a/packages/api-v4/.changeset/pr-13156-upcoming-features-1764708047549.md b/packages/api-v4/.changeset/pr-13156-upcoming-features-1764708047549.md
new file mode 100644
index 00000000000..991b3820fb3
--- /dev/null
+++ b/packages/api-v4/.changeset/pr-13156-upcoming-features-1764708047549.md
@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Upcoming Features
+---
+
+Add 'Cloud Firewall Rule Set' to AccountCapability type ([#13156](https://github.com/linode/manager/pull/13156))
diff --git a/packages/api-v4/src/account/types.ts b/packages/api-v4/src/account/types.ts
index e6b4a27c25c..2f88bc7b053 100644
--- a/packages/api-v4/src/account/types.ts
+++ b/packages/api-v4/src/account/types.ts
@@ -66,6 +66,7 @@ export const accountCapabilities = [
   'Block Storage',
   'Block Storage Encryption',
   'Cloud Firewall',
+  'Cloud Firewall Rule Set',
   'CloudPulse',
   'Disk Encryption',
   'Kubernetes',
diff --git a/packages/manager/.changeset/pr-13156-upcoming-features-1764708766786.md b/packages/manager/.changeset/pr-13156-upcoming-features-1764708766786.md
new file mode 100644
index 00000000000..085d0c3dbda
--- /dev/null
+++ b/packages/manager/.changeset/pr-13156-upcoming-features-1764708766786.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Update useIsFirewallRulesetsPrefixlistsEnabled() to factor in account capability ([#13156](https://github.com/linode/manager/pull/13156))
diff --git a/packages/manager/src/features/Firewalls/shared.test.tsx b/packages/manager/src/features/Firewalls/shared.test.tsx
index 9a3605af7a0..d73064fb1e8 100644
--- a/packages/manager/src/features/Firewalls/shared.test.tsx
+++ b/packages/manager/src/features/Firewalls/shared.test.tsx
@@ -3,6 +3,8 @@ import { renderHook, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
+import { accountFactory } from 'src/factories';
+import { http, HttpResponse, server } from 'src/mocks/testServer';
 import { renderWithTheme, wrapWithTheme } from 'src/utilities/testHelpers';
 
 import {
@@ -391,7 +393,7 @@ describe('generateAddressesLabelV2', () => {
 });
 
 describe('useIsFirewallRulesetsPrefixlistsEnabled', () => {
-  it('returns true if the feature is enabled', async () => {
+  it('returns true if the feature is enabled AND the account has the capability', async () => {
     const options = {
       flags: {
         fwRulesetsPrefixLists: {
@@ -403,6 +405,16 @@ describe('useIsFirewallRulesetsPrefixlistsEnabled', () => {
       },
     };
 
+    const account = accountFactory.build({
+      capabilities: ['Cloud Firewall Rule Set'],
+    });
+
+    server.use(
+      http.get('*/v4*/account', () => {
+        return HttpResponse.json(account);
+      })
+    );
+
     const { result } = renderHook(
       () => useIsFirewallRulesetsPrefixlistsEnabled(),
       {
@@ -417,7 +429,7 @@ describe('useIsFirewallRulesetsPrefixlistsEnabled', () => {
     });
   });
 
-  it('returns false if the feature is NOT enabled', async () => {
+  it('returns false if the feature is NOT enabled but the account has the capability', async () => {
     const options = {
       flags: {
         fwRulesetsPrefixLists: {
@@ -429,6 +441,52 @@ describe('useIsFirewallRulesetsPrefixlistsEnabled', () => {
       },
     };
 
+    const account = accountFactory.build({
+      capabilities: ['Cloud Firewall Rule Set'],
+    });
+
+    server.use(
+      http.get('*/v4*/account', () => {
+        return HttpResponse.json(account);
+      })
+    );
+
+    const { result } = renderHook(
+      () => useIsFirewallRulesetsPrefixlistsEnabled(),
+      {
+        wrapper: (ui) => wrapWithTheme(ui, options),
+      }
+    );
+
+    await waitFor(() => {
+      expect(result.current.isFirewallRulesetsPrefixlistsFeatureEnabled).toBe(
+        false
+      );
+    });
+  });
+
+  it('returns false if the feature is enabled but the account DOES NOT have the capability', async () => {
+    const options = {
+      flags: {
+        fwRulesetsPrefixLists: {
+          enabled: true,
+          beta: false,
+          la: false,
+          ga: false,
+        },
+      },
+    };
+
+    const account = accountFactory.build({
+      capabilities: [],
+    });
+
+    server.use(
+      http.get('*/v4*/account', () => {
+        return HttpResponse.json(account);
+      })
+    );
+
     const { result } = renderHook(
       () => useIsFirewallRulesetsPrefixlistsEnabled(),
       {
diff --git a/packages/manager/src/features/Firewalls/shared.tsx b/packages/manager/src/features/Firewalls/shared.tsx
index 289f0db6e39..77d66940084 100644
--- a/packages/manager/src/features/Firewalls/shared.tsx
+++ b/packages/manager/src/features/Firewalls/shared.tsx
@@ -1,5 +1,10 @@
+import { useAccount } from '@linode/queries';
 import { BetaChip, Box, Chip, NewFeatureChip, Tooltip } from '@linode/ui';
-import { capitalize, truncateAndJoinList } from '@linode/utilities';
+import {
+  capitalize,
+  isFeatureEnabledV2,
+  truncateAndJoinList,
+} from '@linode/utilities';
 import React from 'react';
 
 import { Link } from 'src/components/Link';
@@ -107,6 +112,8 @@ export const allIPs = {
   ipv6: [allIPv6],
 };
 
+export const FW_RULESET_CAPABILITY = 'Cloud Firewall Rule Set';
+
 export interface PredefinedFirewall {
   inbound: FirewallRuleType[];
   label: string;
@@ -566,18 +573,40 @@ export const getFirewallDescription = (firewall: Firewall) => {
  * but will eventually also look at account capabilities if available.
  */
 export const useIsFirewallRulesetsPrefixlistsEnabled = () => {
+  const { data: account } = useAccount();
   const flags = useFlags();
 
+  if (!flags) {
+    return {
+      isFirewallRulesetsPrefixlistsFeatureEnabled: false,
+      isFirewallRulesetsPrefixListsBetaEnabled: false,
+      isFirewallRulesetsPrefixListsLAEnabled: false,
+      isFirewallRulesetsPrefixListsGAEnabled: false,
+    };
+  }
+
   // @TODO: Firewall Rulesets & Prefix Lists - check for customer tag/account capability when it exists
   return {
-    isFirewallRulesetsPrefixlistsFeatureEnabled:
-      flags.fwRulesetsPrefixLists?.enabled ?? false,
-    isFirewallRulesetsPrefixListsBetaEnabled:
-      flags.fwRulesetsPrefixLists?.beta ?? false,
-    isFirewallRulesetsPrefixListsLAEnabled:
-      flags.fwRulesetsPrefixLists?.la ?? false,
-    isFirewallRulesetsPrefixListsGAEnabled:
-      flags.fwRulesetsPrefixLists?.ga ?? false,
+    isFirewallRulesetsPrefixlistsFeatureEnabled: isFeatureEnabledV2(
+      FW_RULESET_CAPABILITY,
+      Boolean(flags.fwRulesetsPrefixLists?.enabled),
+      account?.capabilities ?? []
+    ),
+    isFirewallRulesetsPrefixListsBetaEnabled: isFeatureEnabledV2(
+      FW_RULESET_CAPABILITY,
+      Boolean(flags.fwRulesetsPrefixLists?.beta),
+      account?.capabilities ?? []
+    ),
+    isFirewallRulesetsPrefixListsLAEnabled: isFeatureEnabledV2(
+      FW_RULESET_CAPABILITY,
+      Boolean(flags.fwRulesetsPrefixLists?.la),
+      account?.capabilities ?? []
+    ),
+    isFirewallRulesetsPrefixListsGAEnabled: isFeatureEnabledV2(
+      FW_RULESET_CAPABILITY,
+      Boolean(flags.fwRulesetsPrefixLists?.ga),
+      account?.capabilities ?? []
+    ),
   };
 };
 

From 5db036f6147fd52b64c700eb31906f75a5cb1240 Mon Sep 17 00:00:00 2001
From: Hana Xu <115299789+hana-akamai@users.noreply.github.com>
Date: Fri, 5 Dec 2025 16:35:19 -0500
Subject: [PATCH 82/91] fix: [UIE-9690] - Forking a Database Cluster with VPC
 into another region (#13174)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description 📝
When forking a cluster attached to a VPC into another region, the request payload doesn't pass VPC as null. The forked instance is created with the previous region's VPC and gets stuck in a provisioning state.

Since VPCs are region based, we need to figure out how to handle forking a cluster with a VPC to a different region (TBD). In the meantime, we will set VPCs to null when forking to a different region.

## Changes  🔄

List any change(s) relevant to the reviewer.

- Add `private_network` property to `DatabaseBackupsPayload`
- Set `private_network` to null when forking to a different region
- Show warning notice in the Database Backups Dialog if the Database cluster has a VPC and we're forking to a different region

## How to test 🧪

### Reproduction steps

(How to reproduce the issue, if applicable)

- [ ] On another branch such as develop, go to the Backups tab of a Database cluster that has a VPC
- [ ] Select a different region to restore to
- [ ] Open the network tab and then click Restore. Observe the forked instance response is created with the previous region's VPC
- [ ] The database cluster is stuck in provisioning

### Verification steps

(How to verify changes)

- [ ] Checkout this PR or preview link, go to the Backups tab of a Database cluster that has a VPC
- [ ] Select a different region to restore to
- [ ] Click Restore to open up the dialog. The dialog should have a warning notice
- [ ] Open the network tab and then click Restore.
- [ ] The payload should have `private_network` set to `null` and the forked instance response should not have the previous region's VPC
- [ ] The database cluster should not get stuck in provisioning
- [ ] Forking a cluster with VPC in the _same_ region should preserve previous VPC and there should be no warning notice

Ensure there are no regressions:
- [ ] Go to the Backups tab of a Database cluster that does _not_ have VPC
- [ ] Click Restore to open up the dialog. The dialog should _not_ have a warning notice
- [ ] Open the network tab and then click Restore
- [ ] The database cluster should not get stuck in provisioning
---
 .../.changeset/pr-13174-changed-1764961622718.md  |  5 +++++
 packages/api-v4/src/databases/types.ts            |  1 +
 .../.changeset/pr-13174-fixed-1764961648716.md    |  5 +++++
 .../DatabaseBackups/DatabaseBackupsDialog.tsx     | 15 +++++++++++++++
 4 files changed, 26 insertions(+)
 create mode 100644 packages/api-v4/.changeset/pr-13174-changed-1764961622718.md
 create mode 100644 packages/manager/.changeset/pr-13174-fixed-1764961648716.md

diff --git a/packages/api-v4/.changeset/pr-13174-changed-1764961622718.md b/packages/api-v4/.changeset/pr-13174-changed-1764961622718.md
new file mode 100644
index 00000000000..fe886996b9b
--- /dev/null
+++ b/packages/api-v4/.changeset/pr-13174-changed-1764961622718.md
@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Changed
+---
+
+Add private_network to `DatabaseBackupsPayload` ([#13174](https://github.com/linode/manager/pull/13174))
diff --git a/packages/api-v4/src/databases/types.ts b/packages/api-v4/src/databases/types.ts
index 984cb63e279..d42c0ef23e3 100644
--- a/packages/api-v4/src/databases/types.ts
+++ b/packages/api-v4/src/databases/types.ts
@@ -81,6 +81,7 @@ export interface DatabaseFork {
 
 export interface DatabaseBackupsPayload {
   fork: DatabaseFork;
+  private_network?: null | PrivateNetwork;
   region?: string;
 }
 
diff --git a/packages/manager/.changeset/pr-13174-fixed-1764961648716.md b/packages/manager/.changeset/pr-13174-fixed-1764961648716.md
new file mode 100644
index 00000000000..0deeb1ac90e
--- /dev/null
+++ b/packages/manager/.changeset/pr-13174-fixed-1764961648716.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+Forking a Database Cluster with VPC into another region ([#13174](https://github.com/linode/manager/pull/13174))
diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseBackups/DatabaseBackupsDialog.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseBackups/DatabaseBackupsDialog.tsx
index a1ee61fdb2a..f6112e22157 100644
--- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseBackups/DatabaseBackupsDialog.tsx
+++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseBackups/DatabaseBackupsDialog.tsx
@@ -39,6 +39,9 @@ export const DatabaseBackupsDialog = (props: Props) => {
     {
       fork: toDatabaseFork(database.id, date, time),
       region,
+      // Assign same VPC when forking to the same region, otherwise set VPC to null
+      private_network:
+        database.region === region ? database.private_network : null,
     }
   );
 
@@ -59,6 +62,9 @@ export const DatabaseBackupsDialog = (props: Props) => {
     });
   };
 
+  const isClusterWithVPCAndForkingToDifferentRegion =
+    database.private_network !== null && database.region !== region;
+
   return (
     <Dialog
       onClose={onClose}
@@ -66,6 +72,15 @@ export const DatabaseBackupsDialog = (props: Props) => {
       subtitle={formattedDate && `From ${formattedDate} (UTC)`}
       title={`Restore ${database.label}`}
     >
+      {isClusterWithVPCAndForkingToDifferentRegion && ( // Show warning when forking a cluster with VPC to a different region
+        <Notice variant="warning">
+          The database cluster is currently assigned to a VPC. When you restore
+          the cluster into a different region, it will not be assigned to a VPC
+          by default. If your workflow requires a VPC, go to the cluster’s
+          Networking tab after the restore is complete and assign the cluster to
+          a VPC.
+        </Notice>
+      )}
       <Typography sx={(theme) => ({ marginBottom: theme.spacingFunction(32) })}>
         Restoring a backup creates a fork from this backup. If you proceed and
         the fork is created successfully, you should remove the original

From b112706827251ab49105637da376ab463e656e45 Mon Sep 17 00:00:00 2001
From: Purvesh Makode <pmakode@akamai.com>
Date: Mon, 8 Dec 2025 14:09:43 +0530
Subject: [PATCH 83/91] upcoming: [UIE-9762] -  UX/UI enhancements for RuleSets
 and Prefix Lists (#13165)

* Fix tooltip scroll styling

* Improve stylings for MutiplePLSelect and fw rule table row

* Update order of addresses

* Fix spacing between papers in Prefixlist details

* Revert design color token for tooltip arrow

* add PL checkbox tooltip text if disabled

* fix spacing for checkbox and tooltip

* Add hoverable ruleset id copy on table row

* reduce gap between label and copyable ruleset id

* Remove tooltip arrow for the RS & PL feature

* Minor change

* Added changeset: UX/UI enhancements for RuleSets and Prefix Lists

* Update PrefixList to Prefix List in tooltip message

* Fix some styles

* Some padding adjustments in MutiplePrefixListSelect

* Minor fix

---------

Co-authored-by: hrao <hrao@akamai.com>
---
 ...r-13165-upcoming-features-1764951969980.md |   5 +
 .../Rules/FirewallPrefixListDrawer.tsx        | 246 +++++++++---------
 .../FirewallDetail/Rules/FirewallRuleForm.tsx |   8 +-
 .../Rules/FirewallRuleTable.tsx               |  83 +++---
 .../Rules/MultiplePrefixListSelect.tsx        |  90 ++++---
 .../src/features/Firewalls/shared.test.tsx    |  26 +-
 .../manager/src/features/Firewalls/shared.tsx |  56 ++--
 7 files changed, 288 insertions(+), 226 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13165-upcoming-features-1764951969980.md

diff --git a/packages/manager/.changeset/pr-13165-upcoming-features-1764951969980.md b/packages/manager/.changeset/pr-13165-upcoming-features-1764951969980.md
new file mode 100644
index 00000000000..ae7b46a0c05
--- /dev/null
+++ b/packages/manager/.changeset/pr-13165-upcoming-features-1764951969980.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+UX/UI enhancements for RuleSets and Prefix Lists ([#13165](https://github.com/linode/manager/pull/13165))
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx
index 083634c3063..845b5486e63 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx
@@ -1,5 +1,13 @@
 import { useAllFirewallPrefixListsQuery } from '@linode/queries';
-import { Box, Button, Chip, Drawer, Paper, TooltipIcon } from '@linode/ui';
+import {
+  Box,
+  Button,
+  Chip,
+  Drawer,
+  Paper,
+  Stack,
+  TooltipIcon,
+} from '@linode/ui';
 import { capitalize } from '@linode/utilities';
 import * as React from 'react';
 
@@ -225,140 +233,144 @@ export const FirewallPrefixListDrawer = React.memo(
                 </StyledListItem>
               )}
 
-              {isIPv4Supported && (
-                <Paper
-                  data-testid="ipv4-section"
-                  sx={(theme) => ({
-                    backgroundColor: theme.tokens.alias.Background.Neutral,
-                    padding: theme.spacingFunction(12),
-                    marginTop: theme.spacingFunction(8),
-                    ...(isIPv4InUse
-                      ? {
-                          border: `1px solid ${theme.tokens.alias.Border.Positive}`,
-                        }
-                      : {}),
-                  })}
-                >
-                  <StyledLabel
+              <Stack gap={2} marginTop={1}>
+                {isIPv4Supported && (
+                  <Paper
+                    data-testid="ipv4-section"
                     sx={(theme) => ({
-                      display: 'flex',
-                      justifyContent: 'space-between',
-                      marginBottom: theme.spacingFunction(4),
-                      ...(!isIPv4InUse
+                      backgroundColor: theme.tokens.alias.Background.Neutral,
+                      padding: theme.spacingFunction(12),
+                      ...(isIPv4InUse
                         ? {
-                            color:
-                              theme.tokens.alias.Content.Text.Primary.Disabled,
+                            border: `1px solid ${theme.tokens.alias.Border.Positive}`,
                           }
                         : {}),
                     })}
                   >
-                    IPv4
-                    <Chip
-                      data-testid="ipv4-chip"
-                      label={isIPv4InUse ? 'in use' : 'not in use'}
+                    <StyledLabel
                       sx={(theme) => ({
-                        background: isIPv4InUse
-                          ? theme.tokens.component.Badge.Positive.Subtle
-                              .Background
-                          : theme.tokens.component.Badge.Neutral.Subtle
-                              .Background,
-                        color: isIPv4InUse
-                          ? theme.tokens.component.Badge.Positive.Subtle.Text
-                          : theme.tokens.component.Badge.Neutral.Subtle.Text,
-                        font: theme.font.bold,
-                        fontSize: theme.tokens.font.FontSize.Xxxs,
-                        marginRight: theme.spacingFunction(6),
-                        flexShrink: 0,
+                        display: 'flex',
+                        justifyContent: 'space-between',
+                        marginBottom: theme.spacingFunction(4),
+                        ...(!isIPv4InUse
+                          ? {
+                              color:
+                                theme.tokens.alias.Content.Text.Primary
+                                  .Disabled,
+                            }
+                          : {}),
                       })}
-                    />
-                  </StyledLabel>
+                    >
+                      IPv4
+                      <Chip
+                        data-testid="ipv4-chip"
+                        label={isIPv4InUse ? 'in use' : 'not in use'}
+                        sx={(theme) => ({
+                          background: isIPv4InUse
+                            ? theme.tokens.component.Badge.Positive.Subtle
+                                .Background
+                            : theme.tokens.component.Badge.Neutral.Subtle
+                                .Background,
+                          color: isIPv4InUse
+                            ? theme.tokens.component.Badge.Positive.Subtle.Text
+                            : theme.tokens.component.Badge.Neutral.Subtle.Text,
+                          font: theme.font.bold,
+                          fontSize: theme.tokens.font.FontSize.Xxxs,
+                          marginRight: theme.spacingFunction(6),
+                          flexShrink: 0,
+                        })}
+                      />
+                    </StyledLabel>
 
-                  <StyledListItem
-                    component="span"
-                    sx={(theme) => ({
-                      ...(!isIPv4InUse
-                        ? {
-                            color:
-                              theme.tokens.alias.Content.Text.Primary.Disabled,
-                          }
-                        : {}),
-                    })}
-                  >
-                    {prefixListDetails.ipv4!.length > 0 ? (
-                      prefixListDetails.ipv4!.join(', ')
-                    ) : (
-                      <i>no IP addresses</i>
-                    )}
-                  </StyledListItem>
-                </Paper>
-              )}
+                    <StyledListItem
+                      component="span"
+                      sx={(theme) => ({
+                        ...(!isIPv4InUse
+                          ? {
+                              color:
+                                theme.tokens.alias.Content.Text.Primary
+                                  .Disabled,
+                            }
+                          : {}),
+                      })}
+                    >
+                      {prefixListDetails.ipv4!.length > 0 ? (
+                        prefixListDetails.ipv4!.join(', ')
+                      ) : (
+                        <i>no IP addresses</i>
+                      )}
+                    </StyledListItem>
+                  </Paper>
+                )}
 
-              {isIPv6Supported && (
-                <Paper
-                  data-testid="ipv6-section"
-                  sx={(theme) => ({
-                    backgroundColor: theme.tokens.alias.Background.Neutral,
-                    padding: theme.spacingFunction(12),
-                    marginTop: theme.spacingFunction(8),
-                    ...(isIPv6InUse
-                      ? {
-                          border: `1px solid ${theme.tokens.alias.Border.Positive}`,
-                        }
-                      : {}),
-                  })}
-                >
-                  <StyledLabel
+                {isIPv6Supported && (
+                  <Paper
+                    data-testid="ipv6-section"
                     sx={(theme) => ({
-                      display: 'flex',
-                      justifyContent: 'space-between',
-                      marginBottom: theme.spacingFunction(4),
-                      ...(!isIPv6InUse
+                      backgroundColor: theme.tokens.alias.Background.Neutral,
+                      padding: theme.spacingFunction(12),
+                      ...(isIPv6InUse
                         ? {
-                            color:
-                              theme.tokens.alias.Content.Text.Primary.Disabled,
+                            border: `1px solid ${theme.tokens.alias.Border.Positive}`,
                           }
                         : {}),
                     })}
                   >
-                    IPv6
-                    <Chip
-                      data-testid="ipv6-chip"
-                      label={isIPv6InUse ? 'in use' : 'not in use'}
+                    <StyledLabel
                       sx={(theme) => ({
-                        background: isIPv6InUse
-                          ? theme.tokens.component.Badge.Positive.Subtle
-                              .Background
-                          : theme.tokens.component.Badge.Neutral.Subtle
-                              .Background,
-                        color: isIPv6InUse
-                          ? theme.tokens.component.Badge.Positive.Subtle.Text
-                          : theme.tokens.component.Badge.Neutral.Subtle.Text,
-                        font: theme.font.bold,
-                        fontSize: theme.tokens.font.FontSize.Xxxs,
-                        marginRight: theme.spacingFunction(6),
-                        flexShrink: 0,
+                        display: 'flex',
+                        justifyContent: 'space-between',
+                        marginBottom: theme.spacingFunction(4),
+                        ...(!isIPv6InUse
+                          ? {
+                              color:
+                                theme.tokens.alias.Content.Text.Primary
+                                  .Disabled,
+                            }
+                          : {}),
                       })}
-                    />
-                  </StyledLabel>
-                  <StyledListItem
-                    component="span"
-                    sx={(theme) => ({
-                      ...(!isIPv6InUse
-                        ? {
-                            color:
-                              theme.tokens.alias.Content.Text.Primary.Disabled,
-                          }
-                        : {}),
-                    })}
-                  >
-                    {prefixListDetails.ipv6!.length > 0 ? (
-                      prefixListDetails.ipv6!.join(', ')
-                    ) : (
-                      <i>no IP addresses</i>
-                    )}
-                  </StyledListItem>
-                </Paper>
-              )}
+                    >
+                      IPv6
+                      <Chip
+                        data-testid="ipv6-chip"
+                        label={isIPv6InUse ? 'in use' : 'not in use'}
+                        sx={(theme) => ({
+                          background: isIPv6InUse
+                            ? theme.tokens.component.Badge.Positive.Subtle
+                                .Background
+                            : theme.tokens.component.Badge.Neutral.Subtle
+                                .Background,
+                          color: isIPv6InUse
+                            ? theme.tokens.component.Badge.Positive.Subtle.Text
+                            : theme.tokens.component.Badge.Neutral.Subtle.Text,
+                          font: theme.font.bold,
+                          fontSize: theme.tokens.font.FontSize.Xxxs,
+                          marginRight: theme.spacingFunction(6),
+                          flexShrink: 0,
+                        })}
+                      />
+                    </StyledLabel>
+                    <StyledListItem
+                      component="span"
+                      sx={(theme) => ({
+                        ...(!isIPv6InUse
+                          ? {
+                              color:
+                                theme.tokens.alias.Content.Text.Primary
+                                  .Disabled,
+                            }
+                          : {}),
+                      })}
+                    >
+                      {prefixListDetails.ipv6!.length > 0 ? (
+                        prefixListDetails.ipv6!.join(', ')
+                      ) : (
+                        <i>no IP addresses</i>
+                      )}
+                    </StyledListItem>
+                  </Paper>
+                )}
+              </Stack>
             </>
           )}
 
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx
index ef26ae33514..401e0b63459 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx
@@ -347,7 +347,7 @@ export const FirewallRuleForm = React.memo((props: FirewallRuleFormProps) => {
             tooltip={ipNetmaskTooltipText}
           />
           {isFirewallRulesetsPrefixlistsFeatureEnabled && (
-            <MultiplePrefixListSelect
+            <StyledMultiplePrefixListSelect
               aria-label="Prefix List for Firewall rule"
               handleOpenPrefixListDrawer={handleOpenPrefixListDrawer}
               onChange={handlePrefixListChange}
@@ -400,3 +400,9 @@ const StyledMultipleIPInput = styled(MultipleIPInput, {
 })(({ theme, ips }) => ({
   ...(ips.length !== 0 ? { marginTop: theme.spacingFunction(16) } : {}),
 }));
+
+const StyledMultiplePrefixListSelect = styled(MultiplePrefixListSelect, {
+  label: 'StyledMultipleIPInput',
+})(({ theme, pls }) => ({
+  ...(pls.length !== 0 ? { marginTop: theme.spacingFunction(16) } : {}),
+}));
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
index ebeff8eec5b..69a4a59f3e6 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
@@ -25,7 +25,6 @@ import { prop, uniqBy } from 'ramda';
 import * as React from 'react';
 
 import Undo from 'src/assets/icons/undo.svg';
-import { CopyTooltip } from 'src/components/CopyTooltip/CopyTooltip';
 import { Link } from 'src/components/Link';
 import { MaskableText } from 'src/components/MaskableText/MaskableText';
 import { Table } from 'src/components/Table';
@@ -42,6 +41,7 @@ import {
   predefinedFirewallFromRule as ruleToPredefinedFirewall,
   useIsFirewallRulesetsPrefixlistsEnabled,
 } from 'src/features/Firewalls/shared';
+import { IPAddress } from 'src/features/Linodes/LinodesLanding/IPAddress';
 import { CustomKeyboardSensor } from 'src/utilities/CustomKeyboardSensor';
 
 import { FirewallRuleActionMenu } from './FirewallRuleActionMenu';
@@ -55,7 +55,6 @@ import {
   StyledTableRow,
 } from './FirewallRuleTable.styles';
 import { sortPortString } from './shared';
-import { useStyles } from './shared.styles';
 
 import type { FirewallRuleDrawerMode } from './FirewallRuleDrawer.types';
 import type { ExtendedFirewallRule, RuleStatus } from './firewallRuleEditor';
@@ -384,17 +383,29 @@ const FirewallRuleTableRow = React.memo((props: FirewallRuleTableRowProps) => {
     zIndex: isDragging ? 9999 : 0,
   } as const;
 
-  const { classes } = useStyles();
+  const [isHovered, setIsHovered] = React.useState(false);
+
+  const handleMouseEnter = React.useCallback(() => {
+    setIsHovered(true);
+  }, []);
+
+  const handleMouseLeave = React.useCallback(() => {
+    setIsHovered(false);
+  }, []);
 
   if (isRuleSetLoading) {
     return <TableRowLoading columns={smDown ? 3 : lgDown ? 5 : 6} />;
   }
 
+  const ruleSetCopyableId = `${rulesetDetails ? 'ID:' : 'Ruleset ID:'} ${ruleset}`;
+
   return (
     <StyledTableRow
       aria-label={label ?? `firewall rule ${id}`}
       disabled={disabled}
       key={id}
+      onMouseEnter={handleMouseEnter}
+      onMouseLeave={handleMouseLeave}
       originalIndex={originalIndex}
       ref={setNodeRef}
       ruleIndex={index}
@@ -439,47 +450,35 @@ const FirewallRuleTableRow = React.memo((props: FirewallRuleTableRowProps) => {
       )}
 
       {isRuleSetRowEnabled && (
-        <>
-          <TableCell aria-label={`Label: ${label}`}>
-            <Box
-              alignItems="center"
-              display="flex"
-              gap={rulesetDetails ? 1 : 0}
-            >
-              <Box alignItems="center" display="flex">
-                <StyledDragIndicator
-                  aria-label="Drag indicator icon"
-                  sx={{ flexShrink: 0 }}
-                />
-                {rulesetDetails && (
-                  <Link
-                    onClick={() =>
-                      handleOpenRuleSetDrawerForViewing?.(rulesetDetails.id)
-                    }
-                  >
-                    {rulesetDetails?.label}
-                  </Link>
-                )}
-              </Box>
-              <Hidden smDown={!!rulesetDetails}>
-                <Box
-                  sx={{
-                    alignItems: 'center',
-                    display: 'flex',
-                  }}
+        <TableCell
+          aria-label={`Label: ${label}`}
+          colSpan={smDown ? 2 : lgDown ? 4 : 5}
+        >
+          <Box
+            alignItems="center"
+            display="flex"
+            gap={rulesetDetails ? 1.5 : 0}
+          >
+            <Box alignItems="center" display="flex">
+              <StyledDragIndicator
+                aria-label="Drag indicator icon"
+                sx={{ flexShrink: 0 }}
+              />
+              {rulesetDetails && (
+                <Link
+                  onClick={() =>
+                    handleOpenRuleSetDrawerForViewing?.(rulesetDetails.id)
+                  }
                 >
-                  <span>{rulesetDetails ? 'ID:' : 'Rule Set ID:'}&nbsp;</span>
-                  <span>{ruleset}</span>
-                  <CopyTooltip
-                    className={classes.copyIcon}
-                    text={String(ruleset)}
-                  />
-                </Box>
-              </Hidden>
+                  {rulesetDetails?.label}
+                </Link>
+              )}
             </Box>
-          </TableCell>
-          <TableCell colSpan={smDown ? 0 : lgDown ? 3 : 4} />
-        </>
+            <Box sx={{ whiteSpace: 'nowrap' }}>
+              <IPAddress ips={[ruleSetCopyableId]} isHovered={isHovered} />
+            </Box>
+          </Box>
+        </TableCell>
       )}
 
       <TableCell>
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MultiplePrefixListSelect.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MultiplePrefixListSelect.tsx
index 67e3312427f..cb13e874b4a 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MultiplePrefixListSelect.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MultiplePrefixListSelect.tsx
@@ -32,21 +32,26 @@ const useStyles = makeStyles()((theme: Theme) => ({
       justifyContent: 'flex-start',
     },
     paddingLeft: 0,
-    paddingTop: theme.spacingFunction(12),
+    paddingTop: theme.spacingFunction(12), // default when empty
+  },
+  addPLReducedPadding: {
+    paddingTop: theme.spacingFunction(4), // when last row is selected
+  },
+  autocomplete: {
+    "& [data-testid='inputLabelWrapper']": {
+      display: 'none',
+    },
   },
   button: {
     '& > span': {
       padding: 2,
     },
+    marginTop: theme.spacingFunction(8),
     marginLeft: `-${theme.spacingFunction(8)}`,
-    marginTop: 4,
-    minHeight: 'auto',
-    minWidth: 'auto',
+    height: 20,
+    width: 20,
     padding: 0,
   },
-  root: {
-    marginTop: theme.spacingFunction(8),
-  },
 }));
 
 const isPrefixListSupported = (pl: FirewallPrefixList) =>
@@ -216,6 +221,9 @@ export const MultiplePrefixListSelect = React.memo(
       return null;
     }
 
+    const lastRowSelected =
+      pls.length > 0 && pls[pls.length - 1].address !== '';
+
     const renderRow = (thisPL: ExtendedPL, idx: number) => {
       const availableOptions = getAvailableOptions(idx, thisPL.address);
 
@@ -237,6 +245,19 @@ export const MultiplePrefixListSelect = React.memo(
       const disableIPv4 = ipv4Unsupported || ipv4Forced;
       const disableIPv6 = ipv6Unsupported || ipv6Forced;
 
+      const getCheckboxTooltipText = (
+        ipUnsupported?: boolean,
+        ipForced?: boolean
+      ) => {
+        if (ipUnsupported) {
+          return 'Not supported by this Prefix List';
+        }
+        if (ipForced) {
+          return 'At least one array must be selected';
+        }
+        return undefined;
+      };
+
       return (
         <Grid
           container
@@ -250,6 +271,7 @@ export const MultiplePrefixListSelect = React.memo(
         >
           <Grid size={11}>
             <Autocomplete
+              className={classes.autocomplete}
               disableClearable={prefixLists.length > 0}
               disabled={disabled}
               errorText={thisPL.error}
@@ -274,20 +296,32 @@ export const MultiplePrefixListSelect = React.memo(
                 sx={{ ml: 0.4 }}
               >
                 <Box display="flex" gap={2}>
-                  <Checkbox
-                    checked={thisPL.inIPv4Rule === true}
-                    data-testid={`ipv4-checkbox-${idx}`}
-                    disabled={disableIPv4 || disabled}
-                    onChange={() => handleToggleIPv4(!thisPL.inIPv4Rule, idx)}
-                    text="IPv4"
-                  />
-                  <Checkbox
-                    checked={thisPL.inIPv6Rule === true}
-                    data-testid={`ipv6-checkbox-${idx}`}
-                    disabled={disableIPv6 || disabled}
-                    onChange={() => handleToggleIPv6(!thisPL.inIPv6Rule, idx)}
-                    text="IPv6"
-                  />
+                  <Stack direction="row">
+                    <Checkbox
+                      checked={thisPL.inIPv4Rule === true}
+                      data-testid={`ipv4-checkbox-${idx}`}
+                      disabled={disableIPv4 || disabled}
+                      onChange={() => handleToggleIPv4(!thisPL.inIPv4Rule, idx)}
+                      text="IPv4"
+                      toolTipText={getCheckboxTooltipText(
+                        ipv4Unsupported,
+                        ipv4Forced
+                      )}
+                    />
+                  </Stack>
+                  <Stack direction="row">
+                    <Checkbox
+                      checked={thisPL.inIPv6Rule === true}
+                      data-testid={`ipv6-checkbox-${idx}`}
+                      disabled={disableIPv6 || disabled}
+                      onChange={() => handleToggleIPv6(!thisPL.inIPv6Rule, idx)}
+                      text="IPv6"
+                      toolTipText={getCheckboxTooltipText(
+                        ipv6Unsupported,
+                        ipv6Forced
+                      )}
+                    />
+                  </Stack>
                 </Box>
                 <Box alignItems="center" display="flex">
                   <LinkButton
@@ -311,11 +345,6 @@ export const MultiplePrefixListSelect = React.memo(
               data-testid="button"
               disabled={disabled}
               onClick={() => removeInput(idx)}
-              sx={(theme) => ({
-                height: 20,
-                width: 20,
-                marginTop: `${theme.spacingFunction(16)} !important`,
-              })}
             >
               <CloseIcon data-testid={`delete-pl-${idx}`} />
             </IconButton>
@@ -325,11 +354,11 @@ export const MultiplePrefixListSelect = React.memo(
     };
 
     return (
-      <div className={cx(classes.root, className)}>
+      <div className={cx(className)}>
         {/* Display the title only when pls.length > 0 (i.e., at least one PL row is added) */}
         {pls.length > 0 && (
           <Box display="flex">
-            <InputLabel sx={{ margin: 0 }}>Prefix List</InputLabel>
+            <InputLabel>Prefix List</InputLabel>
             {getFeatureChip({
               isFirewallRulesetsPrefixlistsFeatureEnabled,
               isFirewallRulesetsPrefixListsBetaEnabled,
@@ -342,7 +371,10 @@ export const MultiplePrefixListSelect = React.memo(
         </Stack>
         <Button
           buttonType="secondary"
-          className={classes.addPL}
+          className={cx(
+            classes.addPL,
+            lastRowSelected && classes.addPLReducedPadding // Reduce top padding when last PL selected
+          )}
           compactX
           disabled={disabled}
           onClick={addNewInput}
diff --git a/packages/manager/src/features/Firewalls/shared.test.tsx b/packages/manager/src/features/Firewalls/shared.test.tsx
index d73064fb1e8..529fd807909 100644
--- a/packages/manager/src/features/Firewalls/shared.test.tsx
+++ b/packages/manager/src/features/Firewalls/shared.test.tsx
@@ -230,6 +230,14 @@ describe('buildPrefixListMap', () => {
 describe('generateAddressesLabelV2', () => {
   const onPrefixListClick = vi.fn();
 
+  /**
+   * Expected display order of addresses:
+   * '192.168.1.1',
+   * '2001:db8:85a3::8a2e:370:7334/128',
+   * 'pl:system:test-1 (IPv4, IPv6)',
+   * 'pl::test-2 (IPv4)',
+   * 'pl::test-3 (IPv6)'
+   */
   const addresses: FirewallRuleType['addresses'] = {
     ipv4: [
       'pl:system:test-1', // PL attached to both IPv4/IPv6
@@ -328,15 +336,15 @@ describe('generateAddressesLabelV2', () => {
     });
     const { getByText, queryByText } = renderWithTheme(<>{result}</>);
 
-    expect(getByText('pl:system:test-1 (IPv4, IPv6)')).toBeVisible();
+    expect(getByText('192.168.1.1')).toBeVisible();
 
     expect(getByText('+4')).toBeVisible(); // 5 total elements (1 shown + 4 hidden)
 
     // Hidden items are not rendered outside tooltip
+    expect(queryByText('2001:db8:85a3::8a2e:370:7334/128')).toBeNull();
+    expect(queryByText('pl:system:test-1 (IPv4, IPv6)')).toBeNull();
     expect(queryByText('pl::test-2 (IPv4)')).toBeNull();
     expect(queryByText('pl::test-3 (IPv6)')).toBeNull();
-    expect(queryByText('192.168.1.1')).toBeNull();
-    expect(queryByText('2001:db8:85a3::8a2e:370:7334/128')).toBeNull();
   });
 
   it('renders all items if showTruncateChip is false', () => {
@@ -366,11 +374,11 @@ describe('generateAddressesLabelV2', () => {
     );
 
     // Only the first 2 elements are visible outside tooltip
-    expect(getByText('pl:system:test-1 (IPv4, IPv6)')).toBeVisible();
-    expect(getByText('pl::test-2 (IPv4)')).toBeVisible();
+    expect(getByText('192.168.1.1')).toBeVisible();
+    expect(getByText('2001:db8:85a3::8a2e:370:7334/128')).toBeVisible();
+    expect(queryByText('pl:system:test-1 (IPv4, IPv6)')).toBeNull();
+    expect(queryByText('pl::test-2 (IPv4)')).toBeNull();
     expect(queryByText('pl::test-3 (IPv6)')).toBeNull();
-    expect(queryByText('192.168.1.1')).toBeNull();
-    expect(queryByText('2001:db8:85a3::8a2e:370:7334/128')).toBeNull();
 
     // Chip shows correct hidden count
     const chip = getByText('+3');
@@ -385,9 +393,9 @@ describe('generateAddressesLabelV2', () => {
     // Check that only hidden items are present in tooltip
     expect(tooltipItems).toHaveLength(3);
     expect(tooltipItems.map((item) => item.textContent)).toEqual([
+      'pl:system:test-1 (IPv4, IPv6)',
+      'pl::test-2 (IPv4)',
       'pl::test-3 (IPv6)',
-      '192.168.1.1',
-      '2001:db8:85a3::8a2e:370:7334/128',
     ]);
   });
 });
diff --git a/packages/manager/src/features/Firewalls/shared.tsx b/packages/manager/src/features/Firewalls/shared.tsx
index 77d66940084..b236b0c695a 100644
--- a/packages/manager/src/features/Firewalls/shared.tsx
+++ b/packages/manager/src/features/Firewalls/shared.tsx
@@ -411,6 +411,24 @@ export const generateAddressesLabelV2 = (
     elements.push('All IPv6');
   }
 
+  // Add remaining IPv4 addresses that are not prefix lists
+  if (!allowedAllIPv4) {
+    addresses?.ipv4?.forEach((ip) => {
+      if (!isPrefixList(ip)) {
+        elements.push(<span key={ip}>{ip}</span>);
+      }
+    });
+  }
+
+  // Add remaining IPv6 addresses that are not prefix lists
+  if (!allowedAllIPv6) {
+    addresses?.ipv6?.forEach((ip) => {
+      if (!isPrefixList(ip)) {
+        elements.push(<span key={ip}>{ip}</span>);
+      }
+    });
+  }
+
   // Build a map of prefix lists.
   // NOTE: If "allowedAllIPv4" or "allowedAllIPv6" is true, we skip those IPs entirely
   // because "All IPvX" is already represented, and there are no specific addresses to map.
@@ -446,24 +464,6 @@ export const generateAddressesLabelV2 = (
     );
   });
 
-  // Add remaining IPv4 addresses that are not prefix lists
-  if (!allowedAllIPv4) {
-    addresses?.ipv4?.forEach((ip) => {
-      if (!isPrefixList(ip)) {
-        elements.push(<span key={ip}>{ip}</span>);
-      }
-    });
-  }
-
-  // Add remaining IPv6 addresses that are not prefix lists
-  if (!allowedAllIPv6) {
-    addresses?.ipv6?.forEach((ip) => {
-      if (!isPrefixList(ip)) {
-        elements.push(<span key={ip}>{ip}</span>);
-      }
-    });
-  }
-
   // If no IPs are allowed
   if (elements.length === 0) return 'None';
 
@@ -478,18 +478,18 @@ export const generateAddressesLabelV2 = (
       sx={(theme) => ({
         maxHeight: '40vh',
         overflowY: 'auto',
-        // Extra space on the right to prevent scrollbar from overlapping content
-        paddingRight: theme.spacingFunction(8),
+        px: theme.spacingFunction(16),
       })}
     >
-      <ul
-        style={{
+      <Box
+        component="ul"
+        sx={(theme) => ({
           display: 'flex',
           flexDirection: 'column',
-          gap: 4,
-          paddingLeft: 20,
+          gap: 0.5,
+          px: theme.spacingFunction(20),
           margin: 0,
-        }}
+        })}
       >
         {hiddenElements.map((el, i) => (
           <li
@@ -500,7 +500,7 @@ export const generateAddressesLabelV2 = (
             {el}
           </li>
         ))}
-      </ul>
+      </Box>
     </Box>
   );
 
@@ -522,13 +522,13 @@ export const generateAddressesLabelV2 = (
       </Box>
       {hasMore && (
         <Tooltip
-          arrow
           placement="bottom"
           slotProps={{
             tooltip: {
               sx: (theme) => ({
                 minWidth: '248px',
-                padding: `${theme.spacingFunction(16)} !important`,
+                paddingX: '0 !important',
+                paddingY: `${theme.spacingFunction(16)} !important`,
               }),
             },
           }}

From 488dfc904cde2901d37c392dd110ca0da11e142b Mon Sep 17 00:00:00 2001
From: Purvesh Makode <pmakode@akamai.com>
Date: Mon, 8 Dec 2025 15:24:19 +0530
Subject: [PATCH 84/91] upcoming: [UIE-9738] - Handle special PLs in PrefixList
 drawer (#13172)

* Save progress

* Save progress

* Save progress

* Add more changes

* Add comments

* Added changeset: Handle special PLs in PrefixList drawer

* Add comments

* Add ids to Checkbox
---
 ...r-13172-upcoming-features-1764950932547.md |   5 +
 .../Rules/FirewallPrefixListDrawer.test.tsx   | 120 ++++++-
 .../Rules/FirewallPrefixListDrawer.tsx        | 325 +++++++-----------
 .../Rules/FirewallPrefixListIPSection.tsx     |  72 ++++
 .../Rules/MultiplePrefixListSelect.tsx        |  48 ++-
 .../Firewalls/FirewallDetail/Rules/shared.ts  |  52 ++-
 packages/manager/src/mocks/serverHandlers.ts  |  31 +-
 7 files changed, 418 insertions(+), 235 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13172-upcoming-features-1764950932547.md
 create mode 100644 packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListIPSection.tsx

diff --git a/packages/manager/.changeset/pr-13172-upcoming-features-1764950932547.md b/packages/manager/.changeset/pr-13172-upcoming-features-1764950932547.md
new file mode 100644
index 00000000000..38a2c3a6fc3
--- /dev/null
+++ b/packages/manager/.changeset/pr-13172-upcoming-features-1764950932547.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Handle special PLs in PrefixList drawer ([#13172](https://github.com/linode/manager/pull/13172))
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.test.tsx
index fa248f6675f..0bd18ab2a35 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.test.tsx
@@ -8,6 +8,7 @@ import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import * as shared from '../../shared';
 import { FirewallPrefixListDrawer } from './FirewallPrefixListDrawer';
+import * as rulesShared from './shared';
 import { PREFIXLIST_MARKED_FOR_DELETION_TEXT } from './shared';
 
 import type { FirewallPrefixListDrawerProps } from './FirewallPrefixListDrawer';
@@ -34,6 +35,7 @@ vi.mock('@linode/utilities', async () => {
 });
 
 const spy = vi.spyOn(shared, 'useIsFirewallRulesetsPrefixlistsEnabled');
+const combineSpy = vi.spyOn(rulesShared, 'combinePrefixLists');
 
 //
 // Helper to compute expected UI values/text
@@ -76,7 +78,7 @@ const computeExpectedElements = (
   return { title, button, label };
 };
 
-describe('PrefixListDrawer', () => {
+describe('FirewallPrefixListDrawer', () => {
   beforeEach(() => {
     spy.mockReturnValue({
       isFirewallRulesetsPrefixlistsFeatureEnabled: true,
@@ -143,18 +145,26 @@ describe('PrefixListDrawer', () => {
 
   it.each(drawerProps)(
     'renders correct UI for category:$category, contextType:$context.type and modeViewedFrom:$context.modeViewedFrom',
-    ({ category, context }) => {
+    ({ category, context, selectedPrefixListLabel }) => {
+      const mockData = firewallPrefixListFactory.build({
+        name: selectedPrefixListLabel,
+      });
       queryMocks.useAllFirewallPrefixListsQuery.mockReturnValue({
-        data: [firewallPrefixListFactory.build()],
+        data: [mockData],
       });
 
+      combineSpy.mockReturnValue([
+        ...rulesShared.SPECIAL_PREFIX_LISTS,
+        mockData,
+      ]);
+
       const { getByText, getByRole } = renderWithTheme(
         <FirewallPrefixListDrawer
           category={category}
           context={context}
           isOpen={true}
           onClose={vi.fn()}
-          selectedPrefixListLabel="pl-test"
+          selectedPrefixListLabel={selectedPrefixListLabel}
         />
       );
 
@@ -200,12 +210,17 @@ describe('PrefixListDrawer', () => {
 
   it.each(deletionTestCases)('%s', async (_, deletedTimeStamp) => {
     const mockPrefixList = firewallPrefixListFactory.build({
+      name: 'pl-test',
       deleted: deletedTimeStamp,
     });
 
     queryMocks.useAllFirewallPrefixListsQuery.mockReturnValue({
       data: [mockPrefixList],
     });
+    combineSpy.mockReturnValue([
+      ...rulesShared.SPECIAL_PREFIX_LISTS,
+      mockPrefixList,
+    ]);
 
     const { getByText, getByTestId, findByText, queryByText } = renderWithTheme(
       <FirewallPrefixListDrawer
@@ -340,6 +355,10 @@ describe('PrefixListDrawer', () => {
       queryMocks.useAllFirewallPrefixListsQuery.mockReturnValue({
         data: [mockPrefixList],
       });
+      combineSpy.mockReturnValue([
+        ...rulesShared.SPECIAL_PREFIX_LISTS,
+        mockPrefixList,
+      ]);
 
       const { getByTestId } = renderWithTheme(
         <FirewallPrefixListDrawer
@@ -379,3 +398,96 @@ describe('PrefixListDrawer', () => {
     }
   );
 });
+
+describe('FirewallPrefixListDrawer - Special "<current>" Prefix Lists', () => {
+  beforeEach(() => {
+    spy.mockReturnValue({
+      isFirewallRulesetsPrefixlistsFeatureEnabled: true,
+      isFirewallRulesetsPrefixListsBetaEnabled: false,
+      isFirewallRulesetsPrefixListsLAEnabled: false,
+      isFirewallRulesetsPrefixListsGAEnabled: false,
+    });
+  });
+  const specialPrefixListDescription =
+    'System-defined PrefixLists, such as pl::vpcs:<current> and pl::subnets:<current>, for VPC interface firewalls are dynamic and update automatically. They manage access to and from the interface for addresses within the interface’s VPC or VPC subnet.';
+  const plRuleRef = { inIPv4Rule: true, inIPv6Rule: true };
+  const context: FirewallPrefixListDrawerProps['context'][] = [
+    {
+      type: 'rule',
+      plRuleRef,
+    },
+    {
+      modeViewedFrom: 'create',
+      type: 'ruleset',
+      plRuleRef,
+    },
+    { modeViewedFrom: 'edit', type: 'rule', plRuleRef },
+    { modeViewedFrom: 'view', type: 'ruleset', plRuleRef },
+  ];
+  const specialPLsTestCases = [
+    {
+      name: 'pl::vpcs:<current>',
+      description: specialPrefixListDescription,
+      context: context[0],
+    },
+    {
+      name: 'pl::subnets:<current>',
+      description: specialPrefixListDescription,
+      context: context[1],
+    },
+    {
+      name: 'pl::vpcs:<current>',
+      description: specialPrefixListDescription,
+      context: context[2],
+    },
+    {
+      name: 'pl::subnets:<current>',
+      description: specialPrefixListDescription,
+      context: context[3],
+    },
+  ];
+
+  it.each(specialPLsTestCases)(
+    'renders only Name and Description for special PL: $name, contextType: $context.type and modeViewedFrom: $context.modeViewedFrom',
+    ({ name, description, context }) => {
+      // API returns no matches, special PL logic must handle it
+      queryMocks.useAllFirewallPrefixListsQuery.mockReturnValue({
+        data: [],
+      });
+      combineSpy.mockReturnValue([...rulesShared.SPECIAL_PREFIX_LISTS]);
+
+      const { getByText, queryByText } = renderWithTheme(
+        <FirewallPrefixListDrawer
+          category="inbound"
+          context={context}
+          isOpen={true}
+          onClose={vi.fn()}
+          selectedPrefixListLabel={name}
+        />
+      );
+
+      const { label } = computeExpectedElements('inbound', context);
+
+      // Name and Description should be visible
+      expect(getByText(label)).toBeVisible(); // First label (Prefix List Name: OR Name:)
+      expect(getByText(name)).toBeVisible();
+
+      expect(getByText('Description:')).toBeVisible();
+      expect(getByText(description)).toBeVisible();
+
+      // All other fields must be hidden
+      const hiddenFields = [
+        'ID:',
+        'Type:',
+        'Visibility:',
+        'Version:',
+        'Created:',
+        'Updated:',
+      ];
+
+      hiddenFields.forEach((label) => {
+        expect(queryByText(label)).not.toBeInTheDocument();
+      });
+    }
+  );
+});
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx
index 845b5486e63..b846482f8b2 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx
@@ -1,13 +1,5 @@
 import { useAllFirewallPrefixListsQuery } from '@linode/queries';
-import {
-  Box,
-  Button,
-  Chip,
-  Drawer,
-  Paper,
-  Stack,
-  TooltipIcon,
-} from '@linode/ui';
+import { Box, Button, Drawer, Stack, TooltipIcon } from '@linode/ui';
 import { capitalize } from '@linode/utilities';
 import * as React from 'react';
 
@@ -19,8 +11,11 @@ import {
   getFeatureChip,
   useIsFirewallRulesetsPrefixlistsEnabled,
 } from '../../shared';
+import { PrefixListIPSection } from './FirewallPrefixListIPSection';
 import {
+  combinePrefixLists,
   getPrefixListType,
+  isSpecialPrefixList,
   PREFIXLIST_MARKED_FOR_DELETION_TEXT,
 } from './shared';
 import {
@@ -58,15 +53,31 @@ export const FirewallPrefixListDrawer = React.memo(
       isFirewallRulesetsPrefixListsBetaEnabled,
       isFirewallRulesetsPrefixListsGAEnabled,
     } = useIsFirewallRulesetsPrefixlistsEnabled();
+
+    const isPrefixListSpecial = isSpecialPrefixList(selectedPrefixListLabel);
+
     const { classes } = useStyles();
 
-    const { data, error, isFetching } = useAllFirewallPrefixListsQuery(
-      isFirewallRulesetsPrefixlistsFeatureEnabled,
+    const {
+      data: apiPL,
+      error,
+      isFetching,
+    } = useAllFirewallPrefixListsQuery(
+      // @TODO: Temporarily disabling this API call for `isPrefixListSpecial`
+      // since the API doesn't yet support special Prefix Lists.
+      // Remove this check and refactor related logic once API support is added.
+      isFirewallRulesetsPrefixlistsFeatureEnabled && !isPrefixListSpecial,
       {},
       { name: selectedPrefixListLabel }
     );
 
-    const prefixListDetails = data?.[0];
+    // Merge with hardcoded special PLs
+    const prefixLists = React.useMemo(() => combinePrefixLists(apiPL), [apiPL]);
+
+    // Get the actual prefix list by name (name is unique)
+    const prefixListDetails = prefixLists.find(
+      (pl) => pl.name === selectedPrefixListLabel
+    );
 
     const isIPv4Supported =
       prefixListDetails?.ipv4 !== null && prefixListDetails?.ipv4 !== undefined;
@@ -125,6 +136,77 @@ export const FirewallPrefixListDrawer = React.memo(
         ? 'Name'
         : 'Prefix List Name';
 
+    const drawerFooter = (
+      <Box
+        sx={(theme) => ({
+          marginTop: theme.spacingFunction(16),
+          display: 'flex',
+          justifyContent: backButtonText ? 'flex-start' : 'flex-end',
+        })}
+      >
+        <Button
+          buttonType={backButtonText ? 'outlined' : 'secondary'}
+          onClick={() => onClose({ closeAll: false })}
+          startIcon={backButtonText ? <ArrowLeftIcon /> : undefined}
+          sx={{
+            ...(backButtonText && {
+              textTransform: 'none',
+            }),
+          }}
+        >
+          {backButtonText ?? 'Close'}
+        </Button>
+      </Box>
+    );
+
+    // For normal Prefix Lists: display all fields.
+    // For special Prefix Lists: display only 'Name' or 'Prefix List Name' and 'Description'.
+    const fields = [
+      {
+        label: plFieldLabel,
+        value: prefixListDetails?.name ?? selectedPrefixListLabel,
+      },
+      !isPrefixListSpecial && {
+        label: 'ID',
+        value: prefixListDetails?.id,
+        copy: true,
+      },
+      {
+        label: 'Description',
+        value: prefixListDetails?.description,
+        column: true,
+      },
+      !isPrefixListSpecial &&
+        prefixListDetails?.name && {
+          label: 'Type',
+          value: getPrefixListType(prefixListDetails.name),
+        },
+      !isPrefixListSpecial &&
+        prefixListDetails?.visibility && {
+          label: 'Visibility',
+          value: capitalize(prefixListDetails.visibility),
+        },
+      !isPrefixListSpecial && {
+        label: 'Version',
+        value: prefixListDetails?.version,
+      },
+      !isPrefixListSpecial &&
+        prefixListDetails?.created && {
+          label: 'Created',
+          value: <DateTimeDisplay value={prefixListDetails.created} />,
+        },
+      !isPrefixListSpecial &&
+        prefixListDetails?.updated && {
+          label: 'Updated',
+          value: <DateTimeDisplay value={prefixListDetails.updated} />,
+        },
+    ].filter(Boolean) as {
+      column?: boolean;
+      copy?: boolean;
+      label: string;
+      value: React.ReactNode | string;
+    }[];
+
     return (
       <Drawer
         error={error}
@@ -143,42 +225,7 @@ export const FirewallPrefixListDrawer = React.memo(
         <Box mt={2}>
           {prefixListDetails && (
             <>
-              {[
-                {
-                  label: plFieldLabel,
-                  value: prefixListDetails.name,
-                },
-                {
-                  label: 'ID',
-                  value: prefixListDetails.id,
-                  copy: true,
-                },
-                {
-                  label: 'Description',
-                  value: prefixListDetails.description,
-                  column: true,
-                },
-                {
-                  label: 'Type',
-                  value: getPrefixListType(prefixListDetails.name),
-                },
-                {
-                  label: 'Visibility',
-                  value: capitalize(prefixListDetails.visibility),
-                },
-                {
-                  label: 'Version',
-                  value: prefixListDetails.version,
-                },
-                {
-                  label: 'Created',
-                  value: <DateTimeDisplay value={prefixListDetails.created} />,
-                },
-                {
-                  label: 'Updated',
-                  value: <DateTimeDisplay value={prefixListDetails.updated} />,
-                },
-              ].map((item, idx) => (
+              {fields.map((item, idx) => (
                 <StyledListItem
                   key={`item-${idx}`}
                   paddingMultiplier={2}
@@ -189,7 +236,7 @@ export const FirewallPrefixListDrawer = React.memo(
                   }
                 >
                   {item.label && (
-                    <StyledLabel component="span">{item.label}: </StyledLabel>
+                    <StyledLabel component="span">{item.label}:</StyledLabel>
                   )}
 
                   {item.value}
@@ -203,7 +250,7 @@ export const FirewallPrefixListDrawer = React.memo(
                 </StyledListItem>
               ))}
 
-              {prefixListDetails.deleted && (
+              {!isPrefixListSpecial && prefixListDetails.deleted && (
                 <StyledListItem paddingMultiplier={2}>
                   <StyledWarningIcon />
                   <StyledLabel
@@ -232,168 +279,28 @@ export const FirewallPrefixListDrawer = React.memo(
                   />
                 </StyledListItem>
               )}
-
-              <Stack gap={2} marginTop={1}>
-                {isIPv4Supported && (
-                  <Paper
-                    data-testid="ipv4-section"
-                    sx={(theme) => ({
-                      backgroundColor: theme.tokens.alias.Background.Neutral,
-                      padding: theme.spacingFunction(12),
-                      ...(isIPv4InUse
-                        ? {
-                            border: `1px solid ${theme.tokens.alias.Border.Positive}`,
-                          }
-                        : {}),
-                    })}
-                  >
-                    <StyledLabel
-                      sx={(theme) => ({
-                        display: 'flex',
-                        justifyContent: 'space-between',
-                        marginBottom: theme.spacingFunction(4),
-                        ...(!isIPv4InUse
-                          ? {
-                              color:
-                                theme.tokens.alias.Content.Text.Primary
-                                  .Disabled,
-                            }
-                          : {}),
-                      })}
-                    >
-                      IPv4
-                      <Chip
-                        data-testid="ipv4-chip"
-                        label={isIPv4InUse ? 'in use' : 'not in use'}
-                        sx={(theme) => ({
-                          background: isIPv4InUse
-                            ? theme.tokens.component.Badge.Positive.Subtle
-                                .Background
-                            : theme.tokens.component.Badge.Neutral.Subtle
-                                .Background,
-                          color: isIPv4InUse
-                            ? theme.tokens.component.Badge.Positive.Subtle.Text
-                            : theme.tokens.component.Badge.Neutral.Subtle.Text,
-                          font: theme.font.bold,
-                          fontSize: theme.tokens.font.FontSize.Xxxs,
-                          marginRight: theme.spacingFunction(6),
-                          flexShrink: 0,
-                        })}
-                      />
-                    </StyledLabel>
-
-                    <StyledListItem
-                      component="span"
-                      sx={(theme) => ({
-                        ...(!isIPv4InUse
-                          ? {
-                              color:
-                                theme.tokens.alias.Content.Text.Primary
-                                  .Disabled,
-                            }
-                          : {}),
-                      })}
-                    >
-                      {prefixListDetails.ipv4!.length > 0 ? (
-                        prefixListDetails.ipv4!.join(', ')
-                      ) : (
-                        <i>no IP addresses</i>
-                      )}
-                    </StyledListItem>
-                  </Paper>
-                )}
-
-                {isIPv6Supported && (
-                  <Paper
-                    data-testid="ipv6-section"
-                    sx={(theme) => ({
-                      backgroundColor: theme.tokens.alias.Background.Neutral,
-                      padding: theme.spacingFunction(12),
-                      ...(isIPv6InUse
-                        ? {
-                            border: `1px solid ${theme.tokens.alias.Border.Positive}`,
-                          }
-                        : {}),
-                    })}
-                  >
-                    <StyledLabel
-                      sx={(theme) => ({
-                        display: 'flex',
-                        justifyContent: 'space-between',
-                        marginBottom: theme.spacingFunction(4),
-                        ...(!isIPv6InUse
-                          ? {
-                              color:
-                                theme.tokens.alias.Content.Text.Primary
-                                  .Disabled,
-                            }
-                          : {}),
-                      })}
-                    >
-                      IPv6
-                      <Chip
-                        data-testid="ipv6-chip"
-                        label={isIPv6InUse ? 'in use' : 'not in use'}
-                        sx={(theme) => ({
-                          background: isIPv6InUse
-                            ? theme.tokens.component.Badge.Positive.Subtle
-                                .Background
-                            : theme.tokens.component.Badge.Neutral.Subtle
-                                .Background,
-                          color: isIPv6InUse
-                            ? theme.tokens.component.Badge.Positive.Subtle.Text
-                            : theme.tokens.component.Badge.Neutral.Subtle.Text,
-                          font: theme.font.bold,
-                          fontSize: theme.tokens.font.FontSize.Xxxs,
-                          marginRight: theme.spacingFunction(6),
-                          flexShrink: 0,
-                        })}
-                      />
-                    </StyledLabel>
-                    <StyledListItem
-                      component="span"
-                      sx={(theme) => ({
-                        ...(!isIPv6InUse
-                          ? {
-                              color:
-                                theme.tokens.alias.Content.Text.Primary
-                                  .Disabled,
-                            }
-                          : {}),
-                      })}
-                    >
-                      {prefixListDetails.ipv6!.length > 0 ? (
-                        prefixListDetails.ipv6!.join(', ')
-                      ) : (
-                        <i>no IP addresses</i>
-                      )}
-                    </StyledListItem>
-                  </Paper>
-                )}
-              </Stack>
+              {!isPrefixListSpecial && (
+                <Stack gap={2} marginTop={1}>
+                  {isIPv4Supported && (
+                    <PrefixListIPSection
+                      addresses={prefixListDetails.ipv4!}
+                      inUse={Boolean(isIPv4InUse)}
+                      type="IPv4"
+                    />
+                  )}
+                  {isIPv6Supported && (
+                    <PrefixListIPSection
+                      addresses={prefixListDetails.ipv6!}
+                      inUse={Boolean(isIPv6InUse)}
+                      type="IPv6"
+                    />
+                  )}
+                </Stack>
+              )}
             </>
           )}
 
-          <Box
-            sx={(theme) => ({
-              marginTop: theme.spacingFunction(16),
-              display: 'flex',
-              justifyContent: backButtonText ? 'flex-start' : 'flex-end',
-            })}
-          >
-            <Button
-              buttonType={backButtonText ? 'outlined' : 'secondary'}
-              onClick={() => onClose({ closeAll: false })}
-              startIcon={backButtonText ? <ArrowLeftIcon /> : undefined}
-              sx={{
-                ...(backButtonText && {
-                  textTransform: 'none',
-                }),
-              }}
-            >
-              {backButtonText ?? 'Close'}
-            </Button>
-          </Box>
+          {drawerFooter}
         </Box>
       </Drawer>
     );
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListIPSection.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListIPSection.tsx
new file mode 100644
index 00000000000..de9163f88c5
--- /dev/null
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListIPSection.tsx
@@ -0,0 +1,72 @@
+import { Chip, Paper } from '@linode/ui';
+import React from 'react';
+
+import { StyledLabel, StyledListItem } from './shared.styles';
+
+interface PrefixListIPSectionProps {
+  addresses: string[];
+  inUse: boolean;
+  type: 'IPv4' | 'IPv6';
+}
+
+/**
+ * Displays a Prefix List IP section (IPv4 or IPv6) with usage indicator.
+ */
+export const PrefixListIPSection = ({
+  type,
+  inUse,
+  addresses,
+}: PrefixListIPSectionProps) => {
+  return (
+    <Paper
+      data-testid={`${type.toLowerCase()}-section`}
+      sx={(theme) => ({
+        backgroundColor: theme.tokens.alias.Background.Neutral,
+        padding: theme.spacingFunction(12),
+        ...(inUse && {
+          border: `1px solid ${theme.tokens.alias.Border.Positive}`,
+        }),
+      })}
+    >
+      <StyledLabel
+        sx={(theme) => ({
+          display: 'flex',
+          justifyContent: 'space-between',
+          marginBottom: theme.spacingFunction(4),
+          ...(!inUse && {
+            color: theme.tokens.alias.Content.Text.Primary.Disabled,
+          }),
+        })}
+      >
+        {type}
+        <Chip
+          data-testid={`${type.toLowerCase()}-chip`}
+          label={inUse ? 'in use' : 'not in use'}
+          sx={(theme) => ({
+            background: inUse
+              ? theme.tokens.component.Badge.Positive.Subtle.Background
+              : theme.tokens.component.Badge.Neutral.Subtle.Background,
+            color: inUse
+              ? theme.tokens.component.Badge.Positive.Subtle.Text
+              : theme.tokens.component.Badge.Neutral.Subtle.Text,
+            font: theme.font.bold,
+            fontSize: theme.tokens.font.FontSize.Xxxs,
+            marginRight: theme.spacingFunction(6),
+            flexShrink: 0,
+          })}
+        />
+      </StyledLabel>
+
+      <StyledListItem
+        component="span"
+        sx={(theme) => ({
+          ...(!inUse && {
+            color: theme.tokens.alias.Content.Text.Primary.Disabled,
+          }),
+        })}
+      >
+        {addresses.length > 0 ? addresses.join(', ') : <i>no IP addresses</i>}
+      </StyledListItem>
+    </Paper>
+  );
+};
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MultiplePrefixListSelect.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MultiplePrefixListSelect.tsx
index cb13e874b4a..52609f4d052 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MultiplePrefixListSelect.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MultiplePrefixListSelect.tsx
@@ -19,7 +19,12 @@ import {
   useIsFirewallRulesetsPrefixlistsEnabled,
 } from 'src/features/Firewalls/shared';
 
-import { getPrefixListType, groupPriority } from './shared';
+import {
+  combinePrefixLists,
+  getPrefixListType,
+  groupPriority,
+  isSpecialPrefixList,
+} from './shared';
 
 import type { FirewallPrefixList } from '@linode/api-v4';
 import type { Theme } from '@mui/material/styles';
@@ -54,9 +59,17 @@ const useStyles = makeStyles()((theme: Theme) => ({
   },
 }));
 
-const isPrefixListSupported = (pl: FirewallPrefixList) =>
-  (pl.ipv4 !== null && pl.ipv4 !== undefined) ||
-  (pl.ipv6 !== null && pl.ipv6 !== undefined);
+const isPrefixListSupported = (pl: FirewallPrefixList) => {
+  // Whitelisting all the Special PrefixLists as supported ones.
+  if (isSpecialPrefixList(pl.name)) {
+    return true;
+  }
+
+  return (
+    (pl.ipv4 !== null && pl.ipv4 !== undefined) ||
+    (pl.ipv6 !== null && pl.ipv6 !== undefined)
+  );
+};
 
 const getSupportDetails = (pl: FirewallPrefixList) => ({
   isPLIPv4Unsupported: pl.ipv4 === null || pl.ipv4 === undefined,
@@ -67,8 +80,13 @@ const getSupportDetails = (pl: FirewallPrefixList) => ({
  * Default selection state for a newly chosen Prefix List
  */
 const getDefaultPLReferenceState = (
-  support: ReturnType<typeof getSupportDetails>
+  support: null | ReturnType<typeof getSupportDetails>
 ): { inIPv4Rule: boolean; inIPv6Rule: boolean } => {
+  if (support === null) {
+    // Special Prefix List case
+    return { inIPv4Rule: true, inIPv6Rule: false };
+  }
+
   const { isPLIPv4Unsupported, isPLIPv6Unsupported } = support;
 
   if (!isPLIPv4Unsupported && !isPLIPv6Unsupported)
@@ -135,7 +153,7 @@ export const MultiplePrefixListSelect = React.memo(
       isFirewallRulesetsPrefixlistsFeatureEnabled
     );
 
-    const prefixLists = data ?? [];
+    const prefixLists = React.useMemo(() => combinePrefixLists(data), [data]);
 
     /**
      * Filter prefix lists to include those that support IPv4, IPv6, or both,
@@ -146,16 +164,18 @@ export const MultiplePrefixListSelect = React.memo(
         prefixLists
           .filter(isPrefixListSupported)
           .map((pl) => ({
-            label: pl.name,
-            value: pl.id,
-            support: getSupportDetails(pl),
+            label: pl.name!,
+            value: pl.id ?? pl.name,
+            support: !isSpecialPrefixList(pl.name)
+              ? getSupportDetails(pl as FirewallPrefixList)
+              : null,
           }))
           // The API does not seem to sort prefix lists by "name" to prioritize certain types.
           // This sort ensures that Autocomplete's groupBy displays groups correctly without duplicates
           // and that the dropdown shows groups in the desired order.
           .sort((a, b) => {
-            const groupA = getPrefixListType(a.label);
-            const groupB = getPrefixListType(b.label);
+            const groupA = getPrefixListType(a.label!);
+            const groupB = getPrefixListType(b.label!);
 
             return groupPriority[groupA] - groupPriority[groupB];
           }),
@@ -233,9 +253,9 @@ export const MultiplePrefixListSelect = React.memo(
 
       // Disabling a checkbox ensures that at least one option (IPv4 or IPv6) remains checked
       const ipv4Unsupported =
-        selectedOption?.support.isPLIPv4Unsupported === true;
+        selectedOption?.support?.isPLIPv4Unsupported === true;
       const ipv6Unsupported =
-        selectedOption?.support.isPLIPv6Unsupported === true;
+        selectedOption?.support?.isPLIPv6Unsupported === true;
 
       const ipv4Forced =
         thisPL.inIPv4Rule === true && thisPL.inIPv6Rule === false;
@@ -301,6 +321,7 @@ export const MultiplePrefixListSelect = React.memo(
                       checked={thisPL.inIPv4Rule === true}
                       data-testid={`ipv4-checkbox-${idx}`}
                       disabled={disableIPv4 || disabled}
+                      id={`ipv4-checkbox-${idx}`}
                       onChange={() => handleToggleIPv4(!thisPL.inIPv4Rule, idx)}
                       text="IPv4"
                       toolTipText={getCheckboxTooltipText(
@@ -314,6 +335,7 @@ export const MultiplePrefixListSelect = React.memo(
                       checked={thisPL.inIPv6Rule === true}
                       data-testid={`ipv6-checkbox-${idx}`}
                       disabled={disableIPv6 || disabled}
+                      id={`ipv6-checkbox-${idx}`}
                       onChange={() => handleToggleIPv6(!thisPL.inIPv6Rule, idx)}
                       text="IPv6"
                       toolTipText={getCheckboxTooltipText(
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.ts b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.ts
index 200ffa8c0f1..e3fb2754362 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.ts
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/shared.ts
@@ -1,6 +1,6 @@
 import { prop, sortBy } from 'ramda';
 
-import type { APIError } from '@linode/api-v4/lib/types';
+import type { APIError, FirewallPrefixList } from '@linode/api-v4/lib/types';
 export type Category = 'inbound' | 'outbound';
 
 export interface FirewallRuleError {
@@ -150,3 +150,53 @@ export const getPrefixListType = (name: string): PrefixListGroup => {
   }
   return 'Other'; // Safe fallback
 };
+
+export type SpecialPrefixList = Partial<FirewallPrefixList>;
+
+const SPECIAL_PREFIX_LISTS_DESCRIPTION =
+  'System-defined PrefixLists, such as pl::vpcs:<current> and pl::subnets:<current>, for VPC interface firewalls are dynamic and update automatically. They manage access to and from the interface for addresses within the interface’s VPC or VPC subnet.';
+
+export const SPECIAL_PREFIX_LISTS: SpecialPrefixList[] = [
+  { name: 'pl::vpcs:<current>', description: SPECIAL_PREFIX_LISTS_DESCRIPTION },
+  {
+    name: 'pl::subnets:<current>',
+    description: SPECIAL_PREFIX_LISTS_DESCRIPTION,
+  },
+];
+
+export const SPECIAL_PREFIX_LIST_NAMES = SPECIAL_PREFIX_LISTS.map(
+  (pl) => pl.name
+);
+
+export const isSpecialPrefixList = (name: string | undefined) => {
+  if (!name) return false;
+  return SPECIAL_PREFIX_LIST_NAMES.includes(name);
+};
+
+/**
+ * Combine API prefix lists with hardcoded special prefix lists.
+ * API results override special PLs if names collide.
+ * Ensures no duplicate prefix lists when combining hardcoded and API values.
+ * @TODO: Remove hardcoded special PLs once API supports them.
+ */
+export const combinePrefixLists = (
+  apiPLs: (FirewallPrefixList | SpecialPrefixList)[] | undefined
+): (FirewallPrefixList | SpecialPrefixList)[] => {
+  const map = new Map<string, FirewallPrefixList | SpecialPrefixList>();
+
+  // Add hardcoded special PLs first
+  SPECIAL_PREFIX_LISTS.forEach((pl) => {
+    if (pl.name) {
+      map.set(pl.name, pl);
+    }
+  });
+
+  // Add API results (override if name matches with hardcoded special PLs)
+  (apiPLs ?? []).forEach((pl) => {
+    if (pl.name) {
+      map.set(pl.name, pl);
+    }
+  });
+
+  return Array.from(map.values());
+};
diff --git a/packages/manager/src/mocks/serverHandlers.ts b/packages/manager/src/mocks/serverHandlers.ts
index 03479d934b8..53b7dd66f8d 100644
--- a/packages/manager/src/mocks/serverHandlers.ts
+++ b/packages/manager/src/mocks/serverHandlers.ts
@@ -150,6 +150,7 @@ import { maintenancePolicyFactory } from 'src/factories/maintenancePolicy';
 import { userAccountPermissionsFactory } from 'src/factories/userAccountPermissions';
 import { userEntityPermissionsFactory } from 'src/factories/userEntityPermissions';
 import { userRolesFactory } from 'src/factories/userRoles';
+import { SPECIAL_PREFIX_LIST_NAMES } from 'src/features/Firewalls/FirewallDetail/Rules/shared';
 
 import type {
   AccountMaintenance,
@@ -1395,14 +1396,25 @@ export const handlers = [
       const filter = JSON.parse(request.headers.get('x-filter') || '{}');
 
       if (filter['name']) {
-        const match =
-          prefixlists.find((pl) => pl.name === filter.name) ??
-          firewallPrefixListFactory.build({
-            name: filter['name'],
-            description: `${filter['name']} description`,
-          }); // fallback if not found
-
-        return HttpResponse.json(makeResourcePage([match]));
+        const existingPrefixList = prefixlists.find(
+          (pl) => pl.name === filter.name
+        );
+
+        // SPECIAL_PREFIX_LIST_NAMES may expand in the future if returned by the API
+        const isPrefixListSpecial = SPECIAL_PREFIX_LIST_NAMES.includes(
+          filter.name
+        );
+
+        const match = isPrefixListSpecial
+          ? [] // Special PLs: API currently returns empty; @TODO: update with actual response once API supports them
+          : [
+              existingPrefixList ??
+                firewallPrefixListFactory.build({
+                  name: filter.name,
+                  description: `${filter.name} description`,
+                }),
+            ];
+        return HttpResponse.json(makeResourcePage(match));
       }
     }
     return HttpResponse.json(makeResourcePage(prefixlists));
@@ -1431,6 +1443,7 @@ export const handlers = [
                   ipv4: [
                     'pl:system:resolvers:test',
                     'pl:system:test',
+                    'pl::vpcs:<current>', // special prefixlist
                     '192.168.1.200',
                     '192.168.1.201',
                   ],
@@ -1471,6 +1484,7 @@ export const handlers = [
                       'pl::supports-both-but-empty-both',
                       '172.31.255.255',
                       'pl::marked-for-deletion',
+                      'pl::vpcs:<current>', // special prefixlist
                     ],
                     ipv6: [
                       'pl::supports-both',
@@ -1483,6 +1497,7 @@ export const handlers = [
                       // our logic will treat them as a single entity within the ipv4 or ipv6 array.
                       'pl::vpcs:supports-both-2',
                       '2001:db8:85a3::8a2e:372:7336/128',
+                      'pl::subnets:<current>', // special prefixlist
                     ],
                   },
                   ports: '22, 53, 80, 100, 443, 3306',

From 5faffaa2797eeb4178b21697f1e3ff2a8e49ea99 Mon Sep 17 00:00:00 2001
From: Alban Bailly <130582365+abailly-akamai@users.noreply.github.com>
Date: Mon, 8 Dec 2025 10:58:51 +0100
Subject: [PATCH 85/91] fix: [UIE-9733] - Optimize rendering of entities in
 `AssignedRolesTable` (#13173)

* Optimize rendering of entities in AssignRolesTable

* Added changeset: Optimize rendering of entities in AssignedRolesTable
---
 .../pr-13173-fixed-1764944067009.md           |  5 ++
 .../IAM/Users/UserRoles/AssignedEntities.tsx  | 75 +++++++++++--------
 2 files changed, 48 insertions(+), 32 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13173-fixed-1764944067009.md

diff --git a/packages/manager/.changeset/pr-13173-fixed-1764944067009.md b/packages/manager/.changeset/pr-13173-fixed-1764944067009.md
new file mode 100644
index 00000000000..771b1923966
--- /dev/null
+++ b/packages/manager/.changeset/pr-13173-fixed-1764944067009.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+Optimize rendering of entities in AssignedRolesTable ([#13173](https://github.com/linode/manager/pull/13173))
diff --git a/packages/manager/src/features/IAM/Users/UserRoles/AssignedEntities.tsx b/packages/manager/src/features/IAM/Users/UserRoles/AssignedEntities.tsx
index f1c53a8b555..01f08dfcf51 100644
--- a/packages/manager/src/features/IAM/Users/UserRoles/AssignedEntities.tsx
+++ b/packages/manager/src/features/IAM/Users/UserRoles/AssignedEntities.tsx
@@ -34,7 +34,13 @@ export const AssignedEntities = ({
     return sortByString(a.name, b.name, 'asc');
   });
 
-  const items = sortedEntities?.map((entity: CombinedEntity) => (
+  // We don't need to send all items to the TruncatedList component for performance reasons,
+  // since past a certain count they will be hidden within the row.
+  const MAX_ITEMS_TO_RENDER = 15;
+  const entitiesToRender = sortedEntities.slice(0, MAX_ITEMS_TO_RENDER);
+  const totalCount = sortedEntities.length;
+
+  const items = entitiesToRender?.map((entity: CombinedEntity) => (
     <Box
       key={entity.id}
       sx={{
@@ -75,37 +81,42 @@ export const AssignedEntities = ({
     <Box>
       <TruncatedList
         addEllipsis
-        customOverflowButton={(numHiddenItems) => (
-          <Box
-            sx={{
-              alignItems: 'center',
-              backgroundColor:
-                theme.name === 'light'
-                  ? theme.tokens.color.Ultramarine[20]
-                  : theme.tokens.color.Neutrals.Black,
-              borderRadius: 1,
-              display: 'flex',
-              height: '20px',
-              maxWidth: 'max-content',
-              padding: `${theme.tokens.spacing.S4} ${theme.tokens.spacing.S8}`,
-              position: 'relative',
-              top: 2,
-            }}
-          >
-            <Tooltip placement="top" title="Click to View All Entities">
-              <Button
-                onClick={() => onButtonClick(role.name as EntityRoleType)}
-                sx={{
-                  color: theme.tokens.alias.Content.Text.Primary.Default,
-                  font: theme.tokens.alias.Typography.Label.Regular.Xs,
-                  padding: 0,
-                }}
-              >
-                +{numHiddenItems}
-              </Button>
-            </Tooltip>
-          </Box>
-        )}
+        customOverflowButton={(numHiddenByTruncate) => {
+          const numHiddenItems =
+            totalCount - MAX_ITEMS_TO_RENDER + numHiddenByTruncate;
+
+          return (
+            <Box
+              sx={{
+                alignItems: 'center',
+                backgroundColor:
+                  theme.name === 'light'
+                    ? theme.tokens.color.Ultramarine[20]
+                    : theme.tokens.color.Neutrals.Black,
+                borderRadius: 1,
+                display: 'flex',
+                height: '20px',
+                maxWidth: 'max-content',
+                padding: `${theme.tokens.spacing.S4} ${theme.tokens.spacing.S8}`,
+                position: 'relative',
+                top: 2,
+              }}
+            >
+              <Tooltip placement="top" title="Click to View All Entities">
+                <Button
+                  onClick={() => onButtonClick(role.name as EntityRoleType)}
+                  sx={{
+                    color: theme.tokens.alias.Content.Text.Primary.Default,
+                    font: theme.tokens.alias.Typography.Label.Regular.Xs,
+                    padding: 0,
+                  }}
+                >
+                  +{numHiddenItems}
+                </Button>
+              </Tooltip>
+            </Box>
+          );
+        }}
         justifyOverflowButtonRight
         listContainerSx={{
           width: '100%',

From 4905ac3e5c7805c960ceaf8cad3c710c1a5149a2 Mon Sep 17 00:00:00 2001
From: Alban Bailly <130582365+abailly-akamai@users.noreply.github.com>
Date: Mon, 8 Dec 2025 15:11:36 +0100
Subject: [PATCH 86/91] feat: [UIE-9637] - IAM "New" and "Limited Availability"
 badges (#13175)

* flag + badges

* changeset

* feedback

* feedback

* deps
---
 .../pr-13175-added-1765199020354.md           |  5 +++
 .../src/components/PrimaryNav/PrimaryLink.tsx |  5 ++-
 .../src/components/PrimaryNav/PrimaryNav.tsx  |  4 ++
 .../manager/src/dev-tools/FeatureFlagTool.tsx |  6 ++-
 packages/manager/src/featureFlags.ts          |  1 +
 .../manager/src/features/IAM/IAMLanding.tsx   | 44 ++++++++++++++++++-
 .../features/IAM/Users/UserDetailsLanding.tsx | 21 +++++++--
 .../TopMenu/UserMenu/UserMenuPopover.tsx      | 26 +++++++++--
 8 files changed, 102 insertions(+), 10 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13175-added-1765199020354.md

diff --git a/packages/manager/.changeset/pr-13175-added-1765199020354.md b/packages/manager/.changeset/pr-13175-added-1765199020354.md
new file mode 100644
index 00000000000..0dfe282277d
--- /dev/null
+++ b/packages/manager/.changeset/pr-13175-added-1765199020354.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Added
+---
+
+IAM "New" and "Limited Availability" badges ([#13175](https://github.com/linode/manager/pull/13175))
diff --git a/packages/manager/src/components/PrimaryNav/PrimaryLink.tsx b/packages/manager/src/components/PrimaryNav/PrimaryLink.tsx
index 3d7afbb9783..60175c32da1 100644
--- a/packages/manager/src/components/PrimaryNav/PrimaryLink.tsx
+++ b/packages/manager/src/components/PrimaryNav/PrimaryLink.tsx
@@ -1,4 +1,4 @@
-import { BetaChip } from '@linode/ui';
+import { BetaChip, NewFeatureChip } from '@linode/ui';
 import * as React from 'react';
 
 import { StyledActiveLink, StyledPrimaryLinkBox } from './PrimaryNav.styles';
@@ -17,6 +17,7 @@ export interface BaseNavLink {
 export interface PrimaryLink extends BaseNavLink {
   betaChipClassName?: string;
   isBeta?: boolean;
+  isNew?: boolean;
   onClick?: (e: React.MouseEvent<HTMLAnchorElement>) => void;
 }
 
@@ -35,6 +36,7 @@ const PrimaryLink = React.memo((props: PrimaryLinkProps) => {
     to,
     isActiveLink,
     isBeta,
+    isNew,
     isCollapsed,
     onClick,
   } = props;
@@ -63,6 +65,7 @@ const PrimaryLink = React.memo((props: PrimaryLinkProps) => {
         {isBeta ? (
           <BetaChip className={`${betaChipClassName ?? ''}`} component="span" />
         ) : null}
+        {isNew ? <NewFeatureChip component="span" /> : null}
       </StyledPrimaryLinkBox>
     </StyledActiveLink>
   );
diff --git a/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx b/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx
index b8eeba617d8..d42cfe40962 100644
--- a/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx
+++ b/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx
@@ -117,6 +117,8 @@ export const PrimaryNav = (props: PrimaryNavProps) => {
   const { isDatabasesEnabled, isDatabasesV2Beta } = useIsDatabasesEnabled();
 
   const { isIAMBeta, isIAMEnabled } = useIsIAMEnabled();
+  const showLimitedAvailabilityBadges = flags.iamLimitedAvailabilityBadges;
+
   const { isNetworkLoadBalancerEnabled } = useIsNetworkLoadBalancerEnabled();
 
   const {
@@ -274,6 +276,7 @@ export const PrimaryNav = (props: PrimaryNavProps) => {
                 hide: !isIAMEnabled || iamRbacPrimaryNavChanges,
                 to: '/iam',
                 isBeta: isIAMBeta,
+                isNew: !isIAMBeta && showLimitedAvailabilityBadges,
               },
               {
                 display: 'Account',
@@ -307,6 +310,7 @@ export const PrimaryNav = (props: PrimaryNavProps) => {
                 hide: !isIAMEnabled,
                 to: '/iam',
                 isBeta: isIAMBeta,
+                isNew: !isIAMBeta && showLimitedAvailabilityBadges,
               },
               {
                 display: 'Quotas',
diff --git a/packages/manager/src/dev-tools/FeatureFlagTool.tsx b/packages/manager/src/dev-tools/FeatureFlagTool.tsx
index ec87b33c2d8..e017a81f19c 100644
--- a/packages/manager/src/dev-tools/FeatureFlagTool.tsx
+++ b/packages/manager/src/dev-tools/FeatureFlagTool.tsx
@@ -61,7 +61,11 @@ const options: { flag: keyof Flags; label: string }[] = [
     label: 'Database Restrict Premium Plan Resize',
   },
   { flag: 'apicliButtonCopy', label: 'APICLI Button Copy' },
-  { flag: 'iam', label: 'Identity and Access Beta' },
+  { flag: 'iam', label: 'IAM enabled & Beta' },
+  {
+    flag: 'iamLimitedAvailabilityBadges',
+    label: 'IAM Limited Availability Badges',
+  },
   { flag: 'iamDelegation', label: 'IAM Delegation (Parent/Child)' },
   { flag: 'iamRbacPrimaryNavChanges', label: 'IAM Primary Nav Changes' },
   {
diff --git a/packages/manager/src/featureFlags.ts b/packages/manager/src/featureFlags.ts
index 0ab07445dee..3576eb95e94 100644
--- a/packages/manager/src/featureFlags.ts
+++ b/packages/manager/src/featureFlags.ts
@@ -213,6 +213,7 @@ export interface Flags {
   gpuv2: GpuV2;
   iam: BetaFeatureFlag;
   iamDelegation: BaseFeatureFlag;
+  iamLimitedAvailabilityBadges: boolean;
   iamRbacPrimaryNavChanges: boolean;
   ipv6Sharing: boolean;
   kubernetesBlackwellPlans: boolean;
diff --git a/packages/manager/src/features/IAM/IAMLanding.tsx b/packages/manager/src/features/IAM/IAMLanding.tsx
index 822ee434d84..588ef58e7f9 100644
--- a/packages/manager/src/features/IAM/IAMLanding.tsx
+++ b/packages/manager/src/features/IAM/IAMLanding.tsx
@@ -1,3 +1,4 @@
+import { Chip, NewFeatureChip, styled } from '@linode/ui';
 import { Outlet, useLocation, useNavigate } from '@tanstack/react-router';
 import * as React from 'react';
 
@@ -6,13 +7,21 @@ import { SuspenseLoader } from 'src/components/SuspenseLoader';
 import { TabPanels } from 'src/components/Tabs/TabPanels';
 import { Tabs } from 'src/components/Tabs/Tabs';
 import { TanStackTabLinkList } from 'src/components/Tabs/TanStackTabLinkList';
+import { useFlags } from 'src/hooks/useFlags';
 import { useTabs } from 'src/hooks/useTabs';
 
 import { useDelegationRole } from './hooks/useDelegationRole';
-import { useIsIAMDelegationEnabled } from './hooks/useIsIAMEnabled';
+import {
+  useIsIAMDelegationEnabled,
+  useIsIAMEnabled,
+} from './hooks/useIsIAMEnabled';
 import { IAM_DOCS_LINK, ROLES_LEARN_MORE_LINK } from './Shared/constants';
 
 export const IdentityAccessLanding = React.memo(() => {
+  const flags = useFlags();
+  const { isIAMBeta, isIAMEnabled } = useIsIAMEnabled();
+  const showLimitedAvailabilityBadges =
+    flags.iamLimitedAvailabilityBadges && isIAMEnabled && !isIAMBeta;
   const location = useLocation();
   const navigate = useNavigate();
   const { isParentAccount } = useDelegationRole();
@@ -49,7 +58,21 @@ export const IdentityAccessLanding = React.memo(() => {
 
   return (
     <>
-      <LandingHeader {...landingHeaderProps} spacingBottom={4} />
+      <LandingHeader
+        {...landingHeaderProps}
+        breadcrumbProps={{
+          labelOptions: {
+            suffixComponent: showLimitedAvailabilityBadges ? (
+              <>
+                <NewFeatureChip />
+                <StyledLimitedAvailabilityChip label="Limited availability" />
+              </>
+            ) : null,
+          },
+          removeCrumbX: 1,
+        }}
+        spacingBottom={4}
+      />
       <Tabs index={tabIndex} onChange={handleTabChange}>
         <TanStackTabLinkList tabs={tabs} />
         <React.Suspense fallback={<SuspenseLoader />}>
@@ -61,3 +84,20 @@ export const IdentityAccessLanding = React.memo(() => {
     </>
   );
 });
+
+const StyledLimitedAvailabilityChip = styled(Chip, {
+  label: 'StyledLimitedAvailabilityChip',
+  shouldForwardProp: (prop) => prop !== 'color',
+})(({ theme }) => ({
+  '& .MuiChip-label': {
+    padding: 0,
+  },
+  background: theme.tokens.component.Badge.Informative.Subtle.Background,
+  color: theme.tokens.component.Badge.Informative.Subtle.Text,
+  font: theme.font.bold,
+  fontSize: '12px',
+  lineHeight: '12px',
+  height: 16,
+  letterSpacing: '.22px',
+  padding: theme.spacingFunction(4),
+}));
diff --git a/packages/manager/src/features/IAM/Users/UserDetailsLanding.tsx b/packages/manager/src/features/IAM/Users/UserDetailsLanding.tsx
index 3fcd1a070bb..0d4d6ece9c0 100644
--- a/packages/manager/src/features/IAM/Users/UserDetailsLanding.tsx
+++ b/packages/manager/src/features/IAM/Users/UserDetailsLanding.tsx
@@ -1,4 +1,4 @@
-import { Chip, styled } from '@linode/ui';
+import { Chip, NewFeatureChip, styled } from '@linode/ui';
 import { Outlet, useLoaderData, useParams } from '@tanstack/react-router';
 import React from 'react';
 
@@ -6,7 +6,11 @@ import { LandingHeader } from 'src/components/LandingHeader';
 import { TabPanels } from 'src/components/Tabs/TabPanels';
 import { Tabs } from 'src/components/Tabs/Tabs';
 import { TanStackTabLinkList } from 'src/components/Tabs/TanStackTabLinkList';
-import { useIsIAMDelegationEnabled } from 'src/features/IAM/hooks/useIsIAMEnabled';
+import {
+  useIsIAMDelegationEnabled,
+  useIsIAMEnabled,
+} from 'src/features/IAM/hooks/useIsIAMEnabled';
+import { useFlags } from 'src/hooks/useFlags';
 import { useTabs } from 'src/hooks/useTabs';
 
 import { useDelegationRole } from '../hooks/useDelegationRole';
@@ -18,6 +22,10 @@ import {
 } from '../Shared/constants';
 
 export const UserDetailsLanding = () => {
+  const flags = useFlags();
+  const { isIAMBeta, isIAMEnabled } = useIsIAMEnabled();
+  const showLimitedAvailabilityBadges =
+    flags.iamLimitedAvailabilityBadges && isIAMEnabled && !isIAMBeta;
   const { username } = useParams({ from: '/iam/users/$username' });
   const { isIAMDelegationEnabled } = useIsIAMDelegationEnabled();
   const { isParentAccount } = useDelegationRole();
@@ -55,7 +63,14 @@ export const UserDetailsLanding = () => {
         breadcrumbProps={{
           crumbOverrides: [
             {
-              label: IAM_LABEL,
+              label: (
+                <>
+                  {IAM_LABEL}
+                  {showLimitedAvailabilityBadges ? (
+                    <NewFeatureChip sx={{ position: 'relative', top: -1 }} />
+                  ) : null}
+                </>
+              ),
               position: 1,
             },
           ],
diff --git a/packages/manager/src/features/TopMenu/UserMenu/UserMenuPopover.tsx b/packages/manager/src/features/TopMenu/UserMenu/UserMenuPopover.tsx
index 5a6544153d7..0ee7f5b8ef1 100644
--- a/packages/manager/src/features/TopMenu/UserMenu/UserMenuPopover.tsx
+++ b/packages/manager/src/features/TopMenu/UserMenu/UserMenuPopover.tsx
@@ -1,5 +1,12 @@
 import { useAccount, useProfile } from '@linode/queries';
-import { BetaChip, Box, Divider, Stack, Typography } from '@linode/ui';
+import {
+  BetaChip,
+  Box,
+  Divider,
+  NewFeatureChip,
+  Stack,
+  Typography,
+} from '@linode/ui';
 import { styled } from '@mui/material';
 import Grid from '@mui/material/Grid';
 import Popover from '@mui/material/Popover';
@@ -32,13 +39,18 @@ interface MenuLink {
   display: string;
   hide?: boolean;
   isBeta?: boolean;
+  isNew?: boolean;
   to: string;
 }
 
 export const UserMenuPopover = (props: UserMenuPopoverProps) => {
   const { anchorEl, isDrawerOpen, onClose, onDrawerOpen } = props;
   const sessionContext = React.useContext(switchAccountSessionContext);
-  const { iamRbacPrimaryNavChanges, limitsEvolution } = useFlags();
+  const {
+    iamRbacPrimaryNavChanges,
+    limitsEvolution,
+    iamLimitedAvailabilityBadges,
+  } = useFlags();
   const theme = useTheme();
 
   const { data: account } = useAccount();
@@ -121,6 +133,7 @@ export const UserMenuPopover = (props: UserMenuPopoverProps) => {
               ? '/users'
               : '/account/users',
         isBeta: iamRbacPrimaryNavChanges && isIAMEnabled && isIAMBeta,
+        isNew: isIAMEnabled && !isIAMBeta && iamLimitedAvailabilityBadges,
       },
       {
         display: 'Quotas',
@@ -150,7 +163,13 @@ export const UserMenuPopover = (props: UserMenuPopoverProps) => {
           : '/account/settings',
       },
     ],
-    [isIAMEnabled, iamRbacPrimaryNavChanges, limitsEvolution]
+    [
+      isIAMEnabled,
+      iamRbacPrimaryNavChanges,
+      limitsEvolution,
+      iamLimitedAvailabilityBadges,
+      isIAMBeta,
+    ]
   );
 
   const renderLink = (link: MenuLink) => {
@@ -281,6 +300,7 @@ export const UserMenuPopover = (props: UserMenuPopoverProps) => {
                 >
                   {menuLink.display}
                   {menuLink?.isBeta ? <BetaChip component="span" /> : null}
+                  {menuLink?.isNew ? <NewFeatureChip component="span" /> : null}
                 </Link>
               )
             )}

From 9921e9e46f7987fd52cd78ed448d5321a9602e6d Mon Sep 17 00:00:00 2001
From: Alban Bailly <130582365+abailly-akamai@users.noreply.github.com>
Date: Mon, 8 Dec 2025 15:19:41 +0100
Subject: [PATCH 87/91] fix: [UIE-9245] - EntitiesSelect performance on large
 accounts (#13168)

* save progress

* Cleanup

* handle search

* handle search

* handle search

* Added changeset: EntitiesSelect performance on large accounts

* fix select all

* deselect all
---
 .../pr-13168-fixed-1765192706974.md           |  5 ++
 .../AssignedPermissionsPanel.tsx              |  4 +-
 ...ities.test.tsx => EntitiesSelect.test.tsx} | 18 ++---
 .../{Entities.tsx => EntitiesSelect.tsx}      | 68 +++++++++++++++++--
 4 files changed, 77 insertions(+), 18 deletions(-)
 create mode 100644 packages/manager/.changeset/pr-13168-fixed-1765192706974.md
 rename packages/manager/src/features/IAM/Shared/Entities/{Entities.test.tsx => EntitiesSelect.test.tsx} (96%)
 rename packages/manager/src/features/IAM/Shared/Entities/{Entities.tsx => EntitiesSelect.tsx} (63%)

diff --git a/packages/manager/.changeset/pr-13168-fixed-1765192706974.md b/packages/manager/.changeset/pr-13168-fixed-1765192706974.md
new file mode 100644
index 00000000000..ddd0821e97b
--- /dev/null
+++ b/packages/manager/.changeset/pr-13168-fixed-1765192706974.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+EntitiesSelect performance on large accounts ([#13168](https://github.com/linode/manager/pull/13168))
diff --git a/packages/manager/src/features/IAM/Shared/AssignedPermissionsPanel/AssignedPermissionsPanel.tsx b/packages/manager/src/features/IAM/Shared/AssignedPermissionsPanel/AssignedPermissionsPanel.tsx
index 2f6b38c0dff..c9b33e75b56 100644
--- a/packages/manager/src/features/IAM/Shared/AssignedPermissionsPanel/AssignedPermissionsPanel.tsx
+++ b/packages/manager/src/features/IAM/Shared/AssignedPermissionsPanel/AssignedPermissionsPanel.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
 import { Link } from 'src/components/Link';
 
 import { ROLES_LEARN_MORE_LINK } from '../constants';
-import { Entities } from '../Entities/Entities';
+import { EntitiesSelect } from '../Entities/EntitiesSelect';
 import { Permissions } from '../Permissions/Permissions';
 import { type ExtendedRole, getFacadeRoleDescription } from '../utilities';
 import {
@@ -62,7 +62,7 @@ export const AssignedPermissionsPanel = ({
       )}
       {mode !== 'change-role-for-entity' && (
         <StyledEntityBox hideDetails={hideDetails}>
-          <Entities
+          <EntitiesSelect
             access={role.access}
             errorText={errorText}
             mode={mode}
diff --git a/packages/manager/src/features/IAM/Shared/Entities/Entities.test.tsx b/packages/manager/src/features/IAM/Shared/Entities/EntitiesSelect.test.tsx
similarity index 96%
rename from packages/manager/src/features/IAM/Shared/Entities/Entities.test.tsx
rename to packages/manager/src/features/IAM/Shared/Entities/EntitiesSelect.test.tsx
index abb88d4ea26..6a94098d7d7 100644
--- a/packages/manager/src/features/IAM/Shared/Entities/Entities.test.tsx
+++ b/packages/manager/src/features/IAM/Shared/Entities/EntitiesSelect.test.tsx
@@ -5,7 +5,7 @@ import React from 'react';
 import { accountEntityFactory } from 'src/factories/accountEntities';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
-import { Entities } from './Entities';
+import { EntitiesSelect } from './EntitiesSelect';
 
 import type { EntitiesOption } from '../types';
 
@@ -40,7 +40,7 @@ const mockValue: EntitiesOption[] = [];
 describe('Entities', () => {
   it('renders correct data when it is an account access and type is an account', () => {
     renderWithTheme(
-      <Entities
+      <EntitiesSelect
         access="account_access"
         mode="assign-role"
         onChange={mockOnChange}
@@ -61,7 +61,7 @@ describe('Entities', () => {
 
   it('renders correct data when it is an account access and type is not an account', () => {
     renderWithTheme(
-      <Entities
+      <EntitiesSelect
         access="account_access"
         mode="assign-role"
         onChange={mockOnChange}
@@ -86,7 +86,7 @@ describe('Entities', () => {
     });
 
     renderWithTheme(
-      <Entities
+      <EntitiesSelect
         access="entity_access"
         mode="assign-role"
         onChange={mockOnChange}
@@ -112,7 +112,7 @@ describe('Entities', () => {
     });
 
     renderWithTheme(
-      <Entities
+      <EntitiesSelect
         access="entity_access"
         mode="assign-role"
         onChange={mockOnChange}
@@ -138,7 +138,7 @@ describe('Entities', () => {
     });
 
     renderWithTheme(
-      <Entities
+      <EntitiesSelect
         access="entity_access"
         mode="assign-role"
         onChange={mockOnChange}
@@ -160,7 +160,7 @@ describe('Entities', () => {
     });
 
     renderWithTheme(
-      <Entities
+      <EntitiesSelect
         access="entity_access"
         mode="assign-role"
         onChange={mockOnChange}
@@ -176,7 +176,7 @@ describe('Entities', () => {
 
   it('renders Autocomplete as readonly when mode is "change-role"', () => {
     renderWithTheme(
-      <Entities
+      <EntitiesSelect
         access="entity_access"
         mode="change-role"
         onChange={mockOnChange}
@@ -194,7 +194,7 @@ describe('Entities', () => {
     const errorMessage = 'Entities are required.';
 
     renderWithTheme(
-      <Entities
+      <EntitiesSelect
         access="entity_access"
         errorText={errorMessage}
         mode="assign-role"
diff --git a/packages/manager/src/features/IAM/Shared/Entities/Entities.tsx b/packages/manager/src/features/IAM/Shared/Entities/EntitiesSelect.tsx
similarity index 63%
rename from packages/manager/src/features/IAM/Shared/Entities/Entities.tsx
rename to packages/manager/src/features/IAM/Shared/Entities/EntitiesSelect.tsx
index bea517a7611..e1e477892ed 100644
--- a/packages/manager/src/features/IAM/Shared/Entities/Entities.tsx
+++ b/packages/manager/src/features/IAM/Shared/Entities/EntitiesSelect.tsx
@@ -26,7 +26,10 @@ interface Props {
   value: EntitiesOption[];
 }
 
-export const Entities = ({
+// For large entity lists, we want to display the initial 100 results and then load more as the user scrolls.
+const INITIAL_DISPLAY_COUNT = 100;
+
+export const EntitiesSelect = ({
   access,
   errorText,
   mode,
@@ -34,9 +37,12 @@ export const Entities = ({
   type,
   value,
 }: Props) => {
-  const { data: entities } = useAllAccountEntities({});
+  const { data: entities, isLoading } = useAllAccountEntities({});
   const theme = useTheme();
 
+  const [displayCount, setDisplayCount] = React.useState(INITIAL_DISPLAY_COUNT);
+  const [inputValue, setInputValue] = React.useState('');
+
   const memoizedEntities = React.useMemo(() => {
     if (access !== 'entity_access' || !entities) {
       return [];
@@ -46,6 +52,30 @@ export const Entities = ({
     return typeEntities ? mapEntitiesToOptions(typeEntities) : [];
   }, [entities, access, type]);
 
+  const filteredEntities = React.useMemo(() => {
+    if (!inputValue) {
+      return memoizedEntities;
+    }
+
+    return memoizedEntities.filter((option) =>
+      option.label.toLowerCase().includes(inputValue.toLowerCase())
+    );
+  }, [memoizedEntities, inputValue]);
+
+  const visibleOptions = React.useMemo(() => {
+    const slice = filteredEntities.slice(0, displayCount);
+
+    const selectedNotVisible = value.filter(
+      (selected) => !slice.some((opt) => opt.value === selected.value)
+    );
+
+    return [...slice, ...selectedNotVisible];
+  }, [filteredEntities, displayCount, value]);
+
+  React.useEffect(() => {
+    setDisplayCount(INITIAL_DISPLAY_COUNT);
+  }, [filteredEntities]);
+
   if (access === 'account_access') {
     return (
       <>
@@ -75,16 +105,28 @@ export const Entities = ({
         getOptionLabel={(option) => option.label}
         isOptionEqualToValue={(option, value) => option.value === value.value}
         label="Entities"
+        loading={isLoading}
         multiple
         noMarginTop
-        onChange={(_, newValue) => {
-          onChange(newValue || []);
+        onChange={(_, newValue, reason) => {
+          if (
+            reason === 'selectOption' &&
+            newValue.length === displayCount &&
+            filteredEntities.length > displayCount
+          ) {
+            onChange(filteredEntities);
+          } else {
+            onChange(newValue || []);
+          }
         }}
-        options={memoizedEntities}
+        onInputChange={(_, value) => {
+          setInputValue(value);
+        }}
+        options={visibleOptions}
         placeholder={getPlaceholder(
           type,
           value.length,
-          memoizedEntities.length
+          filteredEntities.length
         )}
         readOnly={mode === 'change-role'}
         renderInput={(params) => (
@@ -97,10 +139,22 @@ export const Entities = ({
             placeholder={getPlaceholder(
               type,
               value.length,
-              memoizedEntities.length
+              filteredEntities.length
             )}
           />
         )}
+        slotProps={{
+          listbox: {
+            onScroll: (e) => {
+              const { scrollTop, scrollHeight, clientHeight } = e.currentTarget;
+              if (scrollHeight - scrollTop <= clientHeight * 1.5) {
+                setDisplayCount((prev) =>
+                  Math.min(prev + 200, filteredEntities.length)
+                );
+              }
+            },
+          },
+        }}
         sx={{
           marginTop: 0,
           '& .MuiChip-root': {

From 17cafe764e5f4d7b90ee8bca0481347ececc33c2 Mon Sep 17 00:00:00 2001
From: Alban Bailly <130582365+abailly-akamai@users.noreply.github.com>
Date: Mon, 8 Dec 2025 16:58:25 +0100
Subject: [PATCH 88/91] small fix to hidden count (#13178)

---
 .../src/features/IAM/Users/UserRoles/AssignedEntities.tsx     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/manager/src/features/IAM/Users/UserRoles/AssignedEntities.tsx b/packages/manager/src/features/IAM/Users/UserRoles/AssignedEntities.tsx
index 01f08dfcf51..ee40b3929c0 100644
--- a/packages/manager/src/features/IAM/Users/UserRoles/AssignedEntities.tsx
+++ b/packages/manager/src/features/IAM/Users/UserRoles/AssignedEntities.tsx
@@ -83,7 +83,9 @@ export const AssignedEntities = ({
         addEllipsis
         customOverflowButton={(numHiddenByTruncate) => {
           const numHiddenItems =
-            totalCount - MAX_ITEMS_TO_RENDER + numHiddenByTruncate;
+            totalCount <= MAX_ITEMS_TO_RENDER
+              ? numHiddenByTruncate
+              : totalCount - MAX_ITEMS_TO_RENDER + numHiddenByTruncate;
 
           return (
             <Box

From 8a078cc1f69c7b3c29248781bdb8afe4d05b23b0 Mon Sep 17 00:00:00 2001
From: Jaalah Ramos <31657591+jaalah@users.noreply.github.com>
Date: Mon, 8 Dec 2025 13:11:20 -0500
Subject: [PATCH 89/91] =?UTF-8?q?Revert=20"upcoming:=20[M3-10708]=20-=20Di?=
 =?UTF-8?q?splay=20maintenance=20type=20and=20config=20in=20linode=5F?=
 =?UTF-8?q?=E2=80=A6"=20(#13179)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 814c11ec349b119472dffccb0e947a1af98595bc.
---
 .../pr-13084-changed-1762970902694.md         |   5 -
 packages/api-v4/src/account/events.ts         |   6 +-
 ...r-13084-upcoming-features-1762970850861.md |   5 -
 .../components/ExtraPresetEvents.tsx          |  59 --------
 .../components/ExtraPresetMaintenance.tsx     |  37 +----
 .../src/dev-tools/components/JsonTextArea.tsx |  19 +--
 .../Maintenance/MaintenanceTableRow.tsx       |   8 +-
 .../features/Account/Maintenance/utilities.ts |   2 +-
 .../src/features/Events/factories/linode.tsx  | 141 +++---------------
 9 files changed, 32 insertions(+), 250 deletions(-)
 delete mode 100644 packages/api-v4/.changeset/pr-13084-changed-1762970902694.md
 delete mode 100644 packages/manager/.changeset/pr-13084-upcoming-features-1762970850861.md

diff --git a/packages/api-v4/.changeset/pr-13084-changed-1762970902694.md b/packages/api-v4/.changeset/pr-13084-changed-1762970902694.md
deleted file mode 100644
index b3e1bd0b7c7..00000000000
--- a/packages/api-v4/.changeset/pr-13084-changed-1762970902694.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/api-v4": Changed
----
-
-Use v4beta endpoints for /events and /events/<eventId> ([#13084](https://github.com/linode/manager/pull/13084))
diff --git a/packages/api-v4/src/account/events.ts b/packages/api-v4/src/account/events.ts
index 9f2359d42c3..4f8c8d21e4b 100644
--- a/packages/api-v4/src/account/events.ts
+++ b/packages/api-v4/src/account/events.ts
@@ -1,4 +1,4 @@
-import { API_ROOT, BETA_API_ROOT } from '../constants';
+import { API_ROOT } from '../constants';
 import Request, { setMethod, setParams, setURL, setXFilter } from '../request';
 
 import type { Filter, Params, ResourcePage } from '../types';
@@ -12,7 +12,7 @@ import type { Event, Notification } from './types';
  */
 export const getEvents = (params: Params = {}, filter: Filter = {}) =>
   Request<ResourcePage<Event>>(
-    setURL(`${BETA_API_ROOT}/account/events`),
+    setURL(`${API_ROOT}/account/events`),
     setMethod('GET'),
     setXFilter(filter),
     setParams(params),
@@ -26,7 +26,7 @@ export const getEvents = (params: Params = {}, filter: Filter = {}) =>
  */
 export const getEvent = (eventId: number) =>
   Request<Event>(
-    setURL(`${BETA_API_ROOT}/account/events/${encodeURIComponent(eventId)}`),
+    setURL(`${API_ROOT}/account/events/${encodeURIComponent(eventId)}`),
     setMethod('GET'),
   );
 
diff --git a/packages/manager/.changeset/pr-13084-upcoming-features-1762970850861.md b/packages/manager/.changeset/pr-13084-upcoming-features-1762970850861.md
deleted file mode 100644
index 894835a1327..00000000000
--- a/packages/manager/.changeset/pr-13084-upcoming-features-1762970850861.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Display maintenance type (emergency/scheduled) and config information in linode_migrate event messages ([#13084](https://github.com/linode/manager/pull/13084))
diff --git a/packages/manager/src/dev-tools/components/ExtraPresetEvents.tsx b/packages/manager/src/dev-tools/components/ExtraPresetEvents.tsx
index 8982d6ea2db..6ac26ce24fb 100644
--- a/packages/manager/src/dev-tools/components/ExtraPresetEvents.tsx
+++ b/packages/manager/src/dev-tools/components/ExtraPresetEvents.tsx
@@ -287,65 +287,6 @@ const eventTemplates = {
       status: 'finished',
     }),
 
-  'Linode Migration In Progress': () =>
-    eventFactory.build({
-      action: 'linode_migrate',
-      entity: {
-        id: 1,
-        label: 'linode-1',
-        type: 'linode',
-        url: '/v4/linode/instances/1',
-      },
-      message: 'Linode migration in progress.',
-      percent_complete: 45,
-      status: 'started',
-    }),
-
-  'Linode Migration - Emergency': () =>
-    eventFactory.build({
-      action: 'linode_migrate',
-      description: 'emergency',
-      entity: {
-        id: 1,
-        label: 'linode-1',
-        type: 'linode',
-        url: '/v4/linode/instances/1',
-      },
-      message: 'Emergency linode migration in progress.',
-      percent_complete: 30,
-      status: 'started',
-    }),
-
-  'Linode Migration - Scheduled Started': () =>
-    eventFactory.build({
-      action: 'linode_migrate',
-      description: 'scheduled',
-      entity: {
-        id: 1,
-        label: 'linode-1',
-        type: 'linode',
-        url: '/v4/linode/instances/1',
-      },
-      message: 'Scheduled linode migration in progress.',
-      percent_complete: 10,
-      status: 'started',
-    }),
-
-  'Linode Migration - Scheduled': () =>
-    eventFactory.build({
-      action: 'linode_migrate',
-      description: 'scheduled',
-      entity: {
-        id: 1,
-        label: 'linode-1',
-        type: 'linode',
-        url: '/v4/linode/instances/1',
-      },
-      message: 'Scheduled linode migration in progress.',
-      percent_complete: 0,
-      status: 'scheduled',
-    }),
-
   'Completed Event': () =>
     eventFactory.build({
       action: 'account_update',
diff --git a/packages/manager/src/dev-tools/components/ExtraPresetMaintenance.tsx b/packages/manager/src/dev-tools/components/ExtraPresetMaintenance.tsx
index d1a4eae094b..c257d22db49 100644
--- a/packages/manager/src/dev-tools/components/ExtraPresetMaintenance.tsx
+++ b/packages/manager/src/dev-tools/components/ExtraPresetMaintenance.tsx
@@ -210,42 +210,7 @@ const maintenanceTemplates = {
   Canceled: () => accountMaintenanceFactory.build({ status: 'canceled' }),
   Completed: () => accountMaintenanceFactory.build({ status: 'completed' }),
   'In Progress': () =>
-    accountMaintenanceFactory.build({
-      status: 'in_progress',
-      entity: {
-        type: 'linode',
-        id: 1,
-        label: 'linode-1',
-        url: '/v4/linode/instances/1',
-      },
-      type: 'migrate',
-    }),
-  'In Progress - Emergency Migration': () =>
-    accountMaintenanceFactory.build({
-      status: 'in_progress',
-      entity: {
-        type: 'linode',
-        id: 1,
-        label: 'linode-1',
-        url: '/v4/linode/instances/1',
-      },
-      type: 'migrate',
-      description: 'emergency',
-      reason: 'Emergency maintenance migration',
-    }),
-  'In Progress - Scheduled Migration': () =>
-    accountMaintenanceFactory.build({
-      status: 'in_progress',
-      entity: {
-        type: 'linode',
-        id: 1,
-        label: 'linode-1',
-        url: '/v4/linode/instances/1',
-      },
-      type: 'migrate',
-      description: 'scheduled',
-      reason: 'Scheduled maintenance migration',
-    }),
+    accountMaintenanceFactory.build({ status: 'in_progress' }),
   Pending: () => accountMaintenanceFactory.build({ status: 'pending' }),
   Scheduled: () => accountMaintenanceFactory.build({ status: 'scheduled' }),
   Started: () => accountMaintenanceFactory.build({ status: 'started' }),
diff --git a/packages/manager/src/dev-tools/components/JsonTextArea.tsx b/packages/manager/src/dev-tools/components/JsonTextArea.tsx
index 1bc713bb65e..6eb65224f9f 100644
--- a/packages/manager/src/dev-tools/components/JsonTextArea.tsx
+++ b/packages/manager/src/dev-tools/components/JsonTextArea.tsx
@@ -24,23 +24,6 @@ export const JsonTextArea = ({
   const debouncedUpdate = React.useMemo(
     () =>
       debounce((text: string) => {
-        // Handle empty/whitespace text as null
-        if (!text.trim()) {
-          const event = {
-            currentTarget: {
-              name,
-              value: null,
-            },
-            target: {
-              name,
-              value: null,
-            },
-          } as unknown as React.ChangeEvent<HTMLTextAreaElement>;
-
-          onChange(event);
-          return;
-        }
-
         try {
           const parsedJson = JSON.parse(text);
           const event = {
@@ -52,7 +35,7 @@ export const JsonTextArea = ({
               name,
               value: parsedJson,
             },
-          } as unknown as React.ChangeEvent<HTMLTextAreaElement>;
+          } as React.ChangeEvent<HTMLTextAreaElement>;
 
           onChange(event);
         } catch (err) {
diff --git a/packages/manager/src/features/Account/Maintenance/MaintenanceTableRow.tsx b/packages/manager/src/features/Account/Maintenance/MaintenanceTableRow.tsx
index 3fc62a6fb2c..9645722c188 100644
--- a/packages/manager/src/features/Account/Maintenance/MaintenanceTableRow.tsx
+++ b/packages/manager/src/features/Account/Maintenance/MaintenanceTableRow.tsx
@@ -47,8 +47,6 @@ const statusIconMap: Record<AccountMaintenance['status'], Status> = {
   scheduled: 'active',
 };
 
-const MAX_REASON_DISPLAY_LENGTH = 93;
-
 interface MaintenanceTableRowProps {
   maintenance: AccountMaintenance;
   tableType: MaintenanceTableType;
@@ -76,11 +74,9 @@ export const MaintenanceTableRow = (props: MaintenanceTableRowProps) => {
 
   const eventProgress = recentEvent && formatProgressEvent(recentEvent);
 
-  const truncatedReason = reason
-    ? truncate(reason, MAX_REASON_DISPLAY_LENGTH)
-    : '';
+  const truncatedReason = truncate(reason, 93);
 
-  const isTruncated = reason ? reason !== truncatedReason : false;
+  const isTruncated = reason !== truncatedReason;
 
   const dateField = getMaintenanceDateField(tableType);
   const dateValue = props.maintenance[dateField];
diff --git a/packages/manager/src/features/Account/Maintenance/utilities.ts b/packages/manager/src/features/Account/Maintenance/utilities.ts
index f202f33691d..bb1c7cbe883 100644
--- a/packages/manager/src/features/Account/Maintenance/utilities.ts
+++ b/packages/manager/src/features/Account/Maintenance/utilities.ts
@@ -40,7 +40,7 @@ export const maintenanceDateColumnMap: Record<
 > = {
   completed: ['complete_time', 'End Date'],
   'in progress': ['start_time', 'Start Date'],
-  upcoming: ['when', 'Start Date'],
+  upcoming: ['start_time', 'Start Date'],
   pending: ['when', 'Date'],
 };
 
diff --git a/packages/manager/src/features/Events/factories/linode.tsx b/packages/manager/src/features/Events/factories/linode.tsx
index f65948586e0..2d80ed84d26 100644
--- a/packages/manager/src/features/Events/factories/linode.tsx
+++ b/packages/manager/src/features/Events/factories/linode.tsx
@@ -5,23 +5,6 @@ import { Link } from 'src/components/Link';
 import { EventLink } from '../EventLink';
 
 import type { PartialEventMap } from '../types';
-import type { AccountMaintenance } from '@linode/api-v4';
-
-/**
- * Normalizes the event description to a valid maintenance type.
- * Only accepts 'emergency' or 'scheduled' from AccountMaintenance.description,
- * defaults to 'maintenance' for any other value or null/undefined.
- */
-type MaintenanceDescription = 'maintenance' | AccountMaintenance['description'];
-
-const getMaintenanceDescription = (
-  description: null | string | undefined
-): MaintenanceDescription => {
-  if (description === 'emergency' || description === 'scheduled') {
-    return description;
-  }
-  return 'maintenance';
-};
 
 export const linode: PartialEventMap<'linode'> = {
   linode_addip: {
@@ -258,106 +241,30 @@ export const linode: PartialEventMap<'linode'> = {
     ),
   },
   linode_migrate: {
-    failed: (e) => {
-      const maintenanceType = getMaintenanceDescription(e.description);
-      return (
-        <>
-          Migration <strong>failed</strong> for Linode{' '}
-          <EventLink event={e} to="entity" /> for{' '}
-          {maintenanceType === 'maintenance' ? (
-            <strong>maintenance</strong>
-          ) : (
-            <>
-              <strong>{maintenanceType}</strong> maintenance
-            </>
-          )}
-          {e.secondary_entity ? (
-            <>
-              {' '}
-              with config <EventLink event={e} to="secondaryEntity" />
-            </>
-          ) : (
-            ''
-          )}
-          .
-        </>
-      );
-    },
-    finished: (e) => {
-      const maintenanceType = getMaintenanceDescription(e.description);
-      return (
-        <>
-          Linode <EventLink event={e} to="entity" /> has been{' '}
-          <strong>migrated</strong> for{' '}
-          {maintenanceType === 'maintenance' ? (
-            <strong>maintenance</strong>
-          ) : (
-            <>
-              <strong>{maintenanceType}</strong> maintenance
-            </>
-          )}
-          {e.secondary_entity ? (
-            <>
-              {' '}
-              with config <EventLink event={e} to="secondaryEntity" />
-            </>
-          ) : (
-            ''
-          )}
-          .
-        </>
-      );
-    },
-    scheduled: (e) => {
-      const maintenanceType = getMaintenanceDescription(e.description);
-      return (
-        <>
-          Linode <EventLink event={e} to="entity" /> is scheduled to be{' '}
-          <strong>migrated</strong> for{' '}
-          {maintenanceType === 'maintenance' ? (
-            <strong>maintenance</strong>
-          ) : (
-            <>
-              <strong>{maintenanceType}</strong> maintenance
-            </>
-          )}
-          {e.secondary_entity ? (
-            <>
-              {' '}
-              with config <EventLink event={e} to="secondaryEntity" />
-            </>
-          ) : (
-            ''
-          )}
-          .
-        </>
-      );
-    },
-    started: (e) => {
-      const maintenanceType = getMaintenanceDescription(e.description);
-      return (
-        <>
-          Linode <EventLink event={e} to="entity" /> is being{' '}
-          <strong>migrated</strong> for{' '}
-          {maintenanceType === 'maintenance' ? (
-            <strong>maintenance</strong>
-          ) : (
-            <>
-              <strong>{maintenanceType}</strong> maintenance
-            </>
-          )}
-          {e.secondary_entity ? (
-            <>
-              {' '}
-              with config <EventLink event={e} to="secondaryEntity" />
-            </>
-          ) : (
-            ''
-          )}
-          .
-        </>
-      );
-    },
+    failed: (e) => (
+      <>
+        Migration <strong>failed</strong> for Linode{' '}
+        <EventLink event={e} to="entity" />.
+      </>
+    ),
+    finished: (e) => (
+      <>
+        Linode <EventLink event={e} to="entity" /> has been{' '}
+        <strong>migrated</strong>.
+      </>
+    ),
+    scheduled: (e) => (
+      <>
+        Linode <EventLink event={e} to="entity" /> is scheduled to be{' '}
+        <strong>migrated</strong>.
+      </>
+    ),
+    started: (e) => (
+      <>
+        Linode <EventLink event={e} to="entity" /> is being{' '}
+        <strong>migrated</strong>.
+      </>
+    ),
   },
   linode_migrate_datacenter: {
     failed: (e) => (

From 2fd161c0a2b37592db0471891ec06714c87431f5 Mon Sep 17 00:00:00 2001
From: Alban Bailly <abailly@akamai.com>
Date: Mon, 8 Dec 2025 19:31:53 +0100
Subject: [PATCH 90/91] Cloud version 1.156.0, API v4 version 0.154.0,
 Validation version 0.79.0, UI version 0.23.0, Utilities version 0.13.0,
 Queries version 0.18.0

---
 ...r-13078-upcoming-features-1762869732236.md |  5 -
 ...r-13079-upcoming-features-1762861826541.md |  5 -
 .../pr-13097-changed-1763149227691.md         |  5 -
 .../pr-13119-tech-stories-1764007445902.md    |  5 -
 ...r-13127-upcoming-features-1763979506001.md |  5 -
 ...r-13133-upcoming-features-1764084018326.md |  5 -
 ...r-13146-upcoming-features-1764600095421.md |  5 -
 ...r-13148-upcoming-features-1764600387228.md |  5 -
 ...r-13156-upcoming-features-1764708047549.md |  5 -
 .../pr-13174-changed-1764961622718.md         |  5 -
 packages/api-v4/CHANGELOG.md                  | 22 +++++
 packages/api-v4/package.json                  |  2 +-
 .../pr-13032-changed-1761686860911.md         |  5 -
 .../pr-13057-changed-1762343659819.md         |  5 -
 .../pr-13059-fixed-1762972220664.md           |  5 -
 .../pr-13060-tech-stories-1762357716157.md    |  5 -
 ...r-13068-upcoming-features-1762930872294.md |  5 -
 .../pr-13075-added-1762776269124.md           |  5 -
 ...r-13079-upcoming-features-1762861957439.md |  5 -
 ...r-13081-upcoming-features-1762935895154.md |  5 -
 .../pr-13082-fixed-1762957507469.md           |  5 -
 .../pr-13083-tests-1762969859293.md           |  5 -
 ...r-13087-upcoming-features-1763109384091.md |  5 -
 ...r-13088-upcoming-features-1763032920807.md |  5 -
 ...r-13089-upcoming-features-1763100678421.md |  5 -
 ...r-13090-upcoming-features-1763045734612.md |  5 -
 ...r-13092-upcoming-features-1763093527692.md |  5 -
 .../pr-13093-added-1766788494029.md           |  5 -
 ...r-13094-upcoming-features-1763558731421.md |  5 -
 ...r-13095-upcoming-features-1763130670048.md |  5 -
 .../pr-13097-added-1763149132736.md           |  5 -
 .../pr-13098-fixed-1763371721536.md           |  5 -
 .../pr-13099-changed-1763377007914.md         |  5 -
 .../pr-13100-fixed-1764265664121.md           |  5 -
 ...r-13104-upcoming-features-1763472761959.md |  5 -
 .../pr-13107-tests-1763492424120.md           |  5 -
 ...r-13108-upcoming-features-1763746838424.md |  5 -
 .../pr-13109-fixed-1763535418420.md           |  5 -
 ...r-13110-upcoming-features-1763617588411.md |  5 -
 ...r-13111-upcoming-features-1763615562636.md |  5 -
 ...r-13112-upcoming-features-1763627065100.md |  5 -
 .../pr-13113-fixed-1763631318653.md           |  5 -
 ...r-13115-upcoming-features-1763630712827.md |  5 -
 ...r-13116-upcoming-features-1763642170773.md |  5 -
 ...r-13117-upcoming-features-1763642787362.md |  5 -
 .../pr-13118-fixed-1763722681223.md           |  5 -
 .../pr-13119-tech-stories-1764007553451.md    |  5 -
 .../pr-13119-tech-stories-1764007583363.md    |  5 -
 .../pr-13119-tech-stories-1764007617066.md    |  5 -
 .../pr-13121-fixed-1763734247008.md           |  5 -
 .../pr-13122-changed-1763759617340.md         |  5 -
 ...r-13122-upcoming-features-1763759704504.md |  5 -
 ...r-13123-upcoming-features-1763724960594.md |  5 -
 .../pr-13124-changed-1763726824931.md         |  5 -
 ...r-13125-upcoming-features-1763760083439.md |  5 -
 ...r-13127-upcoming-features-1763979546789.md |  5 -
 .../pr-13129-fixed-1763987727502.md           |  5 -
 ...r-13130-upcoming-features-1763993150579.md |  5 -
 .../pr-13131-changed-1763990723303.md         |  5 -
 ...r-13132-upcoming-features-1764056438332.md |  5 -
 ...r-13133-upcoming-features-1764084041956.md |  5 -
 ...r-13134-upcoming-features-1764110309888.md |  5 -
 .../pr-13135-changed-1764659811788.md         |  5 -
 ...r-13137-upcoming-features-1764156818321.md |  5 -
 ...r-13138-upcoming-features-1764681439890.md |  5 -
 .../pr-13139-fixed-1764247173880.md           |  5 -
 .../pr-13140-changed-1764317364992.md         |  5 -
 ...r-13141-upcoming-features-1764311100780.md |  5 -
 .../pr-13142-fixed-1764342267912.md           |  5 -
 .../pr-13143-fixed-1764672257327.md           |  5 -
 ...r-13146-upcoming-features-1764599840190.md |  5 -
 ...r-13147-upcoming-features-1764592604792.md |  5 -
 .../pr-13153-fixed-1764672225221.md           |  5 -
 ...r-13156-upcoming-features-1764708766786.md |  5 -
 ...r-13157-upcoming-features-1764741522593.md |  5 -
 ...r-13158-upcoming-features-1764752133530.md |  5 -
 ...r-13164-upcoming-features-1764838771826.md |  5 -
 ...r-13165-upcoming-features-1764951969980.md |  5 -
 .../pr-13166-changed-1764854054943.md         |  5 -
 .../pr-13168-fixed-1765192706974.md           |  5 -
 ...r-13169-upcoming-features-1764884932241.md |  5 -
 ...r-13172-upcoming-features-1764950932547.md |  5 -
 .../pr-13173-fixed-1764944067009.md           |  5 -
 .../pr-13174-fixed-1764961648716.md           |  5 -
 .../pr-13175-added-1765199020354.md           |  5 -
 packages/manager/CHANGELOG.md                 | 94 +++++++++++++++++++
 packages/manager/package.json                 |  2 +-
 ...r-13078-upcoming-features-1762869790174.md |  5 -
 .../pr-13097-changed-1763149256983.md         |  5 -
 ...r-13148-upcoming-features-1764600420579.md |  5 -
 packages/queries/CHANGELOG.md                 | 12 +++
 packages/queries/package.json                 |  2 +-
 .../pr-13119-tech-stories-1764007518381.md    |  5 -
 packages/utilities/CHANGELOG.md               |  7 ++
 packages/utilities/package.json               |  2 +-
 ...r-13079-upcoming-features-1762861891552.md |  5 -
 ...r-13148-upcoming-features-1764600446107.md |  5 -
 .../pr-13166-changed-1764854111433.md         |  5 -
 packages/validation/CHANGELOG.md              | 12 +++
 packages/validation/package.json              |  2 +-
 100 files changed, 152 insertions(+), 455 deletions(-)
 delete mode 100644 packages/api-v4/.changeset/pr-13078-upcoming-features-1762869732236.md
 delete mode 100644 packages/api-v4/.changeset/pr-13079-upcoming-features-1762861826541.md
 delete mode 100644 packages/api-v4/.changeset/pr-13097-changed-1763149227691.md
 delete mode 100644 packages/api-v4/.changeset/pr-13119-tech-stories-1764007445902.md
 delete mode 100644 packages/api-v4/.changeset/pr-13127-upcoming-features-1763979506001.md
 delete mode 100644 packages/api-v4/.changeset/pr-13133-upcoming-features-1764084018326.md
 delete mode 100644 packages/api-v4/.changeset/pr-13146-upcoming-features-1764600095421.md
 delete mode 100644 packages/api-v4/.changeset/pr-13148-upcoming-features-1764600387228.md
 delete mode 100644 packages/api-v4/.changeset/pr-13156-upcoming-features-1764708047549.md
 delete mode 100644 packages/api-v4/.changeset/pr-13174-changed-1764961622718.md
 delete mode 100644 packages/manager/.changeset/pr-13032-changed-1761686860911.md
 delete mode 100644 packages/manager/.changeset/pr-13057-changed-1762343659819.md
 delete mode 100644 packages/manager/.changeset/pr-13059-fixed-1762972220664.md
 delete mode 100644 packages/manager/.changeset/pr-13060-tech-stories-1762357716157.md
 delete mode 100644 packages/manager/.changeset/pr-13068-upcoming-features-1762930872294.md
 delete mode 100644 packages/manager/.changeset/pr-13075-added-1762776269124.md
 delete mode 100644 packages/manager/.changeset/pr-13079-upcoming-features-1762861957439.md
 delete mode 100644 packages/manager/.changeset/pr-13081-upcoming-features-1762935895154.md
 delete mode 100644 packages/manager/.changeset/pr-13082-fixed-1762957507469.md
 delete mode 100644 packages/manager/.changeset/pr-13083-tests-1762969859293.md
 delete mode 100644 packages/manager/.changeset/pr-13087-upcoming-features-1763109384091.md
 delete mode 100644 packages/manager/.changeset/pr-13088-upcoming-features-1763032920807.md
 delete mode 100644 packages/manager/.changeset/pr-13089-upcoming-features-1763100678421.md
 delete mode 100644 packages/manager/.changeset/pr-13090-upcoming-features-1763045734612.md
 delete mode 100644 packages/manager/.changeset/pr-13092-upcoming-features-1763093527692.md
 delete mode 100644 packages/manager/.changeset/pr-13093-added-1766788494029.md
 delete mode 100644 packages/manager/.changeset/pr-13094-upcoming-features-1763558731421.md
 delete mode 100644 packages/manager/.changeset/pr-13095-upcoming-features-1763130670048.md
 delete mode 100644 packages/manager/.changeset/pr-13097-added-1763149132736.md
 delete mode 100644 packages/manager/.changeset/pr-13098-fixed-1763371721536.md
 delete mode 100644 packages/manager/.changeset/pr-13099-changed-1763377007914.md
 delete mode 100644 packages/manager/.changeset/pr-13100-fixed-1764265664121.md
 delete mode 100644 packages/manager/.changeset/pr-13104-upcoming-features-1763472761959.md
 delete mode 100644 packages/manager/.changeset/pr-13107-tests-1763492424120.md
 delete mode 100644 packages/manager/.changeset/pr-13108-upcoming-features-1763746838424.md
 delete mode 100644 packages/manager/.changeset/pr-13109-fixed-1763535418420.md
 delete mode 100644 packages/manager/.changeset/pr-13110-upcoming-features-1763617588411.md
 delete mode 100644 packages/manager/.changeset/pr-13111-upcoming-features-1763615562636.md
 delete mode 100644 packages/manager/.changeset/pr-13112-upcoming-features-1763627065100.md
 delete mode 100644 packages/manager/.changeset/pr-13113-fixed-1763631318653.md
 delete mode 100644 packages/manager/.changeset/pr-13115-upcoming-features-1763630712827.md
 delete mode 100644 packages/manager/.changeset/pr-13116-upcoming-features-1763642170773.md
 delete mode 100644 packages/manager/.changeset/pr-13117-upcoming-features-1763642787362.md
 delete mode 100644 packages/manager/.changeset/pr-13118-fixed-1763722681223.md
 delete mode 100644 packages/manager/.changeset/pr-13119-tech-stories-1764007553451.md
 delete mode 100644 packages/manager/.changeset/pr-13119-tech-stories-1764007583363.md
 delete mode 100644 packages/manager/.changeset/pr-13119-tech-stories-1764007617066.md
 delete mode 100644 packages/manager/.changeset/pr-13121-fixed-1763734247008.md
 delete mode 100644 packages/manager/.changeset/pr-13122-changed-1763759617340.md
 delete mode 100644 packages/manager/.changeset/pr-13122-upcoming-features-1763759704504.md
 delete mode 100644 packages/manager/.changeset/pr-13123-upcoming-features-1763724960594.md
 delete mode 100644 packages/manager/.changeset/pr-13124-changed-1763726824931.md
 delete mode 100644 packages/manager/.changeset/pr-13125-upcoming-features-1763760083439.md
 delete mode 100644 packages/manager/.changeset/pr-13127-upcoming-features-1763979546789.md
 delete mode 100644 packages/manager/.changeset/pr-13129-fixed-1763987727502.md
 delete mode 100644 packages/manager/.changeset/pr-13130-upcoming-features-1763993150579.md
 delete mode 100644 packages/manager/.changeset/pr-13131-changed-1763990723303.md
 delete mode 100644 packages/manager/.changeset/pr-13132-upcoming-features-1764056438332.md
 delete mode 100644 packages/manager/.changeset/pr-13133-upcoming-features-1764084041956.md
 delete mode 100644 packages/manager/.changeset/pr-13134-upcoming-features-1764110309888.md
 delete mode 100644 packages/manager/.changeset/pr-13135-changed-1764659811788.md
 delete mode 100644 packages/manager/.changeset/pr-13137-upcoming-features-1764156818321.md
 delete mode 100644 packages/manager/.changeset/pr-13138-upcoming-features-1764681439890.md
 delete mode 100644 packages/manager/.changeset/pr-13139-fixed-1764247173880.md
 delete mode 100644 packages/manager/.changeset/pr-13140-changed-1764317364992.md
 delete mode 100644 packages/manager/.changeset/pr-13141-upcoming-features-1764311100780.md
 delete mode 100644 packages/manager/.changeset/pr-13142-fixed-1764342267912.md
 delete mode 100644 packages/manager/.changeset/pr-13143-fixed-1764672257327.md
 delete mode 100644 packages/manager/.changeset/pr-13146-upcoming-features-1764599840190.md
 delete mode 100644 packages/manager/.changeset/pr-13147-upcoming-features-1764592604792.md
 delete mode 100644 packages/manager/.changeset/pr-13153-fixed-1764672225221.md
 delete mode 100644 packages/manager/.changeset/pr-13156-upcoming-features-1764708766786.md
 delete mode 100644 packages/manager/.changeset/pr-13157-upcoming-features-1764741522593.md
 delete mode 100644 packages/manager/.changeset/pr-13158-upcoming-features-1764752133530.md
 delete mode 100644 packages/manager/.changeset/pr-13164-upcoming-features-1764838771826.md
 delete mode 100644 packages/manager/.changeset/pr-13165-upcoming-features-1764951969980.md
 delete mode 100644 packages/manager/.changeset/pr-13166-changed-1764854054943.md
 delete mode 100644 packages/manager/.changeset/pr-13168-fixed-1765192706974.md
 delete mode 100644 packages/manager/.changeset/pr-13169-upcoming-features-1764884932241.md
 delete mode 100644 packages/manager/.changeset/pr-13172-upcoming-features-1764950932547.md
 delete mode 100644 packages/manager/.changeset/pr-13173-fixed-1764944067009.md
 delete mode 100644 packages/manager/.changeset/pr-13174-fixed-1764961648716.md
 delete mode 100644 packages/manager/.changeset/pr-13175-added-1765199020354.md
 delete mode 100644 packages/queries/.changeset/pr-13078-upcoming-features-1762869790174.md
 delete mode 100644 packages/queries/.changeset/pr-13097-changed-1763149256983.md
 delete mode 100644 packages/queries/.changeset/pr-13148-upcoming-features-1764600420579.md
 delete mode 100644 packages/utilities/.changeset/pr-13119-tech-stories-1764007518381.md
 delete mode 100644 packages/validation/.changeset/pr-13079-upcoming-features-1762861891552.md
 delete mode 100644 packages/validation/.changeset/pr-13148-upcoming-features-1764600446107.md
 delete mode 100644 packages/validation/.changeset/pr-13166-changed-1764854111433.md

diff --git a/packages/api-v4/.changeset/pr-13078-upcoming-features-1762869732236.md b/packages/api-v4/.changeset/pr-13078-upcoming-features-1762869732236.md
deleted file mode 100644
index f671a53b5a9..00000000000
--- a/packages/api-v4/.changeset/pr-13078-upcoming-features-1762869732236.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/api-v4": Upcoming Features
----
-
-Add new API endpoints and types for Network Load Balancers ([#13078](https://github.com/linode/manager/pull/13078))
diff --git a/packages/api-v4/.changeset/pr-13079-upcoming-features-1762861826541.md b/packages/api-v4/.changeset/pr-13079-upcoming-features-1762861826541.md
deleted file mode 100644
index a9fa484079f..00000000000
--- a/packages/api-v4/.changeset/pr-13079-upcoming-features-1762861826541.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/api-v4": Upcoming Features
----
-
-Update FirewallRuleType to support ruleset ([#13079](https://github.com/linode/manager/pull/13079))
diff --git a/packages/api-v4/.changeset/pr-13097-changed-1763149227691.md b/packages/api-v4/.changeset/pr-13097-changed-1763149227691.md
deleted file mode 100644
index a64d20f3418..00000000000
--- a/packages/api-v4/.changeset/pr-13097-changed-1763149227691.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/api-v4": Changed
----
-
-Update database restoreWithBackup data to include region ([#13097](https://github.com/linode/manager/pull/13097))
diff --git a/packages/api-v4/.changeset/pr-13119-tech-stories-1764007445902.md b/packages/api-v4/.changeset/pr-13119-tech-stories-1764007445902.md
deleted file mode 100644
index db0f148184b..00000000000
--- a/packages/api-v4/.changeset/pr-13119-tech-stories-1764007445902.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/api-v4": Tech Stories
----
-
-Add `@types/node` as a devDependency ([#13119](https://github.com/linode/manager/pull/13119))
diff --git a/packages/api-v4/.changeset/pr-13127-upcoming-features-1763979506001.md b/packages/api-v4/.changeset/pr-13127-upcoming-features-1763979506001.md
deleted file mode 100644
index 82561a7e436..00000000000
--- a/packages/api-v4/.changeset/pr-13127-upcoming-features-1763979506001.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/api-v4": Upcoming Features
----
-
-Add additional status types `enabling`, `disabling`, `provisioning` in CloudPulse alerts ([#13127](https://github.com/linode/manager/pull/13127))
diff --git a/packages/api-v4/.changeset/pr-13133-upcoming-features-1764084018326.md b/packages/api-v4/.changeset/pr-13133-upcoming-features-1764084018326.md
deleted file mode 100644
index 3e22f0af003..00000000000
--- a/packages/api-v4/.changeset/pr-13133-upcoming-features-1764084018326.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/api-v4": Upcoming Features
----
-
-CloudPulse-Metrics: Update `entity_ids` type in `CloudPulseMetricsRequest` for metrics api in endpoints dahsboard ([#13133](https://github.com/linode/manager/pull/13133))
diff --git a/packages/api-v4/.changeset/pr-13146-upcoming-features-1764600095421.md b/packages/api-v4/.changeset/pr-13146-upcoming-features-1764600095421.md
deleted file mode 100644
index e0cb2c1aa43..00000000000
--- a/packages/api-v4/.changeset/pr-13146-upcoming-features-1764600095421.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/api-v4": Upcoming Features
----
-
-Add `deleted` property to `FirewallPrefixList` type after API update ([#13146](https://github.com/linode/manager/pull/13146))
diff --git a/packages/api-v4/.changeset/pr-13148-upcoming-features-1764600387228.md b/packages/api-v4/.changeset/pr-13148-upcoming-features-1764600387228.md
deleted file mode 100644
index 545cf23d859..00000000000
--- a/packages/api-v4/.changeset/pr-13148-upcoming-features-1764600387228.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/api-v4": Upcoming Features
----
-
-Added Database Connection Pool types and endpoints ([#13148](https://github.com/linode/manager/pull/13148))
diff --git a/packages/api-v4/.changeset/pr-13156-upcoming-features-1764708047549.md b/packages/api-v4/.changeset/pr-13156-upcoming-features-1764708047549.md
deleted file mode 100644
index 991b3820fb3..00000000000
--- a/packages/api-v4/.changeset/pr-13156-upcoming-features-1764708047549.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/api-v4": Upcoming Features
----
-
-Add 'Cloud Firewall Rule Set' to AccountCapability type ([#13156](https://github.com/linode/manager/pull/13156))
diff --git a/packages/api-v4/.changeset/pr-13174-changed-1764961622718.md b/packages/api-v4/.changeset/pr-13174-changed-1764961622718.md
deleted file mode 100644
index fe886996b9b..00000000000
--- a/packages/api-v4/.changeset/pr-13174-changed-1764961622718.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/api-v4": Changed
----
-
-Add private_network to `DatabaseBackupsPayload` ([#13174](https://github.com/linode/manager/pull/13174))
diff --git a/packages/api-v4/CHANGELOG.md b/packages/api-v4/CHANGELOG.md
index f290607bda5..8fd23ca90a8 100644
--- a/packages/api-v4/CHANGELOG.md
+++ b/packages/api-v4/CHANGELOG.md
@@ -1,3 +1,25 @@
+## [2025-12-10] - v0.154.0
+
+
+### Changed:
+
+- Update database restoreWithBackup data to include region ([#13097](https://github.com/linode/manager/pull/13097))
+- Add private_network to `DatabaseBackupsPayload` ([#13174](https://github.com/linode/manager/pull/13174))
+
+### Tech Stories:
+
+- Add `@types/node` as a devDependency ([#13119](https://github.com/linode/manager/pull/13119))
+
+### Upcoming Features:
+
+- Add new API endpoints and types for Network Load Balancers ([#13078](https://github.com/linode/manager/pull/13078))
+- Update FirewallRuleType to support ruleset ([#13079](https://github.com/linode/manager/pull/13079))
+- Add additional status types `enabling`, `disabling`, `provisioning` in CloudPulse alerts ([#13127](https://github.com/linode/manager/pull/13127))
+- CloudPulse-Metrics: Update `entity_ids` type in `CloudPulseMetricsRequest` for metrics api in endpoints dahsboard ([#13133](https://github.com/linode/manager/pull/13133))
+- Add `deleted` property to `FirewallPrefixList` type after API update ([#13146](https://github.com/linode/manager/pull/13146))
+- Added Database Connection Pool types and endpoints ([#13148](https://github.com/linode/manager/pull/13148))
+- Add 'Cloud Firewall Rule Set' to AccountCapability type ([#13156](https://github.com/linode/manager/pull/13156))
+
 ## [2025-11-18] - v0.153.0
 
 
diff --git a/packages/api-v4/package.json b/packages/api-v4/package.json
index 033074da041..bc12f54b67b 100644
--- a/packages/api-v4/package.json
+++ b/packages/api-v4/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@linode/api-v4",
-  "version": "0.153.0",
+  "version": "0.154.0",
   "homepage": "https://github.com/linode/manager/tree/develop/packages/api-v4",
   "bugs": {
     "url": "https://github.com/linode/manager/issues"
diff --git a/packages/manager/.changeset/pr-13032-changed-1761686860911.md b/packages/manager/.changeset/pr-13032-changed-1761686860911.md
deleted file mode 100644
index dcdc79dea36..00000000000
--- a/packages/manager/.changeset/pr-13032-changed-1761686860911.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Changed
----
-
-Update icon svg files to match with Akamai design system ([#13032](https://github.com/linode/manager/pull/13032))
diff --git a/packages/manager/.changeset/pr-13057-changed-1762343659819.md b/packages/manager/.changeset/pr-13057-changed-1762343659819.md
deleted file mode 100644
index e50a5c0e329..00000000000
--- a/packages/manager/.changeset/pr-13057-changed-1762343659819.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Tech Stories
----
-
-DBaaS: Replace the dropdowns in Database cluster settings page with CDS select web component ([#13057](https://github.com/linode/manager/pull/13057))
diff --git a/packages/manager/.changeset/pr-13059-fixed-1762972220664.md b/packages/manager/.changeset/pr-13059-fixed-1762972220664.md
deleted file mode 100644
index 8279d18f00f..00000000000
--- a/packages/manager/.changeset/pr-13059-fixed-1762972220664.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Fixed
----
-
-Fix incorrect maintenance time display in the Upcoming maintenance table ([#13059](https://github.com/linode/manager/pull/13059))
diff --git a/packages/manager/.changeset/pr-13060-tech-stories-1762357716157.md b/packages/manager/.changeset/pr-13060-tech-stories-1762357716157.md
deleted file mode 100644
index 04211c454c6..00000000000
--- a/packages/manager/.changeset/pr-13060-tech-stories-1762357716157.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Tech Stories
----
-
-Replace Formik with React Hook Form in MaintenanceWindow ([#13060](https://github.com/linode/manager/pull/13060))
diff --git a/packages/manager/.changeset/pr-13068-upcoming-features-1762930872294.md b/packages/manager/.changeset/pr-13068-upcoming-features-1762930872294.md
deleted file mode 100644
index 47909ba6d28..00000000000
--- a/packages/manager/.changeset/pr-13068-upcoming-features-1762930872294.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Implement feature flag and routing for NLB ([#13068](https://github.com/linode/manager/pull/13068))
diff --git a/packages/manager/.changeset/pr-13075-added-1762776269124.md b/packages/manager/.changeset/pr-13075-added-1762776269124.md
deleted file mode 100644
index ed452d6cbe3..00000000000
--- a/packages/manager/.changeset/pr-13075-added-1762776269124.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Added
----
-
-IAM Parent/Child: permissions switch account ([#13075](https://github.com/linode/manager/pull/13075))
diff --git a/packages/manager/.changeset/pr-13079-upcoming-features-1762861957439.md b/packages/manager/.changeset/pr-13079-upcoming-features-1762861957439.md
deleted file mode 100644
index 63b2dd22823..00000000000
--- a/packages/manager/.changeset/pr-13079-upcoming-features-1762861957439.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Add new Firewall RuleSet row layout ([#13079](https://github.com/linode/manager/pull/13079))
diff --git a/packages/manager/.changeset/pr-13081-upcoming-features-1762935895154.md b/packages/manager/.changeset/pr-13081-upcoming-features-1762935895154.md
deleted file mode 100644
index b65763c0fc7..00000000000
--- a/packages/manager/.changeset/pr-13081-upcoming-features-1762935895154.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Disable premium plan tab if corresponding g7 dedicated plans are available ([#13081](https://github.com/linode/manager/pull/13081))
diff --git a/packages/manager/.changeset/pr-13082-fixed-1762957507469.md b/packages/manager/.changeset/pr-13082-fixed-1762957507469.md
deleted file mode 100644
index 004e1cb6473..00000000000
--- a/packages/manager/.changeset/pr-13082-fixed-1762957507469.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Fixed
----
-
-IAM: the aria-label for the Users table action menu displays an incorrect username ([#13082](https://github.com/linode/manager/pull/13082))
diff --git a/packages/manager/.changeset/pr-13083-tests-1762969859293.md b/packages/manager/.changeset/pr-13083-tests-1762969859293.md
deleted file mode 100644
index 9b91e05e390..00000000000
--- a/packages/manager/.changeset/pr-13083-tests-1762969859293.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Tests
----
-
-Fix flakey vm-host test ([#13083](https://github.com/linode/manager/pull/13083))
diff --git a/packages/manager/.changeset/pr-13087-upcoming-features-1763109384091.md b/packages/manager/.changeset/pr-13087-upcoming-features-1763109384091.md
deleted file mode 100644
index 96635443a16..00000000000
--- a/packages/manager/.changeset/pr-13087-upcoming-features-1763109384091.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Object storage summary page migrated to use table view ([#13087](https://github.com/linode/manager/pull/13087))
diff --git a/packages/manager/.changeset/pr-13088-upcoming-features-1763032920807.md b/packages/manager/.changeset/pr-13088-upcoming-features-1763032920807.md
deleted file mode 100644
index 7e8f72e9126..00000000000
--- a/packages/manager/.changeset/pr-13088-upcoming-features-1763032920807.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Scaffolding setup for widget level dimension filters in cloudpulse metrics and group by issue fix in cloudpulse metrics ([#13088](https://github.com/linode/manager/pull/13088))
diff --git a/packages/manager/.changeset/pr-13089-upcoming-features-1763100678421.md b/packages/manager/.changeset/pr-13089-upcoming-features-1763100678421.md
deleted file mode 100644
index 0ee6419cf61..00000000000
--- a/packages/manager/.changeset/pr-13089-upcoming-features-1763100678421.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Integrate Firewall-nodebalancer support for ACLP-Alerting ([#13089](https://github.com/linode/manager/pull/13089))
diff --git a/packages/manager/.changeset/pr-13090-upcoming-features-1763045734612.md b/packages/manager/.changeset/pr-13090-upcoming-features-1763045734612.md
deleted file mode 100644
index 85af714871c..00000000000
--- a/packages/manager/.changeset/pr-13090-upcoming-features-1763045734612.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Add tooltip for Rules column header in Firewall Rules table ([#13090](https://github.com/linode/manager/pull/13090))
diff --git a/packages/manager/.changeset/pr-13092-upcoming-features-1763093527692.md b/packages/manager/.changeset/pr-13092-upcoming-features-1763093527692.md
deleted file mode 100644
index 3d6050b3391..00000000000
--- a/packages/manager/.changeset/pr-13092-upcoming-features-1763093527692.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-CloudPulse-Metrics: Enhance `CloudPulseWidgetUtils.ts` to handle id to label conversion of linode associated with volume in volumes service ([#13092](https://github.com/linode/manager/pull/13092))
diff --git a/packages/manager/.changeset/pr-13093-added-1766788494029.md b/packages/manager/.changeset/pr-13093-added-1766788494029.md
deleted file mode 100644
index 401b517416d..00000000000
--- a/packages/manager/.changeset/pr-13093-added-1766788494029.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Implement Filtering for Plans table ([#13093](https://github.com/linode/manager/pull/13093))
diff --git a/packages/manager/.changeset/pr-13094-upcoming-features-1763558731421.md b/packages/manager/.changeset/pr-13094-upcoming-features-1763558731421.md
deleted file mode 100644
index 825c65ad24d..00000000000
--- a/packages/manager/.changeset/pr-13094-upcoming-features-1763558731421.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Update Firewall Rule Drawer to support referencing Rule Set ([#13094](https://github.com/linode/manager/pull/13094))
diff --git a/packages/manager/.changeset/pr-13095-upcoming-features-1763130670048.md b/packages/manager/.changeset/pr-13095-upcoming-features-1763130670048.md
deleted file mode 100644
index 6236a2c67b8..00000000000
--- a/packages/manager/.changeset/pr-13095-upcoming-features-1763130670048.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Edit Stream form: remove cluster IDs from the edited stream that no longer exist or have log generation disabled ([#13095](https://github.com/linode/manager/pull/13095))
diff --git a/packages/manager/.changeset/pr-13097-added-1763149132736.md b/packages/manager/.changeset/pr-13097-added-1763149132736.md
deleted file mode 100644
index 8759fd74af1..00000000000
--- a/packages/manager/.changeset/pr-13097-added-1763149132736.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Added
----
-
-Region select to Database Backups tab ([#13097](https://github.com/linode/manager/pull/13097))
diff --git a/packages/manager/.changeset/pr-13098-fixed-1763371721536.md b/packages/manager/.changeset/pr-13098-fixed-1763371721536.md
deleted file mode 100644
index c7e5164cde8..00000000000
--- a/packages/manager/.changeset/pr-13098-fixed-1763371721536.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Fixed
----
-
-Alignment with Linode row backup cell icon ([#13098](https://github.com/linode/manager/pull/13098))
diff --git a/packages/manager/.changeset/pr-13099-changed-1763377007914.md b/packages/manager/.changeset/pr-13099-changed-1763377007914.md
deleted file mode 100644
index 7a0e0ee8287..00000000000
--- a/packages/manager/.changeset/pr-13099-changed-1763377007914.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Changed
----
-
-IAM: fix permission check for detaching volumes ([#13099](https://github.com/linode/manager/pull/13099))
diff --git a/packages/manager/.changeset/pr-13100-fixed-1764265664121.md b/packages/manager/.changeset/pr-13100-fixed-1764265664121.md
deleted file mode 100644
index 4371d0b1da5..00000000000
--- a/packages/manager/.changeset/pr-13100-fixed-1764265664121.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Fixed
----
-
-Plans panel pagination bug fix ([#13100](https://github.com/linode/manager/pull/13100))
diff --git a/packages/manager/.changeset/pr-13104-upcoming-features-1763472761959.md b/packages/manager/.changeset/pr-13104-upcoming-features-1763472761959.md
deleted file mode 100644
index ff43e8785fe..00000000000
--- a/packages/manager/.changeset/pr-13104-upcoming-features-1763472761959.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
- Implement mocks and factories for Network LoadBalancer ([#13104](https://github.com/linode/manager/pull/13104))
diff --git a/packages/manager/.changeset/pr-13107-tests-1763492424120.md b/packages/manager/.changeset/pr-13107-tests-1763492424120.md
deleted file mode 100644
index 5f1b879f190..00000000000
--- a/packages/manager/.changeset/pr-13107-tests-1763492424120.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Tests
----
-
-Fixed various test failures when running tests against Prod environment ([#13107](https://github.com/linode/manager/pull/13107))
diff --git a/packages/manager/.changeset/pr-13108-upcoming-features-1763746838424.md b/packages/manager/.changeset/pr-13108-upcoming-features-1763746838424.md
deleted file mode 100644
index cd7c25bc363..00000000000
--- a/packages/manager/.changeset/pr-13108-upcoming-features-1763746838424.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-New Rule Set Details drawer with Marked for Deletion status ([#13108](https://github.com/linode/manager/pull/13108))
diff --git a/packages/manager/.changeset/pr-13109-fixed-1763535418420.md b/packages/manager/.changeset/pr-13109-fixed-1763535418420.md
deleted file mode 100644
index 5ed542147bf..00000000000
--- a/packages/manager/.changeset/pr-13109-fixed-1763535418420.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Fixed
----
-
-The `firewall_id` error on LKE pool update ([#13109](https://github.com/linode/manager/pull/13109))
diff --git a/packages/manager/.changeset/pr-13110-upcoming-features-1763617588411.md b/packages/manager/.changeset/pr-13110-upcoming-features-1763617588411.md
deleted file mode 100644
index 17bae8d23d4..00000000000
--- a/packages/manager/.changeset/pr-13110-upcoming-features-1763617588411.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-ACLP-Alerting: Filtering entities for firewall system alerts, add tooltip text to Entity Type component ([#13110](https://github.com/linode/manager/pull/13110))
diff --git a/packages/manager/.changeset/pr-13111-upcoming-features-1763615562636.md b/packages/manager/.changeset/pr-13111-upcoming-features-1763615562636.md
deleted file mode 100644
index 7fc2ab5ef65..00000000000
--- a/packages/manager/.changeset/pr-13111-upcoming-features-1763615562636.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-CloudPulse-Metrics: Remove filtering of firewalls and region filter dependency on firewall-select in Firewalls ([#13111](https://github.com/linode/manager/pull/13111))
diff --git a/packages/manager/.changeset/pr-13112-upcoming-features-1763627065100.md b/packages/manager/.changeset/pr-13112-upcoming-features-1763627065100.md
deleted file mode 100644
index bc0da4f2abb..00000000000
--- a/packages/manager/.changeset/pr-13112-upcoming-features-1763627065100.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Add NetworkLoadBalancersLanding component to render NLB list with pagination, loading/error and table columns ([#13112](https://github.com/linode/manager/pull/13112))
diff --git a/packages/manager/.changeset/pr-13113-fixed-1763631318653.md b/packages/manager/.changeset/pr-13113-fixed-1763631318653.md
deleted file mode 100644
index 5789752b6ca..00000000000
--- a/packages/manager/.changeset/pr-13113-fixed-1763631318653.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Fixed
----
-
-Disabled Tab + Tooltip styles & accessibility ([#13113](https://github.com/linode/manager/pull/13113))
diff --git a/packages/manager/.changeset/pr-13115-upcoming-features-1763630712827.md b/packages/manager/.changeset/pr-13115-upcoming-features-1763630712827.md
deleted file mode 100644
index 881f5d29a08..00000000000
--- a/packages/manager/.changeset/pr-13115-upcoming-features-1763630712827.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Implement filter for GPU plans in plans panel ([#13115](https://github.com/linode/manager/pull/13115))
diff --git a/packages/manager/.changeset/pr-13116-upcoming-features-1763642170773.md b/packages/manager/.changeset/pr-13116-upcoming-features-1763642170773.md
deleted file mode 100644
index a3617688321..00000000000
--- a/packages/manager/.changeset/pr-13116-upcoming-features-1763642170773.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Add integration changes with `CloudPulseWidget` for widget level dimension support in CloudPulse metrics ([#13116](https://github.com/linode/manager/pull/13116))
diff --git a/packages/manager/.changeset/pr-13117-upcoming-features-1763642787362.md b/packages/manager/.changeset/pr-13117-upcoming-features-1763642787362.md
deleted file mode 100644
index 9467c4a06c1..00000000000
--- a/packages/manager/.changeset/pr-13117-upcoming-features-1763642787362.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Destination Form: fixes and improvements for Sample Destination Object Name ([#13117](https://github.com/linode/manager/pull/13117))
diff --git a/packages/manager/.changeset/pr-13118-fixed-1763722681223.md b/packages/manager/.changeset/pr-13118-fixed-1763722681223.md
deleted file mode 100644
index 491ee99f5d2..00000000000
--- a/packages/manager/.changeset/pr-13118-fixed-1763722681223.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Fixed
----
-
-IAM: The StackScript/Linode selector is enabled in the Create Linode flow when the user doesn’t have the create_linode permission ([#13118](https://github.com/linode/manager/pull/13118))
diff --git a/packages/manager/.changeset/pr-13119-tech-stories-1764007553451.md b/packages/manager/.changeset/pr-13119-tech-stories-1764007553451.md
deleted file mode 100644
index 9141261a386..00000000000
--- a/packages/manager/.changeset/pr-13119-tech-stories-1764007553451.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Tech Stories
----
-
-Update Vite from `7.1.11` to `7.2.2` ([#13119](https://github.com/linode/manager/pull/13119))
diff --git a/packages/manager/.changeset/pr-13119-tech-stories-1764007583363.md b/packages/manager/.changeset/pr-13119-tech-stories-1764007583363.md
deleted file mode 100644
index 65133e69b95..00000000000
--- a/packages/manager/.changeset/pr-13119-tech-stories-1764007583363.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Tech Stories
----
-
-Fix circular imports in CloudPulse ([#13119](https://github.com/linode/manager/pull/13119))
diff --git a/packages/manager/.changeset/pr-13119-tech-stories-1764007617066.md b/packages/manager/.changeset/pr-13119-tech-stories-1764007617066.md
deleted file mode 100644
index d79f961c70c..00000000000
--- a/packages/manager/.changeset/pr-13119-tech-stories-1764007617066.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Tech Stories
----
-
-Update vitest from `v3` to `v4` ([#13119](https://github.com/linode/manager/pull/13119))
diff --git a/packages/manager/.changeset/pr-13121-fixed-1763734247008.md b/packages/manager/.changeset/pr-13121-fixed-1763734247008.md
deleted file mode 100644
index 30842b6ced6..00000000000
--- a/packages/manager/.changeset/pr-13121-fixed-1763734247008.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Fixed
----
-
-DBaaS - Manage Networking VPC fields not handling error response ([#13121](https://github.com/linode/manager/pull/13121))
diff --git a/packages/manager/.changeset/pr-13122-changed-1763759617340.md b/packages/manager/.changeset/pr-13122-changed-1763759617340.md
deleted file mode 100644
index 06175a04a56..00000000000
--- a/packages/manager/.changeset/pr-13122-changed-1763759617340.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Changed
----
-
-Move Action column to the 2nd position in the Firewall Rules Table ([#13122](https://github.com/linode/manager/pull/13122))
diff --git a/packages/manager/.changeset/pr-13122-upcoming-features-1763759704504.md b/packages/manager/.changeset/pr-13122-upcoming-features-1763759704504.md
deleted file mode 100644
index e05470547d8..00000000000
--- a/packages/manager/.changeset/pr-13122-upcoming-features-1763759704504.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Add `generateAddressesLabelV2` utility to support PrefixLists ([#13122](https://github.com/linode/manager/pull/13122))
diff --git a/packages/manager/.changeset/pr-13123-upcoming-features-1763724960594.md b/packages/manager/.changeset/pr-13123-upcoming-features-1763724960594.md
deleted file mode 100644
index 718a57bd746..00000000000
--- a/packages/manager/.changeset/pr-13123-upcoming-features-1763724960594.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Implement Listeners Table in Network LoadBalancer Detail page ([#13123](https://github.com/linode/manager/pull/13123))
diff --git a/packages/manager/.changeset/pr-13124-changed-1763726824931.md b/packages/manager/.changeset/pr-13124-changed-1763726824931.md
deleted file mode 100644
index 6e3faa3a17b..00000000000
--- a/packages/manager/.changeset/pr-13124-changed-1763726824931.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Changed
----
-
-Await permissions before rendering Linode Detail Header ([#13124](https://github.com/linode/manager/pull/13124))
diff --git a/packages/manager/.changeset/pr-13125-upcoming-features-1763760083439.md b/packages/manager/.changeset/pr-13125-upcoming-features-1763760083439.md
deleted file mode 100644
index aab9ee71357..00000000000
--- a/packages/manager/.changeset/pr-13125-upcoming-features-1763760083439.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Use new JSON-based fwRulesetsPrefixLists feature flag for Firewall RuleSets and Prefix Lists feature ([#13125](https://github.com/linode/manager/pull/13125))
diff --git a/packages/manager/.changeset/pr-13127-upcoming-features-1763979546789.md b/packages/manager/.changeset/pr-13127-upcoming-features-1763979546789.md
deleted file mode 100644
index 8ca707c6855..00000000000
--- a/packages/manager/.changeset/pr-13127-upcoming-features-1763979546789.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Add support for additional status types and handle action menu accordingly in CloudPulse alerts ([#13127](https://github.com/linode/manager/pull/13127))
diff --git a/packages/manager/.changeset/pr-13129-fixed-1763987727502.md b/packages/manager/.changeset/pr-13129-fixed-1763987727502.md
deleted file mode 100644
index 91597d4e0b1..00000000000
--- a/packages/manager/.changeset/pr-13129-fixed-1763987727502.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Fixed
----
-
-IAM: filtering by entity type at the Roles table ([#13129](https://github.com/linode/manager/pull/13129))
diff --git a/packages/manager/.changeset/pr-13130-upcoming-features-1763993150579.md b/packages/manager/.changeset/pr-13130-upcoming-features-1763993150579.md
deleted file mode 100644
index 6a8e6659ad0..00000000000
--- a/packages/manager/.changeset/pr-13130-upcoming-features-1763993150579.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Add a Network Load Balancer Listener detail page (EntityDetail paper) with breadcrumbs ([#13130](https://github.com/linode/manager/pull/13130))
diff --git a/packages/manager/.changeset/pr-13131-changed-1763990723303.md b/packages/manager/.changeset/pr-13131-changed-1763990723303.md
deleted file mode 100644
index 50ac5d0e771..00000000000
--- a/packages/manager/.changeset/pr-13131-changed-1763990723303.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Changed
----
-
-Legal sign off in Logs Streams Create Checkout bar ([#13131](https://github.com/linode/manager/pull/13131))
diff --git a/packages/manager/.changeset/pr-13132-upcoming-features-1764056438332.md b/packages/manager/.changeset/pr-13132-upcoming-features-1764056438332.md
deleted file mode 100644
index 5f5fea86ba1..00000000000
--- a/packages/manager/.changeset/pr-13132-upcoming-features-1764056438332.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
- Implement Empty Landing State for Network Load Balancers ([#13132](https://github.com/linode/manager/pull/13132))
diff --git a/packages/manager/.changeset/pr-13133-upcoming-features-1764084041956.md b/packages/manager/.changeset/pr-13133-upcoming-features-1764084041956.md
deleted file mode 100644
index 3f2f8c5bc68..00000000000
--- a/packages/manager/.changeset/pr-13133-upcoming-features-1764084041956.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-CloudPulse-Metrics: Update `FilterConfig.ts` to handle integration of endpoints dashboard for object-storage service in metrics page([#13133](https://github.com/linode/manager/pull/13133))
diff --git a/packages/manager/.changeset/pr-13134-upcoming-features-1764110309888.md b/packages/manager/.changeset/pr-13134-upcoming-features-1764110309888.md
deleted file mode 100644
index 7f7b3ff0afc..00000000000
--- a/packages/manager/.changeset/pr-13134-upcoming-features-1764110309888.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Add feature flag support for PgBouncer in DBaaS ([#13134](https://github.com/linode/manager/pull/13134))
diff --git a/packages/manager/.changeset/pr-13135-changed-1764659811788.md b/packages/manager/.changeset/pr-13135-changed-1764659811788.md
deleted file mode 100644
index 4055f36aa11..00000000000
--- a/packages/manager/.changeset/pr-13135-changed-1764659811788.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Changed
----
-
- Add Chip Support to Drawer Component Title ([#13135](https://github.com/linode/manager/pull/13135))
diff --git a/packages/manager/.changeset/pr-13137-upcoming-features-1764156818321.md b/packages/manager/.changeset/pr-13137-upcoming-features-1764156818321.md
deleted file mode 100644
index b21f0da7b01..00000000000
--- a/packages/manager/.changeset/pr-13137-upcoming-features-1764156818321.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-ACLP-Alerting: Update aclpAlerting flag to have beta marker control ([#13137](https://github.com/linode/manager/pull/13137))
diff --git a/packages/manager/.changeset/pr-13138-upcoming-features-1764681439890.md b/packages/manager/.changeset/pr-13138-upcoming-features-1764681439890.md
deleted file mode 100644
index 35a420a4964..00000000000
--- a/packages/manager/.changeset/pr-13138-upcoming-features-1764681439890.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Update Firewall Rules Edit & Add Drawer to Support Prefix List Selection ([#13138](https://github.com/linode/manager/pull/13138))
diff --git a/packages/manager/.changeset/pr-13139-fixed-1764247173880.md b/packages/manager/.changeset/pr-13139-fixed-1764247173880.md
deleted file mode 100644
index fb971eb3f3e..00000000000
--- a/packages/manager/.changeset/pr-13139-fixed-1764247173880.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Fixed
----
-
-CloudPulse metrics volumes contextual view `not showing dimension values` and CloudPulse metrics `group by default selection retention` ([#13139](https://github.com/linode/manager/pull/13139))
diff --git a/packages/manager/.changeset/pr-13140-changed-1764317364992.md b/packages/manager/.changeset/pr-13140-changed-1764317364992.md
deleted file mode 100644
index c983c60cbca..00000000000
--- a/packages/manager/.changeset/pr-13140-changed-1764317364992.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Changed
----
-
-Logs Delivery UI changes after review ([#13140](https://github.com/linode/manager/pull/13140))
diff --git a/packages/manager/.changeset/pr-13141-upcoming-features-1764311100780.md b/packages/manager/.changeset/pr-13141-upcoming-features-1764311100780.md
deleted file mode 100644
index c216c66363d..00000000000
--- a/packages/manager/.changeset/pr-13141-upcoming-features-1764311100780.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-CloudPulse-Metrics: Add tooltip for clusters filter in lke and fix preferences bug for nodebalancers filter in firewall-nodebalancer dashboard ([#13141](https://github.com/linode/manager/pull/13141))
diff --git a/packages/manager/.changeset/pr-13142-fixed-1764342267912.md b/packages/manager/.changeset/pr-13142-fixed-1764342267912.md
deleted file mode 100644
index 5cff2a9d457..00000000000
--- a/packages/manager/.changeset/pr-13142-fixed-1764342267912.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Fixed
----
-
-IAM: disable/enable fields based on create_linode permission ([#13142](https://github.com/linode/manager/pull/13142))
diff --git a/packages/manager/.changeset/pr-13143-fixed-1764672257327.md b/packages/manager/.changeset/pr-13143-fixed-1764672257327.md
deleted file mode 100644
index d5cb5c3d6fd..00000000000
--- a/packages/manager/.changeset/pr-13143-fixed-1764672257327.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Fixed
----
-
- IAM Permissions performance improvements: Create from Backup & Clone ([#13143](https://github.com/linode/manager/pull/13143))
diff --git a/packages/manager/.changeset/pr-13146-upcoming-features-1764599840190.md b/packages/manager/.changeset/pr-13146-upcoming-features-1764599840190.md
deleted file mode 100644
index ebf9b5fe305..00000000000
--- a/packages/manager/.changeset/pr-13146-upcoming-features-1764599840190.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Add and Integrate Prefix List Details Drawer ([#13146](https://github.com/linode/manager/pull/13146))
diff --git a/packages/manager/.changeset/pr-13147-upcoming-features-1764592604792.md b/packages/manager/.changeset/pr-13147-upcoming-features-1764592604792.md
deleted file mode 100644
index 460d9a7e704..00000000000
--- a/packages/manager/.changeset/pr-13147-upcoming-features-1764592604792.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Implement Nodes table in Network LoadBalancer Listener detail page ([#13147](https://github.com/linode/manager/pull/13147))
diff --git a/packages/manager/.changeset/pr-13153-fixed-1764672225221.md b/packages/manager/.changeset/pr-13153-fixed-1764672225221.md
deleted file mode 100644
index a3fcbd7ffb7..00000000000
--- a/packages/manager/.changeset/pr-13153-fixed-1764672225221.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Fixed
----
-
-IAM Permissions performance improvements: Firewall entity assignment ([#13153](https://github.com/linode/manager/pull/13153))
diff --git a/packages/manager/.changeset/pr-13156-upcoming-features-1764708766786.md b/packages/manager/.changeset/pr-13156-upcoming-features-1764708766786.md
deleted file mode 100644
index 085d0c3dbda..00000000000
--- a/packages/manager/.changeset/pr-13156-upcoming-features-1764708766786.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Update useIsFirewallRulesetsPrefixlistsEnabled() to factor in account capability ([#13156](https://github.com/linode/manager/pull/13156))
diff --git a/packages/manager/.changeset/pr-13157-upcoming-features-1764741522593.md b/packages/manager/.changeset/pr-13157-upcoming-features-1764741522593.md
deleted file mode 100644
index f91b3a5d2f5..00000000000
--- a/packages/manager/.changeset/pr-13157-upcoming-features-1764741522593.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-CloudPulse-Metrics: Update tooltip msg for `Clusters` filter in LKE service dashboard ([#13157](https://github.com/linode/manager/pull/13157))
diff --git a/packages/manager/.changeset/pr-13158-upcoming-features-1764752133530.md b/packages/manager/.changeset/pr-13158-upcoming-features-1764752133530.md
deleted file mode 100644
index 5775b0813cf..00000000000
--- a/packages/manager/.changeset/pr-13158-upcoming-features-1764752133530.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Integrate Prefix List details drawer with Edit and Add Rule drawer ([#13158](https://github.com/linode/manager/pull/13158))
diff --git a/packages/manager/.changeset/pr-13164-upcoming-features-1764838771826.md b/packages/manager/.changeset/pr-13164-upcoming-features-1764838771826.md
deleted file mode 100644
index 8276febb6be..00000000000
--- a/packages/manager/.changeset/pr-13164-upcoming-features-1764838771826.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Add Beta/New feature Chip support for RuleSets and Prefix Lists ([#13164](https://github.com/linode/manager/pull/13164))
diff --git a/packages/manager/.changeset/pr-13165-upcoming-features-1764951969980.md b/packages/manager/.changeset/pr-13165-upcoming-features-1764951969980.md
deleted file mode 100644
index ae7b46a0c05..00000000000
--- a/packages/manager/.changeset/pr-13165-upcoming-features-1764951969980.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-UX/UI enhancements for RuleSets and Prefix Lists ([#13165](https://github.com/linode/manager/pull/13165))
diff --git a/packages/manager/.changeset/pr-13166-changed-1764854054943.md b/packages/manager/.changeset/pr-13166-changed-1764854054943.md
deleted file mode 100644
index b292049b2a3..00000000000
--- a/packages/manager/.changeset/pr-13166-changed-1764854054943.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Changed
----
-
-Logs: Many minor UI fixes and improvements ([#13166](https://github.com/linode/manager/pull/13166))
diff --git a/packages/manager/.changeset/pr-13168-fixed-1765192706974.md b/packages/manager/.changeset/pr-13168-fixed-1765192706974.md
deleted file mode 100644
index ddd0821e97b..00000000000
--- a/packages/manager/.changeset/pr-13168-fixed-1765192706974.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Fixed
----
-
-EntitiesSelect performance on large accounts ([#13168](https://github.com/linode/manager/pull/13168))
diff --git a/packages/manager/.changeset/pr-13169-upcoming-features-1764884932241.md b/packages/manager/.changeset/pr-13169-upcoming-features-1764884932241.md
deleted file mode 100644
index c7d3a1b5e6f..00000000000
--- a/packages/manager/.changeset/pr-13169-upcoming-features-1764884932241.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Ensure a firewall can only reference a RuleSet once ([#13169](https://github.com/linode/manager/pull/13169))
diff --git a/packages/manager/.changeset/pr-13172-upcoming-features-1764950932547.md b/packages/manager/.changeset/pr-13172-upcoming-features-1764950932547.md
deleted file mode 100644
index 38a2c3a6fc3..00000000000
--- a/packages/manager/.changeset/pr-13172-upcoming-features-1764950932547.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Upcoming Features
----
-
-Handle special PLs in PrefixList drawer ([#13172](https://github.com/linode/manager/pull/13172))
diff --git a/packages/manager/.changeset/pr-13173-fixed-1764944067009.md b/packages/manager/.changeset/pr-13173-fixed-1764944067009.md
deleted file mode 100644
index 771b1923966..00000000000
--- a/packages/manager/.changeset/pr-13173-fixed-1764944067009.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Fixed
----
-
-Optimize rendering of entities in AssignedRolesTable ([#13173](https://github.com/linode/manager/pull/13173))
diff --git a/packages/manager/.changeset/pr-13174-fixed-1764961648716.md b/packages/manager/.changeset/pr-13174-fixed-1764961648716.md
deleted file mode 100644
index 0deeb1ac90e..00000000000
--- a/packages/manager/.changeset/pr-13174-fixed-1764961648716.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Fixed
----
-
-Forking a Database Cluster with VPC into another region ([#13174](https://github.com/linode/manager/pull/13174))
diff --git a/packages/manager/.changeset/pr-13175-added-1765199020354.md b/packages/manager/.changeset/pr-13175-added-1765199020354.md
deleted file mode 100644
index 0dfe282277d..00000000000
--- a/packages/manager/.changeset/pr-13175-added-1765199020354.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/manager": Added
----
-
-IAM "New" and "Limited Availability" badges ([#13175](https://github.com/linode/manager/pull/13175))
diff --git a/packages/manager/CHANGELOG.md b/packages/manager/CHANGELOG.md
index dd5ff6f1a90..e8fabe978eb 100644
--- a/packages/manager/CHANGELOG.md
+++ b/packages/manager/CHANGELOG.md
@@ -4,6 +4,100 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2025-12-10] - v1.156.0
+
+
+### Added:
+
+- IAM Parent/Child: permissions switch account ([#13075](https://github.com/linode/manager/pull/13075))
+- Region select to Database Backups tab ([#13097](https://github.com/linode/manager/pull/13097))
+- IAM "New" and "Limited Availability" badges ([#13175](https://github.com/linode/manager/pull/13175))
+
+### Changed:
+
+- Update icon svg files to match with Akamai design system ([#13032](https://github.com/linode/manager/pull/13032))
+- IAM: fix permission check for detaching volumes ([#13099](https://github.com/linode/manager/pull/13099))
+- Move Action column to the 2nd position in the Firewall Rules Table ([#13122](https://github.com/linode/manager/pull/13122))
+- Await permissions before rendering Linode Detail Header ([#13124](https://github.com/linode/manager/pull/13124))
+- Legal sign off in Logs Streams Create Checkout bar ([#13131](https://github.com/linode/manager/pull/13131))
+- Add Chip Support to Drawer Component Title ([#13135](https://github.com/linode/manager/pull/13135))
+- Logs Delivery UI changes after review ([#13140](https://github.com/linode/manager/pull/13140))
+- Logs: Many minor UI fixes and improvements ([#13166](https://github.com/linode/manager/pull/13166))
+
+### Fixed:
+
+- Fix incorrect maintenance time display in the Upcoming maintenance table ([#13059](https://github.com/linode/manager/pull/13059))
+- IAM: the aria-label for the Users table action menu displays an incorrect username ([#13082](https://github.com/linode/manager/pull/13082))
+- Alignment with Linode row backup cell icon ([#13098](https://github.com/linode/manager/pull/13098))
+- Plans panel pagination bug fix ([#13100](https://github.com/linode/manager/pull/13100))
+- The `firewall_id` error on LKE pool update ([#13109](https://github.com/linode/manager/pull/13109))
+- Disabled Tab + Tooltip styles & accessibility ([#13113](https://github.com/linode/manager/pull/13113))
+- IAM: The StackScript/Linode selector is enabled in the Create Linode flow when the user doesn’t have the create_linode permission ([#13118](https://github.com/linode/manager/pull/13118))
+- DBaaS - Manage Networking VPC fields not handling error response ([#13121](https://github.com/linode/manager/pull/13121))
+- IAM: filtering by entity type at the Roles table ([#13129](https://github.com/linode/manager/pull/13129))
+- CloudPulse metrics volumes contextual view `not showing dimension values` and CloudPulse metrics `group by default selection retention` ([#13139](https://github.com/linode/manager/pull/13139))
+- IAM: disable/enable fields based on create_linode permission ([#13142](https://github.com/linode/manager/pull/13142))
+- IAM Permissions performance improvements: Create from Backup & Clone ([#13143](https://github.com/linode/manager/pull/13143))
+- IAM Permissions performance improvements: Firewall entity assignment ([#13153](https://github.com/linode/manager/pull/13153))
+- EntitiesSelect performance on large accounts ([#13168](https://github.com/linode/manager/pull/13168))
+- Optimize rendering of entities in AssignedRolesTable ([#13173](https://github.com/linode/manager/pull/13173))
+- Forking a Database Cluster with VPC into another region ([#13174](https://github.com/linode/manager/pull/13174))
+
+### Tech Stories:
+
+- DBaaS: Replace the dropdowns in Database cluster settings page with CDS select web component ([#13057](https://github.com/linode/manager/pull/13057))
+- Replace Formik with React Hook Form in MaintenanceWindow ([#13060](https://github.com/linode/manager/pull/13060))
+- Update Vite from `7.1.11` to `7.2.2` ([#13119](https://github.com/linode/manager/pull/13119))
+- Fix circular imports in CloudPulse ([#13119](https://github.com/linode/manager/pull/13119))
+- Update vitest from `v3` to `v4` ([#13119](https://github.com/linode/manager/pull/13119))
+
+### Tests:
+
+- Fix flakey vm-host test ([#13083](https://github.com/linode/manager/pull/13083))
+- Fixed various test failures when running tests against Prod environment ([#13107](https://github.com/linode/manager/pull/13107))
+
+### Upcoming Features:
+
+- Implement feature flag and routing for NLB ([#13068](https://github.com/linode/manager/pull/13068))
+- Add new Firewall RuleSet row layout ([#13079](https://github.com/linode/manager/pull/13079))
+- Disable premium plan tab if corresponding g7 dedicated plans are available ([#13081](https://github.com/linode/manager/pull/13081))
+- Object storage summary page migrated to use table view ([#13087](https://github.com/linode/manager/pull/13087))
+- Scaffolding setup for widget level dimension filters in cloudpulse metrics and group by issue fix in cloudpulse metrics ([#13088](https://github.com/linode/manager/pull/13088))
+- Integrate Firewall-nodebalancer support for ACLP-Alerting ([#13089](https://github.com/linode/manager/pull/13089))
+- Add tooltip for Rules column header in Firewall Rules table ([#13090](https://github.com/linode/manager/pull/13090))
+- CloudPulse-Metrics: Enhance `CloudPulseWidgetUtils.ts` to handle id to label conversion of linode associated with volume in volumes service ([#13092](https://github.com/linode/manager/pull/13092))
+- Implement Filtering for Plans table ([#13093](https://github.com/linode/manager/pull/13093))
+- Update Firewall Rule Drawer to support referencing Rule Set ([#13094](https://github.com/linode/manager/pull/13094))
+- Edit Stream form: remove cluster IDs from the edited stream that no longer exist or have log generation disabled ([#13095](https://github.com/linode/manager/pull/13095))
+- Implement mocks and factories for Network LoadBalancer ([#13104](https://github.com/linode/manager/pull/13104))
+- New Rule Set Details drawer with Marked for Deletion status ([#13108](https://github.com/linode/manager/pull/13108))
+- ACLP-Alerting: Filtering entities for firewall system alerts, add tooltip text to Entity Type component ([#13110](https://github.com/linode/manager/pull/13110))
+- CloudPulse-Metrics: Remove filtering of firewalls and region filter dependency on firewall-select in Firewalls ([#13111](https://github.com/linode/manager/pull/13111))
+- Add NetworkLoadBalancersLanding component to render NLB list with pagination, loading/error and table columns ([#13112](https://github.com/linode/manager/pull/13112))
+- Implement filter for GPU plans in plans panel ([#13115](https://github.com/linode/manager/pull/13115))
+- Add integration changes with `CloudPulseWidget` for widget level dimension support in CloudPulse metrics ([#13116](https://github.com/linode/manager/pull/13116))
+- Destination Form: fixes and improvements for Sample Destination Object Name ([#13117](https://github.com/linode/manager/pull/13117))
+- Add `generateAddressesLabelV2` utility to support PrefixLists ([#13122](https://github.com/linode/manager/pull/13122))
+- Implement Listeners Table in Network LoadBalancer Detail page ([#13123](https://github.com/linode/manager/pull/13123))
+- Use new JSON-based fwRulesetsPrefixLists feature flag for Firewall RuleSets and Prefix Lists feature ([#13125](https://github.com/linode/manager/pull/13125))
+- Add support for additional status types and handle action menu accordingly in CloudPulse alerts ([#13127](https://github.com/linode/manager/pull/13127))
+- Add a Network Load Balancer Listener detail page (EntityDetail paper) with breadcrumbs ([#13130](https://github.com/linode/manager/pull/13130))
+- Implement Empty Landing State for Network Load Balancers ([#13132](https://github.com/linode/manager/pull/13132))
+- CloudPulse-Metrics: Update `FilterConfig.ts` to handle integration of endpoints dashboard for object-storage service in metrics page([#13133](https://github.com/linode/manager/pull/13133))
+- Add feature flag support for PgBouncer in DBaaS ([#13134](https://github.com/linode/manager/pull/13134))
+- ACLP-Alerting: Update aclpAlerting flag to have beta marker control ([#13137](https://github.com/linode/manager/pull/13137))
+- Update Firewall Rules Edit & Add Drawer to Support Prefix List Selection ([#13138](https://github.com/linode/manager/pull/13138))
+- CloudPulse-Metrics: Add tooltip for clusters filter in lke and fix preferences bug for nodebalancers filter in firewall-nodebalancer dashboard ([#13141](https://github.com/linode/manager/pull/13141))
+- Add and Integrate Prefix List Details Drawer ([#13146](https://github.com/linode/manager/pull/13146))
+- Implement Nodes table in Network LoadBalancer Listener detail page ([#13147](https://github.com/linode/manager/pull/13147))
+- Update useIsFirewallRulesetsPrefixlistsEnabled() to factor in account capability ([#13156](https://github.com/linode/manager/pull/13156))
+- CloudPulse-Metrics: Update tooltip msg for `Clusters` filter in LKE service dashboard ([#13157](https://github.com/linode/manager/pull/13157))
+- Integrate Prefix List details drawer with Edit and Add Rule drawer ([#13158](https://github.com/linode/manager/pull/13158))
+- Add Beta/New feature Chip support for RuleSets and Prefix Lists ([#13164](https://github.com/linode/manager/pull/13164))
+- UX/UI enhancements for RuleSets and Prefix Lists ([#13165](https://github.com/linode/manager/pull/13165))
+- Ensure a firewall can only reference a RuleSet once ([#13169](https://github.com/linode/manager/pull/13169))
+- Handle special PLs in PrefixList drawer ([#13172](https://github.com/linode/manager/pull/13172))
+
 ## [2025-11-18] - v1.155.0
 
 
diff --git a/packages/manager/package.json b/packages/manager/package.json
index 7a78fd09062..90cce025425 100644
--- a/packages/manager/package.json
+++ b/packages/manager/package.json
@@ -2,7 +2,7 @@
   "name": "linode-manager",
   "author": "Linode",
   "description": "The Linode Manager website",
-  "version": "1.155.0",
+  "version": "1.156.0",
   "private": true,
   "type": "module",
   "bugs": {
diff --git a/packages/queries/.changeset/pr-13078-upcoming-features-1762869790174.md b/packages/queries/.changeset/pr-13078-upcoming-features-1762869790174.md
deleted file mode 100644
index 6ad1e3662f2..00000000000
--- a/packages/queries/.changeset/pr-13078-upcoming-features-1762869790174.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/queries": Upcoming Features
----
-
-Add new queries for Network Load Balancers ([#13078](https://github.com/linode/manager/pull/13078))
diff --git a/packages/queries/.changeset/pr-13097-changed-1763149256983.md b/packages/queries/.changeset/pr-13097-changed-1763149256983.md
deleted file mode 100644
index 4797066c966..00000000000
--- a/packages/queries/.changeset/pr-13097-changed-1763149256983.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/queries": Changed
----
-
-Update database useRestoreFromBackupMutation data to include region ([#13097](https://github.com/linode/manager/pull/13097))
diff --git a/packages/queries/.changeset/pr-13148-upcoming-features-1764600420579.md b/packages/queries/.changeset/pr-13148-upcoming-features-1764600420579.md
deleted file mode 100644
index 782b19cc762..00000000000
--- a/packages/queries/.changeset/pr-13148-upcoming-features-1764600420579.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/queries": Upcoming Features
----
-
-Added Database Connection Pool queries ([#13148](https://github.com/linode/manager/pull/13148))
diff --git a/packages/queries/CHANGELOG.md b/packages/queries/CHANGELOG.md
index 7708246bd6e..93782eced0b 100644
--- a/packages/queries/CHANGELOG.md
+++ b/packages/queries/CHANGELOG.md
@@ -1,3 +1,15 @@
+## [2025-12-10] - v0.18.0
+
+
+### Changed:
+
+- Update database useRestoreFromBackupMutation data to include region ([#13097](https://github.com/linode/manager/pull/13097))
+
+### Upcoming Features:
+
+- Add new queries for Network Load Balancers ([#13078](https://github.com/linode/manager/pull/13078))
+- Added Database Connection Pool queries ([#13148](https://github.com/linode/manager/pull/13148))
+
 ## [2025-11-18] - v0.17.0
 
 
diff --git a/packages/queries/package.json b/packages/queries/package.json
index 930facd44bc..495e18c688f 100644
--- a/packages/queries/package.json
+++ b/packages/queries/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@linode/queries",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "Linode Utility functions library",
   "main": "src/index.js",
   "module": "src/index.ts",
diff --git a/packages/utilities/.changeset/pr-13119-tech-stories-1764007518381.md b/packages/utilities/.changeset/pr-13119-tech-stories-1764007518381.md
deleted file mode 100644
index 00ff19841a8..00000000000
--- a/packages/utilities/.changeset/pr-13119-tech-stories-1764007518381.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/utilities": Tech Stories
----
-
-Update `scrollErrorIntoViewV2.test.tsx‎` to not mock  MutationObserver` ([#13119](https://github.com/linode/manager/pull/13119))
diff --git a/packages/utilities/CHANGELOG.md b/packages/utilities/CHANGELOG.md
index 1aeae7b42c4..f6af6d75885 100644
--- a/packages/utilities/CHANGELOG.md
+++ b/packages/utilities/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [2025-12-10] - v0.13.0
+
+
+### Tech Stories:
+
+- Update `scrollErrorIntoViewV2.test.tsx‎` to not mock  MutationObserver` ([#13119](https://github.com/linode/manager/pull/13119))
+
 ## [2025-11-18] - v0.12.0
 
 
diff --git a/packages/utilities/package.json b/packages/utilities/package.json
index c4539523877..f69d7df796a 100644
--- a/packages/utilities/package.json
+++ b/packages/utilities/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@linode/utilities",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "Linode Utility functions library",
   "main": "src/index.ts",
   "module": "src/index.ts",
diff --git a/packages/validation/.changeset/pr-13079-upcoming-features-1762861891552.md b/packages/validation/.changeset/pr-13079-upcoming-features-1762861891552.md
deleted file mode 100644
index 419f08d8ecf..00000000000
--- a/packages/validation/.changeset/pr-13079-upcoming-features-1762861891552.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/validation": Upcoming Features
----
-
-Update FirewallRuleTypeSchema to support ruleset ([#13079](https://github.com/linode/manager/pull/13079))
diff --git a/packages/validation/.changeset/pr-13148-upcoming-features-1764600446107.md b/packages/validation/.changeset/pr-13148-upcoming-features-1764600446107.md
deleted file mode 100644
index 0e428fea296..00000000000
--- a/packages/validation/.changeset/pr-13148-upcoming-features-1764600446107.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/validation": Upcoming Features
----
-
-Added Database Connection Pool schemas ([#13148](https://github.com/linode/manager/pull/13148))
diff --git a/packages/validation/.changeset/pr-13166-changed-1764854111433.md b/packages/validation/.changeset/pr-13166-changed-1764854111433.md
deleted file mode 100644
index a4e04eb3b87..00000000000
--- a/packages/validation/.changeset/pr-13166-changed-1764854111433.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@linode/validation": Changed
----
-
-Validate Bucket name in Destination Form for forbidden characters ([#13166](https://github.com/linode/manager/pull/13166))
diff --git a/packages/validation/CHANGELOG.md b/packages/validation/CHANGELOG.md
index 176d6748a14..7fa6a7853a5 100644
--- a/packages/validation/CHANGELOG.md
+++ b/packages/validation/CHANGELOG.md
@@ -1,3 +1,15 @@
+## [2025-12-10] - v0.79.0
+
+
+### Changed:
+
+- Validate Bucket name in Destination Form for forbidden characters ([#13166](https://github.com/linode/manager/pull/13166))
+
+### Upcoming Features:
+
+- Update FirewallRuleTypeSchema to support ruleset ([#13079](https://github.com/linode/manager/pull/13079))
+- Added Database Connection Pool schemas ([#13148](https://github.com/linode/manager/pull/13148))
+
 ## [2025-11-04] - v0.78.0
 
 ### Upcoming Features:
diff --git a/packages/validation/package.json b/packages/validation/package.json
index 07ae8252d08..6b44f758c62 100644
--- a/packages/validation/package.json
+++ b/packages/validation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@linode/validation",
-  "version": "0.78.0",
+  "version": "0.79.0",
   "description": "Yup validation schemas for use with the Linode APIv4",
   "type": "module",
   "main": "lib/index.cjs",

From f518c22825138d996c7726f5f6c5675d07d1fb77 Mon Sep 17 00:00:00 2001
From: Alban Bailly <abailly@akamai.com>
Date: Mon, 8 Dec 2025 20:14:28 +0100
Subject: [PATCH 91/91] update changelog dates

---
 packages/api-v4/CHANGELOG.md     | 2 +-
 packages/manager/CHANGELOG.md    | 2 +-
 packages/queries/CHANGELOG.md    | 2 +-
 packages/utilities/CHANGELOG.md  | 2 +-
 packages/validation/CHANGELOG.md | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/api-v4/CHANGELOG.md b/packages/api-v4/CHANGELOG.md
index 8fd23ca90a8..ba68e404cca 100644
--- a/packages/api-v4/CHANGELOG.md
+++ b/packages/api-v4/CHANGELOG.md
@@ -1,4 +1,4 @@
-## [2025-12-10] - v0.154.0
+## [2025-12-09] - v0.154.0
 
 
 ### Changed:
diff --git a/packages/manager/CHANGELOG.md b/packages/manager/CHANGELOG.md
index e8fabe978eb..efe48704bd1 100644
--- a/packages/manager/CHANGELOG.md
+++ b/packages/manager/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [2025-12-10] - v1.156.0
+## [2025-12-09] - v1.156.0
 
 
 ### Added:
diff --git a/packages/queries/CHANGELOG.md b/packages/queries/CHANGELOG.md
index 93782eced0b..ac10cd07909 100644
--- a/packages/queries/CHANGELOG.md
+++ b/packages/queries/CHANGELOG.md
@@ -1,4 +1,4 @@
-## [2025-12-10] - v0.18.0
+## [2025-12-09] - v0.18.0
 
 
 ### Changed:
diff --git a/packages/utilities/CHANGELOG.md b/packages/utilities/CHANGELOG.md
index f6af6d75885..3b586437871 100644
--- a/packages/utilities/CHANGELOG.md
+++ b/packages/utilities/CHANGELOG.md
@@ -1,4 +1,4 @@
-## [2025-12-10] - v0.13.0
+## [2025-12-09] - v0.13.0
 
 
 ### Tech Stories:
diff --git a/packages/validation/CHANGELOG.md b/packages/validation/CHANGELOG.md
index 7fa6a7853a5..5c9b653355e 100644
--- a/packages/validation/CHANGELOG.md
+++ b/packages/validation/CHANGELOG.md
@@ -1,4 +1,4 @@
-## [2025-12-10] - v0.79.0
+## [2025-12-09] - v0.79.0
 
 
 ### Changed: