Merge pull request #4372 from Zacgoose/more-grid-fixes

Remove last of grid and unstable grid 2 imports

Author: KelvinTegelaar

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,

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={{

src/components/CippFormPages/CippSchedulerForm.jsx

@@ -309,7 +309,6 @@ const CippSchedulerForm = (props) => {
             key={idx}
           >
             <Grid
-              item
               size={{ md: param.Type === "System.Collections.Hashtable" ? 12 : gridSize, xs: 12 }}
             >
               {param.Type === "System.Boolean" ||

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}`}

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) => {

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";

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}
               >

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}
                   >

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%" }}

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}</>}