diff --git a/src/api/ApiCall.jsx b/src/api/ApiCall.jsx index 35554764168e..2081c91b2a11 100644 --- a/src/api/ApiCall.jsx +++ b/src/api/ApiCall.jsx @@ -1,5 +1,4 @@ import { - keepPreviousData, useInfiniteQuery, useMutation, useQuery, diff --git a/src/components/CSVReader.jsx b/src/components/CSVReader.jsx index d34d9ee79007..194ea31d9c40 100644 --- a/src/components/CSVReader.jsx +++ b/src/components/CSVReader.jsx @@ -1,4 +1,4 @@ -import React, { useState } from "react"; +import { useState } from "react"; import { useCSVReader, lightenDarkenColor, formatFileSize } from "react-papaparse"; const GREY = "#CCC"; diff --git a/src/components/CippCards/CippBannerListCard.jsx b/src/components/CippCards/CippBannerListCard.jsx index 8a123e5064b2..cc7c0639aa83 100644 --- a/src/components/CippCards/CippBannerListCard.jsx +++ b/src/components/CippCards/CippBannerListCard.jsx @@ -204,7 +204,6 @@ CippBannerListCard.propTypes = { actionButton: PropTypes.element, propertyItems: PropTypes.array, table: PropTypes.object, - actionButton: PropTypes.element, isFetching: PropTypes.bool, children: PropTypes.node, cardLabelBoxActions: PropTypes.element, diff --git a/src/components/CippCards/CippDomainCards.jsx b/src/components/CippCards/CippDomainCards.jsx index 3aa81e3019fe..b6d8adb58bf4 100644 --- a/src/components/CippCards/CippDomainCards.jsx +++ b/src/components/CippCards/CippDomainCards.jsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from "react"; +import { useEffect, useState } from "react"; import { Button, Collapse, @@ -477,7 +477,7 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false }) waiting: !!domain && enableHttps, }); - // Adjust grid item size based on fullwidth prop + // Adjust Grid size based on fullwidth prop const gridItemSize = fullwidth ? 12 : 4; return ( diff --git a/src/components/CippCards/CippInfoBar.jsx b/src/components/CippCards/CippInfoBar.jsx index c8889e498c4e..0bfb8c5e62e1 100644 --- a/src/components/CippCards/CippInfoBar.jsx +++ b/src/components/CippCards/CippInfoBar.jsx @@ -95,7 +95,7 @@ export const CippInfoBar = ({ data, isFetching }) => { }} > - + {item?.offcanvas?.propertyItems?.length > 0 && ( { const { diff --git a/src/components/CippCards/CippRemediationCard.jsx b/src/components/CippCards/CippRemediationCard.jsx index d18739c033ca..d864719f80e1 100644 --- a/src/components/CippCards/CippRemediationCard.jsx +++ b/src/components/CippCards/CippRemediationCard.jsx @@ -1,4 +1,3 @@ -import React from "react"; import { Button, Typography, List, ListItem, SvgIcon } from "@mui/material"; import CippButtonCard from "./CippButtonCard"; // Adjust the import path as needed import { CippApiDialog } from "../CippComponents/CippApiDialog"; diff --git a/src/components/CippCards/CippUniversalSearch.jsx b/src/components/CippCards/CippUniversalSearch.jsx index ccba59600fc0..e05df3ee8d14 100644 --- a/src/components/CippCards/CippUniversalSearch.jsx +++ b/src/components/CippCards/CippUniversalSearch.jsx @@ -97,7 +97,7 @@ const Results = ({ items = [], searchValue }) => { {displayedResults.map((item, key) => ( - + ))} diff --git a/src/components/CippComponents/AppApprovalTemplateForm.jsx b/src/components/CippComponents/AppApprovalTemplateForm.jsx index 4efe18a1ecbb..7ddedee2c19e 100644 --- a/src/components/CippComponents/AppApprovalTemplateForm.jsx +++ b/src/components/CippComponents/AppApprovalTemplateForm.jsx @@ -1,6 +1,5 @@ -import React, { useState, useEffect } from "react"; +import { useState, useEffect } from "react"; import { Alert, Skeleton, Stack, Typography, Button, Box } from "@mui/material"; -import { ApiGetCall } from "/src/api/ApiCall"; import { CippFormComponent } from "./CippFormComponent"; import { CippApiResults } from "./CippApiResults"; import { Grid } from "@mui/system"; diff --git a/src/components/CippComponents/BPASyncDialog.jsx b/src/components/CippComponents/BPASyncDialog.jsx index 014e033747e6..43a16450416a 100644 --- a/src/components/CippComponents/BPASyncDialog.jsx +++ b/src/components/CippComponents/BPASyncDialog.jsx @@ -1,14 +1,12 @@ -import React, { useState } from "react"; +import { useState } from "react"; import { Dialog, DialogContent, DialogTitle, Button, DialogActions, - Alert, - CircularProgress, } from "@mui/material"; -import { CheckCircle, Error, Sync } from "@mui/icons-material"; +import { Sync } from "@mui/icons-material"; import { useForm, FormProvider } from "react-hook-form"; import { CippFormTenantSelector } from "./CippFormTenantSelector"; import { ApiPostCall } from "/src/api/ApiCall"; diff --git a/src/components/CippComponents/CIPPDeviceCodeButton.js b/src/components/CippComponents/CIPPDeviceCodeButton.js index e262b69c7912..16711f8d1332 100644 --- a/src/components/CippComponents/CIPPDeviceCodeButton.js +++ b/src/components/CippComponents/CIPPDeviceCodeButton.js @@ -2,12 +2,11 @@ import { useState, useEffect } from "react"; import { Alert, Button, - Stack, Typography, CircularProgress, Box, } from "@mui/material"; -import { ApiGetCall, ApiPostCall } from "../../api/ApiCall"; +import { ApiGetCall } from "../../api/ApiCall"; /** * CIPPDeviceCodeButton - A button component for Microsoft 365 OAuth authentication using device code flow diff --git a/src/components/CippComponents/CippApiResults.jsx b/src/components/CippComponents/CippApiResults.jsx index 3a9dd724b6f1..bc0d12572885 100644 --- a/src/components/CippComponents/CippApiResults.jsx +++ b/src/components/CippComponents/CippApiResults.jsx @@ -20,7 +20,6 @@ import React from "react"; import { CippTableDialog } from "./CippTableDialog"; import { EyeIcon } from "@heroicons/react/24/outline"; import { useDialog } from "../../hooks/use-dialog"; -import { useRouter } from "next/router"; const extractAllResults = (data) => { const results = []; diff --git a/src/components/CippComponents/CippAppPermissionBuilder.jsx b/src/components/CippComponents/CippAppPermissionBuilder.jsx index 8de50a2f1a1c..011b27aa7f6f 100644 --- a/src/components/CippComponents/CippAppPermissionBuilder.jsx +++ b/src/components/CippComponents/CippAppPermissionBuilder.jsx @@ -578,7 +578,7 @@ const CippAppPermissionBuilder = ({ <> - + - +
@@ -640,7 +640,7 @@ const CippAppPermissionBuilder = ({ )} - + - +
@@ -748,7 +748,7 @@ const CippAppPermissionBuilder = ({ - + - + Import Permission Manifest @@ -852,7 +852,7 @@ const CippAppPermissionBuilder = ({ - + - + }> Manifest is valid. Click Import to apply the permissions. - +
)} - + {emlContent.date && isValidDate(emlContent.date) @@ -436,7 +436,7 @@ export const CippMessageViewer = ({ emailSource }) => { {emlContent.attachments && emlContent.attachments.length > 0 && ( - + {emlContent?.attachments?.map((attachment, index) => ( @@ -484,7 +484,7 @@ export const CippMessageViewer = ({ emailSource }) => { {(emlContent?.text || emlContent?.html) && ( - + {messageHtml ? ( {emailStyle} diff --git a/src/components/CippComponents/CippNotificationForm.jsx b/src/components/CippComponents/CippNotificationForm.jsx index 0eef55732c76..bd7a5ce3887c 100644 --- a/src/components/CippComponents/CippNotificationForm.jsx +++ b/src/components/CippComponents/CippNotificationForm.jsx @@ -74,7 +74,7 @@ export const CippNotificationForm = ({ <> - + - + - + - + - + {showTestButton && ( - + diff --git a/src/components/CippComponents/CippOffCanvas.jsx b/src/components/CippComponents/CippOffCanvas.jsx index 6031f6497a27..caa30e6b3036 100644 --- a/src/components/CippComponents/CippOffCanvas.jsx +++ b/src/components/CippComponents/CippOffCanvas.jsx @@ -95,7 +95,7 @@ export const CippOffCanvas = (props) => { sx={{ overflowY: "auto", maxHeight: "100%", display: "flex", flexDirection: "column" }} > - + {extendedInfo.length > 0 && ( { /> )} - + {typeof children === "function" ? children(extendedData) : children} diff --git a/src/components/CippComponents/CippPermissionPreview.jsx b/src/components/CippComponents/CippPermissionPreview.jsx index 9f2afeb69e06..6347fff47c6e 100644 --- a/src/components/CippComponents/CippPermissionPreview.jsx +++ b/src/components/CippComponents/CippPermissionPreview.jsx @@ -1,4 +1,4 @@ -import React, { useState, useEffect, useCallback } from "react"; +import { useState, useEffect, useCallback } from "react"; import { Alert, Skeleton, @@ -9,13 +9,11 @@ import { List, ListItem, ListItemText, - Divider, Tab, Tabs, Chip, SvgIcon, } from "@mui/material"; -import { ApiGetCall } from "/src/api/ApiCall"; import { ShieldCheckIcon } from "@heroicons/react/24/outline"; import { CippCardTabPanel } from "./CippCardTabPanel"; diff --git a/src/components/CippComponents/CippTablePage.jsx b/src/components/CippComponents/CippTablePage.jsx index eb75f6cc1ad1..5ab4223b933d 100644 --- a/src/components/CippComponents/CippTablePage.jsx +++ b/src/components/CippComponents/CippTablePage.jsx @@ -1,6 +1,5 @@ import { Alert, Card, Divider } from "@mui/material"; import { Box, Container, Stack } from "@mui/system"; -import Head from "next/head"; import { CippDataTable } from "../CippTable/CippDataTable"; import { useSettings } from "../../hooks/use-settings"; import { CippHead } from "./CippHead"; diff --git a/src/components/CippFormPages/CippAddEditUser.jsx b/src/components/CippFormPages/CippAddEditUser.jsx index c71a808030f1..e1b42686c2ee 100644 --- a/src/components/CippFormPages/CippAddEditUser.jsx +++ b/src/components/CippFormPages/CippAddEditUser.jsx @@ -9,7 +9,7 @@ import { Grid } from "@mui/system"; import { ApiGetCall } from "../../api/ApiCall"; import { useSettings } from "../../hooks/use-settings"; import { useWatch } from "react-hook-form"; -import { use, useEffect, useMemo } from "react"; +import { useEffect, useMemo } from "react"; import { useRouter } from "next/router"; const CippAddEditUser = (props) => { @@ -64,7 +64,7 @@ const CippAddEditUser = (props) => { return ( - + { formControl={formControl} /> - + { formControl={formControl} /> - + { formControl={formControl} /> - + { formControl={formControl} /> - + - + + + + + Settings - + { compareType="is" compareValue={true} > - + { - + { formControl={formControl} /> - + { formControl={formControl} /> - + {integrationSettings?.data?.Sherweb?.Enabled === true && ( @@ -171,7 +184,7 @@ const CippAddEditUser = (props) => { compareValue="(0 available)" labelCompare={true} > - + { compareType="is" compareValue={true} > - + This will Purchase a new Sherweb License for the user, according to the terms and conditions with Sherweb. When the license becomes available, CIPP will assign the license to this user. - + { )} - + { formControl={formControl} /> - + { formControl={formControl} /> - + { formControl={formControl} /> - + { formControl={formControl} /> - + { formControl={formControl} /> - + { formControl={formControl} /> - + { formControl={formControl} /> - + { formControl={formControl} /> - + { formControl={formControl} /> - + { formControl={formControl} /> - + { {userSettingsDefaults?.userAttributes ?.filter((attribute) => attribute.value !== "sponsor") .map((attribute, idx) => ( - + { ))} {/* Set Manager */} - + { /> {userSettingsDefaults?.userAttributes?.some((attribute) => attribute.value === "sponsor") && ( - + { /> )} - + { /> {formType === "edit" && ( - + { )} {formType === "edit" && ( - + { )} {/* Schedule User Creation */} {formType === "add" && ( - + { compareType="is" compareValue={true} > - + { formControl={formControl} /> - + { return ( - + { fullWidth /> - + { fullWidth /> - + { }} /> - + { /> - + { /> - + { select={"id,userPrincipalName,displayName"} /> - + { compareType="is" compareValue="distribution" > - + { /> - {["dynamic", "dynamicDistribution", "m365"].map((groupType) => ( - - - - ))} + + + + + ); }; diff --git a/src/components/CippFormPages/CippAddGroupTemplateForm.jsx b/src/components/CippFormPages/CippAddGroupTemplateForm.jsx index 09f208a8e896..7f52b810b81c 100644 --- a/src/components/CippFormPages/CippAddGroupTemplateForm.jsx +++ b/src/components/CippFormPages/CippAddGroupTemplateForm.jsx @@ -1,4 +1,4 @@ -import React, { useEffect } from "react"; +import { useEffect } from "react"; import "@mui/material"; import { Grid } from "@mui/system"; import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; @@ -18,7 +18,7 @@ const CippAddGroupTemplateForm = (props) => { {/* Hidden field to store the template GUID when editing */} - + { fullWidth /> - + { fullWidth /> - + { /> - + { compareType="is" compareValue="distribution" > - + { compareType="contains" compareValue="dynamic" > - + { return ( - + @@ -178,7 +178,7 @@ const CippCustomDataMappingForm = ({ formControl }) => { - + {selectedExtensionSyncDataset && ( { {layout.map((columns, rowIndex) => ( {Array.from({ length: columns }).map((_, columnIndex) => ( - + ))} diff --git a/src/components/CippFormPages/CippInviteGuest.jsx b/src/components/CippFormPages/CippInviteGuest.jsx index 6e3f597fcbfb..7d62d071da0b 100644 --- a/src/components/CippFormPages/CippInviteGuest.jsx +++ b/src/components/CippFormPages/CippInviteGuest.jsx @@ -6,7 +6,7 @@ const CippInviteUser = (props) => { return ( - + { formControl={formControl} /> - + { formControl={formControl} /> - + { formControl={formControl} /> - + { {(scheduledTaskList.isFetching || tenantList.isLoading || commands.isLoading) && ( )} - + { /> - + { /> - + { }} /> - + { }} /> - + { /> {selectedCommand?.addedFields?.Synopsis && ( - + PowerShell Command: @@ -234,11 +233,11 @@ const CippSchedulerForm = (props) => { compareType="isNot" compareValue={true} formControl={formControl} + key={idx} > {param.Type === "System.Boolean" || param.Type === "System.Management.Automation.SwitchParameter" ? ( @@ -279,10 +278,10 @@ const CippSchedulerForm = (props) => { ))} - + - + { compareValue={true} formControl={formControl} > - + { /> - + { ]} /> - + @@ -108,7 +108,7 @@ export const CippWizardCSVImport = (props) => { {!manualFields && ( <> - + @@ -119,7 +119,7 @@ export const CippWizardCSVImport = (props) => { {fields.map((field) => ( - + { ) : ( - + {firstHalf.map(([key, value]) => ( { ))} - + {secondHalf.map(([key, value]) => ( { return ( - + { }} /> - + { validators={{ required: "Please select a group type" }} /> - + { validators={{ required: "Group display name is required" }} /> - + { formControl={formControl} /> - + { formControl={formControl} /> - + { /> - + + + + + + { return ( - + @@ -133,7 +133,7 @@ export const CippWizardOffboarding = (props) => { - + @@ -286,7 +286,7 @@ export const CippWizardOffboarding = (props) => { - + { compareType="is" compareValue={true} > - + Scheduled Offboarding Date { /> - + Send results to: { return ( {fields.map((field, index) => ( - + { return ( diff --git a/src/components/query-field.js b/src/components/query-field.js index f1078830ee60..dfeb6f37e1a4 100644 --- a/src/components/query-field.js +++ b/src/components/query-field.js @@ -29,7 +29,6 @@ export const QueryField = (props) => { inputRef.current.focus(); } }, - // eslint-disable-next-line react-hooks/exhaustive-deps [disabled]); const handleChange = useCallback((event) => { diff --git a/src/components/resource-loading.js b/src/components/resource-loading.js index 743a53baea03..d80a6b09452a 100644 --- a/src/components/resource-loading.js +++ b/src/components/resource-loading.js @@ -1,5 +1,5 @@ import PropTypes from "prop-types"; -import { CircularProgress, SvgIcon, Typography } from "@mui/material"; +import { CircularProgress, Typography } from "@mui/material"; import { styled } from "@mui/material/styles"; const ResourceLoadingRoot = styled("div")(({ theme }) => ({ diff --git a/src/components/toaster.js b/src/components/toaster.js index aa26b5c462c6..933adf625de1 100644 --- a/src/components/toaster.js +++ b/src/components/toaster.js @@ -1,5 +1,5 @@ import { CloseSharp } from "@mui/icons-material"; -import { Alert, Button, IconButton, Snackbar } from "@mui/material"; +import { Alert, IconButton, Snackbar } from "@mui/material"; import { useSelector } from "react-redux"; import { useDispatch } from "react-redux"; import { closeToast } from "../store/toasts"; diff --git a/src/hooks/use-page-view.js b/src/hooks/use-page-view.js index c4365337c92a..fe5923c47679 100644 --- a/src/hooks/use-page-view.js +++ b/src/hooks/use-page-view.js @@ -1,3 +1 @@ -import { useEffect } from "react"; - export const usePageView = () => {}; diff --git a/src/layouts/TabbedLayout.jsx b/src/layouts/TabbedLayout.jsx index 1f2b77713237..9594443127bc 100644 --- a/src/layouts/TabbedLayout.jsx +++ b/src/layouts/TabbedLayout.jsx @@ -1,5 +1,5 @@ import { usePathname, useRouter } from "next/navigation"; -import { Box, Container, Divider, Stack, Tab, Tabs, Typography } from "@mui/material"; +import { Box, Divider, Stack, Tab, Tabs } from "@mui/material"; export const TabbedLayout = (props) => { const { tabOptions, children } = props; diff --git a/src/layouts/account-popover.js b/src/layouts/account-popover.js index eac39587c104..cc0da2049060 100644 --- a/src/layouts/account-popover.js +++ b/src/layouts/account-popover.js @@ -16,7 +16,6 @@ import { ListItemIcon, ListItemText, Popover, - Skeleton, Stack, SvgIcon, Typography, diff --git a/src/layouts/config.js b/src/layouts/config.js index 466a7d98226e..5e9f0578175e 100644 --- a/src/layouts/config.js +++ b/src/layouts/config.js @@ -1,12 +1,9 @@ import { BuildingOfficeIcon, HomeIcon, UsersIcon, WrenchIcon } from "@heroicons/react/24/outline"; import { - Cloud, CloudOutlined, - DeviceHub, HomeRepairService, Laptop, MailOutline, - Shield, ShieldOutlined, } from "@mui/icons-material"; import { SvgIcon } from "@mui/material"; diff --git a/src/layouts/footer.js b/src/layouts/footer.js index 07115518e388..d6bd01193b56 100644 --- a/src/layouts/footer.js +++ b/src/layouts/footer.js @@ -1,4 +1,4 @@ -import { Box, Container, Divider, Typography } from "@mui/material"; +import { Container } from "@mui/material"; export const Footer = () => { diff --git a/src/layouts/index.js b/src/layouts/index.js index 0b2f011034b1..0b06a329c3c4 100644 --- a/src/layouts/index.js +++ b/src/layouts/index.js @@ -15,7 +15,6 @@ import { CippImageCard } from "../components/CippCards/CippImageCard"; import Page from "../pages/onboardingv2"; import { useDialog } from "../hooks/use-dialog"; import { nativeMenuItems } from "/src/layouts/config"; -import { keepPreviousData } from "@tanstack/react-query"; const SIDE_NAV_WIDTH = 270; const SIDE_NAV_PINNED_WIDTH = 50; @@ -35,7 +34,6 @@ const useMobileNav = () => { () => { handlePathnameChange(); }, - // eslint-disable-next-line react-hooks/exhaustive-deps [pathname] ); @@ -275,7 +273,7 @@ export const Layout = (props) => { - + ( alignItems="center" // Center vertically sx={{ height: "100%" }} // Ensure the container takes full height > - + ( alignItems="center" // Center vertically sx={{ height: "100%" }} // Ensure the container takes full height > - + { alignItems="center" sx={{ height: "100%" }} > - + { @@ -96,7 +95,7 @@ const ApiOfflinePage = () => { alignItems="center" // Center vertically sx={{ height: "100%" }} // Ensure the container takes full height > - + ( alignItems="center" // Center vertically sx={{ height: "100%" }} // Ensure the container takes full height > - + { {/* Tenant Filter */} - + {/* Compliance Filter */} - + { /> {/* AsApp Filter */} - + { /> {/* Submit Button */} - + diff --git a/src/pages/cipp/advanced/table-maintenance.js b/src/pages/cipp/advanced/table-maintenance.js index d6cb9caf1a2b..d7bc058697ee 100644 --- a/src/pages/cipp/advanced/table-maintenance.js +++ b/src/pages/cipp/advanced/table-maintenance.js @@ -283,7 +283,7 @@ const Page = () => { that should only be used when directed by CyberDrain support. - + { } /> - + {selectedTable && ( diff --git a/src/pages/cipp/custom-data/directory-extensions/index.js b/src/pages/cipp/custom-data/directory-extensions/index.js index 42317151ffec..891342e97ce1 100644 --- a/src/pages/cipp/custom-data/directory-extensions/index.js +++ b/src/pages/cipp/custom-data/directory-extensions/index.js @@ -1,7 +1,7 @@ import { Layout as DashboardLayout } from "/src/layouts/index.js"; import { TabbedLayout } from "/src/layouts/TabbedLayout"; import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { Alert, Button, Link, SvgIcon, Typography } from "@mui/material"; +import { Alert, Button, Link, SvgIcon } from "@mui/material"; import { Add } from "@mui/icons-material"; import tabOptions from "../tabOptions"; import NextLink from "next/link"; diff --git a/src/pages/cipp/custom-data/mappings/edit.js b/src/pages/cipp/custom-data/mappings/edit.js index a8a3cfcbee85..10bce76f56f2 100644 --- a/src/pages/cipp/custom-data/mappings/edit.js +++ b/src/pages/cipp/custom-data/mappings/edit.js @@ -4,12 +4,9 @@ import { useRouter } from "next/router"; import { useEffect } from "react"; import { ApiPostCall, ApiGetCall } from "/src/api/ApiCall"; import { - Box, Button, Stack, CardContent, - Typography, - Divider, CardActions, Skeleton, } from "@mui/material"; diff --git a/src/pages/cipp/custom-data/mappings/index.js b/src/pages/cipp/custom-data/mappings/index.js index 8992accda6f0..7579685d1f62 100644 --- a/src/pages/cipp/custom-data/mappings/index.js +++ b/src/pages/cipp/custom-data/mappings/index.js @@ -1,7 +1,7 @@ import { Layout as DashboardLayout } from "/src/layouts/index.js"; import { TabbedLayout } from "/src/layouts/TabbedLayout"; import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { Alert, Button, Link, SvgIcon, Typography } from "@mui/material"; +import { Alert, Button, SvgIcon, Typography } from "@mui/material"; import { Add } from "@mui/icons-material"; import tabOptions from "../tabOptions"; import NextLink from "next/link"; diff --git a/src/pages/cipp/custom-data/schema-extensions/index.js b/src/pages/cipp/custom-data/schema-extensions/index.js index 07b185e5ce21..f7b5729187ba 100644 --- a/src/pages/cipp/custom-data/schema-extensions/index.js +++ b/src/pages/cipp/custom-data/schema-extensions/index.js @@ -2,7 +2,7 @@ import { Layout as DashboardLayout } from "/src/layouts/index.js"; import { TabbedLayout } from "/src/layouts/TabbedLayout"; import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; import { Alert, Button, Link, SvgIcon, Typography } from "@mui/material"; -import { Add, Block, CheckCircleOutline, Sync } from "@mui/icons-material"; +import { Add, Block, CheckCircleOutline } from "@mui/icons-material"; import tabOptions from "../tabOptions"; import { TrashIcon } from "@heroicons/react/24/outline"; import NextLink from "next/link"; diff --git a/src/pages/cipp/integrations/configure.js b/src/pages/cipp/integrations/configure.js index 54ed857b3443..3702ae108926 100644 --- a/src/pages/cipp/integrations/configure.js +++ b/src/pages/cipp/integrations/configure.js @@ -193,13 +193,12 @@ const Page = () => { {extension?.links && ( <> {extension.links.map((link, index) => ( - + diff --git a/src/pages/email/transport/list-connectors/add.jsx b/src/pages/email/transport/list-connectors/add.jsx index 5bb832e17d3a..233101bf3e09 100644 --- a/src/pages/email/transport/list-connectors/add.jsx +++ b/src/pages/email/transport/list-connectors/add.jsx @@ -34,7 +34,7 @@ const AddPolicy = () => { postUrl="/api/AddExConnector" > - + { {/* TemplateList */} - + { - + { postUrl="/api/AddTransportRule" > - + { {/* TemplateList */} - + { - + { }} > - + { {/* Tenant Selector */} - + { compareType="is" compareValue="mspApp" > - + { validators={{ required: "Please select an MSP Tool" }} /> - + { compareType="is" compareValue="datto" > - + { /> {selectedTenants?.map((tenant, index) => ( - + { compareValue="syncro" > {selectedTenants?.map((tenant, index) => ( - + { compareType="is" compareValue="huntress" > - + { /> {selectedTenants?.map((tenant, index) => ( - + { compareType="is" compareValue="automate" > - + { /> {selectedTenants?.map((tenant, index) => ( - + { ))} {selectedTenants?.map((tenant, index) => ( - + { compareValue="cwcommand" > {selectedTenants?.map((tenant, index) => ( - + { {/* Assign To Options */} - + { compareType="is" compareValue="customGroup" > - + { compareType="is" compareValue="StoreApp" > - + { formControl={formControl} /> - + - + { isFetching={winGetSearchResults.isLoading} /> - + { validators={{ required: "Package Identifier is required" }} /> - + { validators={{ required: "Application Name is required" }} /> - + { {/* Install Options */} - + { {/* Assign To Options */} - + { compareType="is" compareValue="customGroup" > - + { compareType="is" compareValue="chocolateyApp" > - + { formControl={formControl} /> - + - + { /> - + { validators={{ required: "Package Name is required" }} /> - + { validators={{ required: "Application Name is required" }} /> - + { formControl={formControl} /> - + { {/* Install Options */} - + { {/* Assign To Options */} - + { compareType="is" compareValue="customGroup" > - + { > {/* Office App Fields */} - + { formControl={formControl} /> - + { validators={{ required: "Please select an update channel" }} /> - + { validators={{ required: "Please select at least one language" }} /> - + { formControl={formControl} /> - + { defaultValue={true} /> - + { defaultValue={true} /> - + { {/* Assign To Options */} - + { diff --git a/src/pages/endpoint/autopilot/add-status-page/index.js b/src/pages/endpoint/autopilot/add-status-page/index.js index 460c7f68f3de..4d109115ce94 100644 --- a/src/pages/endpoint/autopilot/add-status-page/index.js +++ b/src/pages/endpoint/autopilot/add-status-page/index.js @@ -1,7 +1,6 @@ -import React from "react"; import { Divider } from "@mui/material"; import { Grid } from "@mui/system"; -import { useForm, useWatch } from "react-hook-form"; +import { useForm} from "react-hook-form"; import { Layout as DashboardLayout } from "/src/layouts/index.js"; import CippFormPage from "/src/components/CippFormPages/CippFormPage"; import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; @@ -34,7 +33,7 @@ const Page = () => { > {/* Tenant Selector */} - + { {/* Form Fields */} - + { /> - + { {/* Switches */} - + { const pageTitle = "Autopilot Devices"; diff --git a/src/pages/endpoint/autopilot/list-profiles/add.jsx b/src/pages/endpoint/autopilot/list-profiles/add.jsx index 26fd85204b24..1d6b4cd68a38 100644 --- a/src/pages/endpoint/autopilot/list-profiles/add.jsx +++ b/src/pages/endpoint/autopilot/list-profiles/add.jsx @@ -1,7 +1,6 @@ -import React from "react"; import { Divider } from "@mui/material"; import { Grid } from "@mui/system"; -import { useForm, useWatch } from "react-hook-form"; +import { useForm } from "react-hook-form"; import { Layout as DashboardLayout } from "/src/layouts/index.js"; import CippFormPage from "/src/components/CippFormPages/CippFormPage"; import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; @@ -39,7 +38,7 @@ const AutopilotProfileForm = () => { > {/* Tenant Selector */} - + { {/* Form Fields */} - + { /> - + { /> - + { /> - + { {/* Switches */} - + { - + Loading... #Todo: Make pretty, make it obey user settings for theme. diff --git a/src/pages/identity/administration/group-templates/index.js b/src/pages/identity/administration/group-templates/index.js index 64c58c81b0d0..b7dc1b5aa2a3 100644 --- a/src/pages/identity/administration/group-templates/index.js +++ b/src/pages/identity/administration/group-templates/index.js @@ -3,7 +3,6 @@ import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx" import { Layout as DashboardLayout } from "/src/layouts/index.js"; import { AddBox, RocketLaunch, Delete, GitHub, Edit } from "@mui/icons-material"; import Link from "next/link"; -import { CippCodeBlock } from "../../../../components/CippComponents/CippCodeBlock"; import { ApiGetCall } from "/src/api/ApiCall"; import { CippPropertyListCard } from "../../../../components/CippCards/CippPropertyListCard"; import { getCippTranslation } from "../../../../utils/get-cipp-translation"; diff --git a/src/pages/identity/administration/jit-admin/add.jsx b/src/pages/identity/administration/jit-admin/add.jsx index 3de0924ffc61..7bb042fb9dcf 100644 --- a/src/pages/identity/administration/jit-admin/add.jsx +++ b/src/pages/identity/administration/jit-admin/add.jsx @@ -22,7 +22,7 @@ const Page = () => { > - + { allTenants={false} /> - + { compareType="is" compareValue="create" > - + { required={true} /> - + { required={true} /> - + { required={true} /> - + { }} /> - + @@ -108,8 +108,8 @@ const Page = () => { compareType="is" compareValue="select" > - - + + { - + { }} /> - + { }} /> - + { }} /> - + { formControl={formControl} /> - + { }} /> - + { postUrl="/api/AddGuest" > - + diff --git a/src/pages/identity/administration/users/user/bec.jsx b/src/pages/identity/administration/users/user/bec.jsx index 632638a7987e..bc2059b55f80 100644 --- a/src/pages/identity/administration/users/user/bec.jsx +++ b/src/pages/identity/administration/users/user/bec.jsx @@ -1,9 +1,8 @@ -import React, { use, useEffect, useState } from "react"; +import { useEffect, useState } from "react"; import { Layout as DashboardLayout } from "/src/layouts/index.js"; import { useSettings } from "/src/hooks/use-settings"; import { useRouter } from "next/router"; import { ApiGetCall } from "/src/api/ApiCall"; -import CippFormSkeleton from "/src/components/CippFormPages/CippFormSkeleton"; import CalendarIcon from "@heroicons/react/24/outline/CalendarIcon"; import { CheckCircle, Download, Mail, Fingerprint, Launch } from "@mui/icons-material"; import { HeaderedTabbedLayout } from "../../../../../layouts/HeaderedTabbedLayout"; @@ -199,7 +198,7 @@ const Page = () => { > {/* Remediation Card */} - + { /> {/* Check 1 Card with Loading */} - + { > {/* Remediation Card */} - + { /> {/* All Steps */} - + { {becPollingCall.data.NewRules.map((rule) => ( - + ))} @@ -355,6 +354,7 @@ const Page = () => { {becPollingCall.data.NewUsers.map((user) => ( @@ -396,8 +396,9 @@ const Page = () => { becPollingCall.data.AddedApps.length > 0 && ( - {becPollingCall.data.AddedApps.map((app) => ( + {becPollingCall.data.AddedApps.map((app, index) => ( @@ -439,8 +440,9 @@ const Page = () => { becPollingCall.data.MailboxPermissionChanges.length > 0 && ( - {becPollingCall.data.MailboxPermissionChanges.map((permission) => ( + {becPollingCall.data.MailboxPermissionChanges.map((permission, index) => ( @@ -482,8 +484,9 @@ const Page = () => { becPollingCall.data.MFADevices.length > 0 && ( - {becPollingCall.data.MFADevices.map((permission) => ( + {becPollingCall.data.MFADevices.map((permission, index) => ( @@ -524,8 +527,9 @@ const Page = () => { becPollingCall.data.ChangedPasswords.length > 0 && ( - {becPollingCall.data.ChangedPasswords.map((permission) => ( + {becPollingCall.data.ChangedPasswords.map((permission, index) => ( diff --git a/src/pages/identity/administration/users/user/conditional-access.jsx b/src/pages/identity/administration/users/user/conditional-access.jsx index 64d2f3f82b0e..a879193b52e1 100644 --- a/src/pages/identity/administration/users/user/conditional-access.jsx +++ b/src/pages/identity/administration/users/user/conditional-access.jsx @@ -1,263 +1,263 @@ -import { useState } from "react"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { useSettings } from "/src/hooks/use-settings"; -import { useRouter } from "next/router"; -import CippFormSkeleton from "/src/components/CippFormPages/CippFormSkeleton"; -import CalendarIcon from "@heroicons/react/24/outline/CalendarIcon"; -import { Mail, Forward, Fingerprint, Launch } from "@mui/icons-material"; -import { HeaderedTabbedLayout } from "../../../../../layouts/HeaderedTabbedLayout"; -import tabOptions from "./tabOptions"; -import ReactTimeAgo from "react-time-ago"; -import { CippCopyToClipBoard } from "../../../../../components/CippComponents/CippCopyToClipboard"; -import { Box, Stack, Typography, Button, CircularProgress } from "@mui/material"; -import { Grid } from "@mui/system"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import countryList from "/src/data/countryList"; -import { CippDataTable } from "/src/components/CippTable/CippDataTable"; -import { useForm } from "react-hook-form"; -import CippButtonCard from "../../../../../components/CippCards/CippButtonCard"; -import { ApiGetCall, ApiPostCall } from "../../../../../api/ApiCall"; -import { CippApiResults } from "../../../../../components/CippComponents/CippApiResults"; - -const Page = () => { - const userSettingsDefaults = useSettings(); - const router = useRouter(); - const { userId } = router.query; - - const tenant = userSettingsDefaults.currentTenant; - const [formParams, setFormParams] = useState(false); - - const userRequest = ApiGetCall({ - url: `/api/ListUsers?UserId=${userId}&tenantFilter=${tenant}`, - queryKey: `ListUsers-${userId}`, - }); - - // Set the title and subtitle for the layout - const title = userRequest.isSuccess ? userRequest.data?.[0]?.displayName : "Loading..."; - - const subtitle = userRequest.isSuccess - ? [ - { - icon: , - text: , - }, - { - icon: , - text: , - }, - { - icon: , - text: ( - <> - Created: - - ), - }, - { - icon: , - text: ( - - ), - }, - ] - : []; - - // Initialize React Hook Form - const formControl = useForm(); - - const postRequest = ApiPostCall({ - url: "/api/ExecCACheck", - relatedQueryKeys: `ExecCACheck-${tenant}-${userId}-${JSON.stringify(formParams)}`, - }); - const onSubmit = (data) => { - //add userId and tenantFilter to the object - data.userId = {}; - data.userId["value"] = userId; - data.tenantFilter = tenant; - setFormParams(data); - postRequest.mutate({ - url: "/api/ExecCACheck", - data: data, - queryKey: `ExecCACheck-${tenant}-${userId}-${JSON.stringify(formParams)}`, - }); - }; - - return ( - - {userRequest.isLoading && } - {userRequest.isSuccess && ( - - - {/* Form Section */} - - - Test policies - - } - > - {/* Form Starts Here */} - - - Test your conditional access policies before putting them in production. The - returned results will show you if the user is allowed or denied access based on - the policy. - - - - {/* Mandatory Parameters */} - Mandatory Parameters: - `${option.displayName}`, - valueField: "id", - queryKey: `ServicePrincipals-${tenant}`, - data: { - Endpoint: "ServicePrincipals", - manualPagination: true, - $select: "id,displayName", - $count: true, - $orderby: "displayName", - $top: 999, - }, - }} - formControl={formControl} - /> - - {/* Optional Parameters */} - Optional Parameters: - - {/* Test from this country */} - ({ - value: Code, - label: Name, - }))} - formControl={formControl} - /> - - {/* Test from this IP */} - - - {/* Device Platform */} - - - {/* Client Application Type */} - - - {/* Sign-in risk level */} - - - {/* User risk level */} - - - - - - - - - - - - )} - - ); -}; - -Page.getLayout = (page) => {page}; - -export default Page; +import { useState } from "react"; +import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { useSettings } from "/src/hooks/use-settings"; +import { useRouter } from "next/router"; +import CippFormSkeleton from "/src/components/CippFormPages/CippFormSkeleton"; +import CalendarIcon from "@heroicons/react/24/outline/CalendarIcon"; +import { Mail, Fingerprint, Launch } from "@mui/icons-material"; +import { HeaderedTabbedLayout } from "../../../../../layouts/HeaderedTabbedLayout"; +import tabOptions from "./tabOptions"; +import ReactTimeAgo from "react-time-ago"; +import { CippCopyToClipBoard } from "../../../../../components/CippComponents/CippCopyToClipboard"; +import { Box, Stack, Typography, Button } from "@mui/material"; +import { Grid } from "@mui/system"; +import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import countryList from "/src/data/countryList"; +import { CippDataTable } from "/src/components/CippTable/CippDataTable"; +import { useForm } from "react-hook-form"; +import CippButtonCard from "../../../../../components/CippCards/CippButtonCard"; +import { ApiGetCall, ApiPostCall } from "../../../../../api/ApiCall"; +import { CippApiResults } from "../../../../../components/CippComponents/CippApiResults"; + +const Page = () => { + const userSettingsDefaults = useSettings(); + const router = useRouter(); + const { userId } = router.query; + + const tenant = userSettingsDefaults.currentTenant; + const [formParams, setFormParams] = useState(false); + + const userRequest = ApiGetCall({ + url: `/api/ListUsers?UserId=${userId}&tenantFilter=${tenant}`, + queryKey: `ListUsers-${userId}`, + }); + + // Set the title and subtitle for the layout + const title = userRequest.isSuccess ? userRequest.data?.[0]?.displayName : "Loading..."; + + const subtitle = userRequest.isSuccess + ? [ + { + icon: , + text: , + }, + { + icon: , + text: , + }, + { + icon: , + text: ( + <> + Created: + + ), + }, + { + icon: , + text: ( + + ), + }, + ] + : []; + + // Initialize React Hook Form + const formControl = useForm(); + + const postRequest = ApiPostCall({ + url: "/api/ExecCACheck", + relatedQueryKeys: `ExecCACheck-${tenant}-${userId}-${JSON.stringify(formParams)}`, + }); + const onSubmit = (data) => { + //add userId and tenantFilter to the object + data.userId = {}; + data.userId["value"] = userId; + data.tenantFilter = tenant; + setFormParams(data); + postRequest.mutate({ + url: "/api/ExecCACheck", + data: data, + queryKey: `ExecCACheck-${tenant}-${userId}-${JSON.stringify(formParams)}`, + }); + }; + + return ( + + {userRequest.isLoading && } + {userRequest.isSuccess && ( + + + {/* Form Section */} + + + Test policies + + } + > + {/* Form Starts Here */} +
+ + Test your conditional access policies before putting them in production. The + returned results will show you if the user is allowed or denied access based on + the policy. + + + + {/* Mandatory Parameters */} + Mandatory Parameters: + `${option.displayName}`, + valueField: "id", + queryKey: `ServicePrincipals-${tenant}`, + data: { + Endpoint: "ServicePrincipals", + manualPagination: true, + $select: "id,displayName", + $count: true, + $orderby: "displayName", + $top: 999, + }, + }} + formControl={formControl} + /> + + {/* Optional Parameters */} + Optional Parameters: + + {/* Test from this country */} + ({ + value: Code, + label: Name, + }))} + formControl={formControl} + /> + + {/* Test from this IP */} + + + {/* Device Platform */} + + + {/* Client Application Type */} + + + {/* Sign-in risk level */} + + + {/* User risk level */} + + + +
+ + + + + + + + )} + + ); +}; + +Page.getLayout = (page) => {page}; + +export default Page; diff --git a/src/pages/identity/administration/users/user/devices.jsx b/src/pages/identity/administration/users/user/devices.jsx index 41a1e73edd2d..2b0f4823415c 100644 --- a/src/pages/identity/administration/users/user/devices.jsx +++ b/src/pages/identity/administration/users/user/devices.jsx @@ -343,10 +343,10 @@ const Page = () => { }} > - + - + Latest Logon { > {userRequest?.data?.[0]?.Mailbox?.[0]?.error && ( - + @@ -753,7 +753,7 @@ const Page = () => { "Microsoft.Exchange.Configuration.Tasks.ManagementObjectNotFoundException" ) && ( <> - + { handleRefresh={() => userRequest.refetch()} /> - + { <> Location - + { ]} /> - + { }} > - + - + Latest Logon { const tableFilter = ( - + { fullWidth /> - + { fullWidth /> - + { /> {filterValues.failedLogonsOnly && ( - + { /> )} - + diff --git a/src/pages/index.js b/src/pages/index.js index d12ed2729f1b..8654479c09af 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -187,20 +187,20 @@ const Page = () => { - + - + - + - + { /> - + { /> - + { {/* Converted Domain Names to Property List */} - + { /> - + { /> - + { alignItems="center" // Center vertically sx={{ height: "100%" }} // Ensure the container takes full height > - + { - + { {/* Defender Setup Section */} - + { compareType="is" compareValue={true} > - + Defender Setup Defender and MEM Reporting - + - + { formControl={formControl} /> - + { {/* Defender Defaults Policy Section */} - + { compareType="is" compareValue={true} > - + Defender Defaults Policy Select Defender policies to deploy - + - + { formControl={formControl} /> - + { {/* Assign to Group */} - + Assign to Group { {/* ASR Section */} - + { compareType="is" compareValue={true} > - + ASR Rules Set Attack Surface Reduction Rules { /> - + - + { formControl={formControl} /> - + { {/* Assign to Group */} - + Assign to Group { backButtonTitle="Back to Sites" > - + - + { required /> - + { }} /> - + { }} /> - + { > {/* Display Name */} - + { {/* Description */} - + { - + { {/* Visibility */} - + {
{/* Request Status Filter */} - + { {/* Submit Button */} - + diff --git a/src/pages/tenant/administration/applications/permission-sets/add.js b/src/pages/tenant/administration/applications/permission-sets/add.js index 112272d3a51e..6f27122c5562 100644 --- a/src/pages/tenant/administration/applications/permission-sets/add.js +++ b/src/pages/tenant/administration/applications/permission-sets/add.js @@ -4,7 +4,7 @@ import { useForm } from "react-hook-form"; import { ApiGetCall, ApiPostCall } from "../../../../../api/ApiCall"; import CippAppPermissionBuilder from "/src/components/CippComponents/CippAppPermissionBuilder"; import CippPageCard from "/src/components/CippCards/CippPageCard"; -import { Alert, CardContent, Skeleton, Stack, Typography, Button, Box } from "@mui/material"; +import { Alert, CardContent, Stack, Typography, Button, Box } from "@mui/material"; import { CippFormComponent } from "/src/components/CippComponents/CippFormComponent"; import { useEffect, useState } from "react"; import { CopyAll } from "@mui/icons-material"; diff --git a/src/pages/tenant/administration/applications/templates/add.js b/src/pages/tenant/administration/applications/templates/add.js index 1fdbda3ca8c8..e927db0acdcf 100644 --- a/src/pages/tenant/administration/applications/templates/add.js +++ b/src/pages/tenant/administration/applications/templates/add.js @@ -4,7 +4,7 @@ import { useForm } from "react-hook-form"; import { ApiGetCall, ApiPostCall } from "../../../../../api/ApiCall"; import CippPageCard from "/src/components/CippCards/CippPageCard"; import { CardContent } from "@mui/material"; -import { useEffect, useState } from "react"; +import { useState } from "react"; import AppApprovalTemplateForm from "/src/components/CippComponents/AppApprovalTemplateForm"; const Page = () => { diff --git a/src/pages/tenant/administration/audit-logs/index.js b/src/pages/tenant/administration/audit-logs/index.js index fab698e09464..1c0809755fda 100644 --- a/src/pages/tenant/administration/audit-logs/index.js +++ b/src/pages/tenant/administration/audit-logs/index.js @@ -61,7 +61,7 @@ const Page = () => { {/* Date Filter Type */} - + { {/* Relative Time Filter */} {formControl.watch("dateFilter") === "relative" && ( <> - + - + { formControl={formControl} /> - + { {/* Start and End Date Filters */} {formControl.watch("dateFilter") === "startEnd" && ( <> - + { formControl={formControl} /> - + { )} {/* Submit Button */} - + diff --git a/src/pages/tenant/administration/audit-logs/log.js b/src/pages/tenant/administration/audit-logs/log.js index e88d096b39a8..162fdd2f6b37 100644 --- a/src/pages/tenant/administration/audit-logs/log.js +++ b/src/pages/tenant/administration/audit-logs/log.js @@ -1,7 +1,7 @@ import { useRouter } from "next/router"; import { useEffect, useState } from "react"; import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { ApiGetCall, ApiPostCall } from "/src/api/ApiCall"; +import { ApiGetCall } from "/src/api/ApiCall"; import { Box, Typography, @@ -152,7 +152,7 @@ const Page = () => { {logData.Title} - + { {lookupIp && ( - + @@ -186,7 +186,7 @@ const Page = () => { )} - + { > {currentTenant === "AllTenants" && ( - + { )} {currentTenant !== "AllTenants" && ( <> - + { ]} /> - + { {currentTenant !== "AllTenants" && secureScore.isSuccess && secureScore.translatedData.controlScores.map((secureScoreControl) => ( - + { > {currentTenant === "AllTenants" && ( - + { diff --git a/src/pages/tenant/administration/tenants/edit.js b/src/pages/tenant/administration/tenants/edit.js index ad43de7e7811..b764f37ff2da 100644 --- a/src/pages/tenant/administration/tenants/edit.js +++ b/src/pages/tenant/administration/tenants/edit.js @@ -72,7 +72,7 @@ const Page = () => { - + { isFetching={tenantDetails.isFetching} /> - + { - const router = useRouter(); const formControl = useForm({ mode: "onChange", }); @@ -36,7 +32,7 @@ const Page = () => { - + { > - + { const pageTitle = "Tenants"; diff --git a/src/pages/tenant/backup/backup-wizard/add.jsx b/src/pages/tenant/backup/backup-wizard/add.jsx index fa6a9dede065..cbceda81daf6 100644 --- a/src/pages/tenant/backup/backup-wizard/add.jsx +++ b/src/pages/tenant/backup/backup-wizard/add.jsx @@ -59,7 +59,7 @@ const CreateBackup = () => { Wizard. Backups run daily or on demand by clicking the backup now button. - + { /> - + Identity - + { formControl={formControl} /> - + - + Conditional Access - + { formControl={formControl} /> - {/* Optional: Add an empty Grid item to balance the layout */} - + {/* Optional: Add an empty Grid to balance the layout */} + - + Intune - + { formControl={formControl} /> - + { formControl={formControl} /> - + { formControl={formControl} /> - {/* Add an empty Grid item to fill the second column */} - + {/* Add an empty Grid to fill the second column */} + - + Email Security - + { formControl={formControl} /> - + { /> - + CIPP - + { formControl={formControl} /> - + { formControl={formControl} /> - {/* Add an empty Grid item to fill the second column */} - + {/* Add an empty Grid to fill the second column */} + ); diff --git a/src/pages/tenant/backup/backup-wizard/restore.jsx b/src/pages/tenant/backup/backup-wizard/restore.jsx index 566d1d6857b7..7f4a6414346a 100644 --- a/src/pages/tenant/backup/backup-wizard/restore.jsx +++ b/src/pages/tenant/backup/backup-wizard/restore.jsx @@ -1,7 +1,7 @@ -import React, { useState, useEffect } from "react"; +import { useState, useEffect } from "react"; import { Alert, Divider, Typography } from "@mui/material"; import { Grid } from "@mui/system"; -import { useForm, useWatch } from "react-hook-form"; +import { useForm } from "react-hook-form"; import { Layout as DashboardLayout } from "/src/layouts/index.js"; import CippFormPage from "/src/components/CippFormPages/CippFormPage"; import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; @@ -108,7 +108,7 @@ const RestoreBackupForm = () => { {/* Backup Selector */} - + { {/* Restore Settings */} - + Restore Settings {/* Identity */} - + Identity { {/* Conditional Access */} - + Conditional Access { {/* Intune */} - + Intune { {/* Email Security */} - + Email Security { {/* CIPP */} - + CIPP { {/* Overwrite Existing Entries */} - + { compareType="is" compareValue={true} > - + Warning: Overwriting existing entries will remove the current settings and replace them with the backup settings. If you have selected to restore @@ -247,10 +247,10 @@ const RestoreBackupForm = () => { {/* Send Results To */} - + Send Restore results to: - + { formControl={formControl} /> - + - + - + {/* Review and Confirm */} - + Review and Confirm Please review the selected options before submitting. - + Selected Tenant: {tenantFilter} - + Selected Backup: {formControl.watch("backup")?.label || "None selected"} - + Overwrite Existing Configuration: {formControl.watch("overwrite") ? "Yes" : "No"} - + Send Results To: diff --git a/src/pages/tenant/conditional/deploy-vacation/add.jsx b/src/pages/tenant/conditional/deploy-vacation/add.jsx index 2e3a1bad9665..5e1c23e9c808 100644 --- a/src/pages/tenant/conditional/deploy-vacation/add.jsx +++ b/src/pages/tenant/conditional/deploy-vacation/add.jsx @@ -46,12 +46,12 @@ const Page = () => { exclusions for a specific period of time. Select the CA policy and the date range. - + {/* User Selector */} - + { {/* Conditional Access Policy Selector */} - + { {/* Start Date Picker */} - + { {/* End Date Picker */} - + { - + { /> - + { /> - + { compareType="is" compareValue="IPLocation" > - + { validators={{ required: "IPs are required" }} /> - + { compareType="is" compareValue="Countries" > - + { validators={{ required: "At least one country must be selected" }} /> - + { )} - + { propertyItems={relationshipProperties} /> - + { - + { sortOptions={true} /> - + - + { sortOptions={true} /> - + - + {pageTitle} @@ -144,7 +144,7 @@ const Page = () => { {currentTenant === "AllTenants" && layoutMode !== "Table" ? ( - + { Page.getLayout = (page) => {page}; -export default Page; +export default Page; \ No newline at end of file diff --git a/src/pages/tenant/standards/domains-analyser/index.js b/src/pages/tenant/standards/domains-analyser/index.js index c90254aab4df..91f5e8e50145 100644 --- a/src/pages/tenant/standards/domains-analyser/index.js +++ b/src/pages/tenant/standards/domains-analyser/index.js @@ -1,4 +1,4 @@ -import { Button, Container } from "@mui/material"; +import { Button } from "@mui/material"; import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; import { Layout as DashboardLayout } from "/src/layouts/index.js"; // had to add an extra path here because I added an extra folder structure. We should switch to absolute pathing so we dont have to deal with relative. import Link from "next/link"; diff --git a/src/pages/tenant/standards/list-standards/index.js b/src/pages/tenant/standards/list-standards/index.js index 2f0c84037842..dcaa36640959 100644 --- a/src/pages/tenant/standards/list-standards/index.js +++ b/src/pages/tenant/standards/list-standards/index.js @@ -135,20 +135,20 @@ const Page = () => { severity="warning" style={{ display: "flex", alignItems: "center", width: "100%" }} > - + You have legacy standards available. Press the button to convert these standards to the new format. This will create a new template for each standard you had, but will disable the schedule. After conversion, please check the new templates to ensure they are correct and re-enable the schedule. - + - + diff --git a/src/pages/tenant/tools/appapproval/index.js b/src/pages/tenant/tools/appapproval/index.js index 52e6040e62f9..a18484cc85ce 100644 --- a/src/pages/tenant/tools/appapproval/index.js +++ b/src/pages/tenant/tools/appapproval/index.js @@ -2,7 +2,6 @@ import { Layout as DashboardLayout } from "/src/layouts/index.js"; import { CippWizardConfirmation } from "/src/components/CippWizard/CippWizardConfirmation"; import CippWizardPage from "/src/components/CippWizard/CippWizardPage.jsx"; import { CippTenantStep } from "/src/components/CippWizard/CippTenantStep.jsx"; -import { useSettings } from "../../../../hooks/use-settings"; import { CippWizardAppApproval } from "../../../../components/CippWizard/CippWizardAppApproval"; import { Alert } from "@mui/material"; diff --git a/src/pages/tenant/tools/geoiplookup/index.js b/src/pages/tenant/tools/geoiplookup/index.js index 31aa5967367d..0cd392f37006 100644 --- a/src/pages/tenant/tools/geoiplookup/index.js +++ b/src/pages/tenant/tools/geoiplookup/index.js @@ -1,4 +1,4 @@ -import { Box, Button, Container, Skeleton } from "@mui/material"; +import { Box, Button, Container } from "@mui/material"; import { Grid, Stack } from "@mui/system"; import { Layout as DashboardLayout } from "/src/layouts/index.js"; import { useForm, useWatch } from "react-hook-form"; @@ -91,13 +91,13 @@ const Page = () => { > - + - + { required /> - +