From a6e4b89c5c90ffd65e28576389413f70737aa17c Mon Sep 17 00:00:00 2001
From: Zac Richards <107489668+Zacgoose@users.noreply.github.com>
Date: Fri, 27 Jun 2025 22:29:25 +0800
Subject: [PATCH] Remove last of grid and unstable grid 2 imports

little cleanup, no broken things this time
---
 src/components/CippComponents/CippAppPermissionBuilder.jsx  | 1 -
 src/components/CippFormPages/CippJSONView.jsx               | 1 -
 src/components/CippFormPages/CippSchedulerForm.jsx          | 1 -
 src/components/CippWizard/CippIntunePolicy.jsx              | 2 +-
 src/components/CippWizard/CippWizardAutopilotImport.jsx     | 6 +-----
 src/pages/email/spamfilter/list-quarantine-policies/add.jsx | 5 +++--
 src/pages/tenant/standards/bpa-report/builder.js            | 1 -
 src/pages/tenant/standards/bpa-report/view.js               | 1 -
 src/pages/tenant/standards/list-standards/index.js          | 2 +-
 src/pages/tools/breachlookup/index.js                       | 4 ++--
 src/sections/dashboard/components/stats/stats-2.js          | 3 ++-
 src/sections/dashboard/invoices/invoices-stats.js           | 3 ++-
 src/sections/dashboard/products/products-stats.js           | 3 ++-
 13 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/components/CippComponents/CippAppPermissionBuilder.jsx b/src/components/CippComponents/CippAppPermissionBuilder.jsx
index 3e489d043304..46adfc153008 100644
--- a/src/components/CippComponents/CippAppPermissionBuilder.jsx
+++ b/src/components/CippComponents/CippAppPermissionBuilder.jsx
@@ -821,7 +821,6 @@ const CippAppPermissionBuilder = ({
                 </Grid>
               </Grid>
               <Grid
-                item
                 size={12}
                 sx={{
                   mt: createServicePrincipal.isSuccess || createServicePrincipal.isPending ? 3 : 0,
diff --git a/src/components/CippFormPages/CippJSONView.jsx b/src/components/CippFormPages/CippJSONView.jsx
index e590f3ae2ed6..f6d206703e14 100644
--- a/src/components/CippFormPages/CippJSONView.jsx
+++ b/src/components/CippFormPages/CippJSONView.jsx
@@ -519,7 +519,6 @@ function CippJsonView({
               ?.filter((data) => data !== null && data !== undefined)
               .map((data, index) => (
                 <Grid
-                  item
                   size={{ sm: type === "intune" ? 12 : 3, xs: 12 }}
                   key={index}
                   sx={{
diff --git a/src/components/CippFormPages/CippSchedulerForm.jsx b/src/components/CippFormPages/CippSchedulerForm.jsx
index 1e28bd26f5f7..f160cd4a2c23 100644
--- a/src/components/CippFormPages/CippSchedulerForm.jsx
+++ b/src/components/CippFormPages/CippSchedulerForm.jsx
@@ -303,7 +303,6 @@ const CippSchedulerForm = (props) => {
             key={idx}
           >
             <Grid
-              item
               size={{ md: param.Type === "System.Collections.Hashtable" ? 12 : gridSize, xs: 12 }}
             >
               {param.Type === "System.Boolean" ||
diff --git a/src/components/CippWizard/CippIntunePolicy.jsx b/src/components/CippWizard/CippIntunePolicy.jsx
index 2e1e5797c2f0..8d2197dc2b13 100644
--- a/src/components/CippWizard/CippIntunePolicy.jsx
+++ b/src/components/CippWizard/CippIntunePolicy.jsx
@@ -103,7 +103,7 @@ export const CippIntunePolicy = (props) => {
               return null;
             }
             return uniquePlaceholders.map((placeholder) => (
-              <Grid key={placeholder} item size={{ xs: 6 }}>
+              <Grid key={placeholder} size={{ xs: 6 }}>
                 {selectedTenants.map((tenant, idx) => (
                   <CippFormComponent
                     key={`${tenant.value}-${placeholder}-${idx}`}
diff --git a/src/components/CippWizard/CippWizardAutopilotImport.jsx b/src/components/CippWizard/CippWizardAutopilotImport.jsx
index 2c3384686ada..fc7876e34698 100644
--- a/src/components/CippWizard/CippWizardAutopilotImport.jsx
+++ b/src/components/CippWizard/CippWizardAutopilotImport.jsx
@@ -1,10 +1,7 @@
 import {
   Button,
-  Grid,
   Link,
   Stack,
-  Card,
-  CardContent,
   Box,
   Typography,
   Dialog,
@@ -14,13 +11,12 @@ import {
   TextField,
   Alert,
 } from "@mui/material";
+import { Grid } from "@mui/system";
 import { CippWizardStepButtons } from "./CippWizardStepButtons";
-import CippFormComponent from "../CippComponents/CippFormComponent";
 import { CippDataTable } from "../CippTable/CippDataTable";
 import { useWatch } from "react-hook-form";
 import { Delete, FileDownload, Upload, Add } from "@mui/icons-material";
 import { useEffect, useState } from "react";
-import { getCippTranslation } from "../../utils/get-cipp-translation";
 import React from "react";
 
 export const CippWizardAutopilotImport = (props) => {
diff --git a/src/pages/email/spamfilter/list-quarantine-policies/add.jsx b/src/pages/email/spamfilter/list-quarantine-policies/add.jsx
index 3af31bce1e9e..bd2e36fc3764 100644
--- a/src/pages/email/spamfilter/list-quarantine-policies/add.jsx
+++ b/src/pages/email/spamfilter/list-quarantine-policies/add.jsx
@@ -1,5 +1,6 @@
-import React, { useEffect } from "react";
-import { Grid, Divider } from "@mui/material";
+import { useEffect } from "react";
+import { Divider } from "@mui/material";
+import { Grid } from "@mui/system";
 import { useForm, useWatch } from "react-hook-form";
 import { Layout as DashboardLayout } from "/src/layouts/index.js";
 import CippFormPage from "/src/components/CippFormPages/CippFormPage";
diff --git a/src/pages/tenant/standards/bpa-report/builder.js b/src/pages/tenant/standards/bpa-report/builder.js
index 4a0d2f36b62f..976d79b63c53 100644
--- a/src/pages/tenant/standards/bpa-report/builder.js
+++ b/src/pages/tenant/standards/bpa-report/builder.js
@@ -255,7 +255,6 @@ const Page = () => {
           <Grid container spacing={2}>
             {blockCards.map((block, index) => (
               <Grid
-                item
                 size={{ md: layoutMode === "Table" ? 12 : 4, sm: layoutMode === "Table" ? 12 : 6, xs: 10 }}
                 key={block.id}
               >
diff --git a/src/pages/tenant/standards/bpa-report/view.js b/src/pages/tenant/standards/bpa-report/view.js
index 361e14780442..0af8c51a7011 100644
--- a/src/pages/tenant/standards/bpa-report/view.js
+++ b/src/pages/tenant/standards/bpa-report/view.js
@@ -157,7 +157,6 @@ const Page = () => {
               <>
                 {blockCards.map((block, index) => (
                   <Grid
-                    item
                     size={{ md: layoutMode === "Table" ? 12 : 4, sm: layoutMode === "Table" ? 12 : 6, xs: 10 }}
                     key={block.name}
                   >
diff --git a/src/pages/tenant/standards/list-standards/index.js b/src/pages/tenant/standards/list-standards/index.js
index dcaa36640959..0c479d6fa838 100644
--- a/src/pages/tenant/standards/list-standards/index.js
+++ b/src/pages/tenant/standards/list-standards/index.js
@@ -130,7 +130,7 @@ const Page = () => {
     <div>
       {oldStandards.isSuccess && oldStandards.data.length !== 0 && (
         <Grid container spacing={2}>
-          <Grid container item spacing={2}>
+          <Grid container spacing={2}>
             <Alert
               severity="warning"
               style={{ display: "flex", alignItems: "center", width: "100%" }}
diff --git a/src/pages/tools/breachlookup/index.js b/src/pages/tools/breachlookup/index.js
index 89936574fe0d..53d9e62c071f 100644
--- a/src/pages/tools/breachlookup/index.js
+++ b/src/pages/tools/breachlookup/index.js
@@ -52,7 +52,7 @@ const Page = () => {
     >
       <Container maxWidth={false}>
         <Grid container spacing={3}>
-          <Grid container item spacing={4}>
+          <Grid container spacing={4}>
             <Grid spacing={4} size={{ xs: 12 }}>
               <Alert severity="info">
                 <Typography variant="body1" color="textPrimary">
@@ -120,7 +120,7 @@ const Page = () => {
                 </Grid>
               )}
               {getGeoIP.data?.map((breach, index) => (
-                <Grid key={index} spacing={2} item size={{ xs: 3 }}>
+                <Grid key={index} spacing={2} size={{ xs: 3 }}>
                   <CippButtonCard
                     cardSx={{ display: "flex", flexDirection: "column", height: "100%" }}
                     title={<>{breach.Title}</>}
diff --git a/src/sections/dashboard/components/stats/stats-2.js b/src/sections/dashboard/components/stats/stats-2.js
index f58463294fb1..273abb3e1522 100644
--- a/src/sections/dashboard/components/stats/stats-2.js
+++ b/src/sections/dashboard/components/stats/stats-2.js
@@ -1,4 +1,5 @@
-import { Box, Typography, Unstable_Grid2 as Grid } from '@mui/material';
+import { Box, Typography } from '@mui/material';
+import { Grid } from "@mui/system";
 
 const data = [
   {
diff --git a/src/sections/dashboard/invoices/invoices-stats.js b/src/sections/dashboard/invoices/invoices-stats.js
index 78521a117f2f..895c96d6d883 100644
--- a/src/sections/dashboard/invoices/invoices-stats.js
+++ b/src/sections/dashboard/invoices/invoices-stats.js
@@ -1,6 +1,7 @@
 import PropTypes from 'prop-types';
 import numeral from 'numeral';
-import { Box, Card, CardContent, Stack, Typography, Unstable_Grid2 as Grid } from '@mui/material';
+import { Box, Card, CardContent, Stack, Typography } from '@mui/material';
+import { Grid } from "@mui/system";
 import { alpha, useTheme } from '@mui/material/styles';
 import { Chart } from '../../../components/chart';
 
diff --git a/src/sections/dashboard/products/products-stats.js b/src/sections/dashboard/products/products-stats.js
index 8a8b415d1fa5..6e64f9ba23a5 100644
--- a/src/sections/dashboard/products/products-stats.js
+++ b/src/sections/dashboard/products/products-stats.js
@@ -2,7 +2,8 @@ import CheckCircleIcon from "@heroicons/react/24/outline/CheckCircleIcon";
 import CurrencyDollarIcon from "@heroicons/react/24/outline/CurrencyDollarIcon";
 import ShoppingCartIcon from "@heroicons/react/24/outline/ShoppingCartIcon";
 import XCircleIcon from "@heroicons/react/24/outline/XCircleIcon";
-import { Card, Stack, Typography, Unstable_Grid2 as Grid } from "@mui/material";
+import { Card, Stack, Typography } from "@mui/material";
+import { Grid } from "@mui/system";
 
 const stats = [
   {