{
- setSelectedApp([
- ...selectedApp,
- servicePrincipals?.Results?.find(
- (sp) => sp.appId === currentSelectedSp.value
- ),
- ]);
- formControl.setValue("servicePrincipal", null);
+ // Only add if not deprecated
+ if (!isDeprecatedSp) {
+ setSelectedApp([
+ ...selectedApp,
+ servicePrincipals?.Results?.find(
+ (sp) => sp.appId === currentSelectedSp.value
+ ),
+ ]);
+ formControl.setValue("servicePrincipal", null);
+ }
}}
>
+ }
+ >
+ {/* Form Starts Here */}
+
+
+
+
+
+
+
+
+ )}
+
+ );
+};
+
+Page.getLayout = (page) =>
{page};
+
+export default Page;
diff --git a/src/pages/security/defender/deployment/index.js b/src/pages/security/defender/deployment/index.js
index 14b6be90c7fd..c17b12b8c240 100644
--- a/src/pages/security/defender/deployment/index.js
+++ b/src/pages/security/defender/deployment/index.js
@@ -1,7 +1,6 @@
-import React from "react";
import { Typography, 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";
diff --git a/src/pages/tenant/administration/add-subscription/index.jsx b/src/pages/tenant/administration/add-subscription/index.jsx
index e46a5a2fb5ac..474313f5879b 100644
--- a/src/pages/tenant/administration/add-subscription/index.jsx
+++ b/src/pages/tenant/administration/add-subscription/index.jsx
@@ -1,12 +1,10 @@
-import React from "react";
-import { Box, Typography } from "@mui/material";
+import { Box } from "@mui/material";
import CippFormPage from "/src/components/CippFormPages/CippFormPage";
import { Layout as DashboardLayout } from "/src/layouts/index.js";
import { useForm, useWatch } from "react-hook-form";
import CippFormComponent from "/src/components/CippComponents/CippFormComponent";
import { useSettings } from "/src/hooks/use-settings";
import { Grid, darken, lighten, styled } from "@mui/system";
-import { CippPropertyList } from "/src/components/CippComponents/CippPropertyList";
import { CippPropertyListCard } from "../../../../components/CippCards/CippPropertyListCard";
import { getCippFormatting } from "../../../../utils/get-cipp-formatting";
import { getCippTranslation } from "../../../../utils/get-cipp-translation";
diff --git a/src/pages/tenant/administration/alert-configuration/alert.jsx b/src/pages/tenant/administration/alert-configuration/alert.jsx
index 87a4c662c54d..374417b3851a 100644
--- a/src/pages/tenant/administration/alert-configuration/alert.jsx
+++ b/src/pages/tenant/administration/alert-configuration/alert.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from "react";
+import { useState, useEffect } from "react";
import {
Box,
Button,
diff --git a/src/pages/tenant/administration/app-consent-requests/index.js b/src/pages/tenant/administration/app-consent-requests/index.js
index 6287465a1076..c5629fac13fb 100644
--- a/src/pages/tenant/administration/app-consent-requests/index.js
+++ b/src/pages/tenant/administration/app-consent-requests/index.js
@@ -1,4 +1,4 @@
-import { useState, useEffect, use } from "react";
+import { useState } from "react";
import { Layout as DashboardLayout } from "/src/layouts/index.js";
import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx";
import { Button, Accordion, AccordionSummary, AccordionDetails, Typography } from "@mui/material";
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/log.js b/src/pages/tenant/administration/audit-logs/log.js
index e88d096b39a8..9d6ecf5173a8 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,
diff --git a/src/pages/tenant/administration/tenants/add.js b/src/pages/tenant/administration/tenants/add.js
index cdfa1b05143d..74c36bb424d0 100644
--- a/src/pages/tenant/administration/tenants/add.js
+++ b/src/pages/tenant/administration/tenants/add.js
@@ -2,7 +2,7 @@ import { Layout as DashboardLayout } from "../../../../layouts/index.js";
import CippWizardPage from "../../../../components/CippWizard/CippWizardPage.jsx";
import { CippWizardOptionsList } from "../../../../components/CippWizard/CippWizardOptionsList.jsx";
import { CippAddTenantForm } from "../../../../components/CippWizard/CippAddTenantForm.jsx";
-import { BuildingOfficeIcon, CloudIcon } from "@heroicons/react/24/outline";
+import { BuildingOfficeIcon } from "@heroicons/react/24/outline";
import CippWizardConfirmation from "../../../../components/CippWizard/CippWizardConfirmation.jsx";
const Page = () => {
diff --git a/src/pages/tenant/administration/tenants/groups/add.js b/src/pages/tenant/administration/tenants/groups/add.js
index 3e5729d97640..04dd6493d430 100644
--- a/src/pages/tenant/administration/tenants/groups/add.js
+++ b/src/pages/tenant/administration/tenants/groups/add.js
@@ -1,17 +1,13 @@
import { Layout as DashboardLayout } from "/src/layouts/index.js";
import { useForm } from "react-hook-form";
import { ApiPostCall } from "../../../../../api/ApiCall";
-import { useRouter } from "next/router";
-import { Stack, Box, Typography } from "@mui/material";
-
+import { Box } from "@mui/material";
import { Grid } from "@mui/system";
-
import CippPageCard from "../../../../../components/CippCards/CippPageCard";
import { CippApiResults } from "/src/components/CippComponents/CippApiResults";
import CippAddEditTenantGroups from "/src/components/CippComponents/CippAddEditTenantGroups";
const Page = () => {
- const router = useRouter();
const formControl = useForm({
mode: "onChange",
});
diff --git a/src/pages/tenant/administration/tenants/index.js b/src/pages/tenant/administration/tenants/index.js
index 83e23d5504aa..0b85618ece44 100644
--- a/src/pages/tenant/administration/tenants/index.js
+++ b/src/pages/tenant/administration/tenants/index.js
@@ -1,10 +1,8 @@
import { Layout as DashboardLayout } from "/src/layouts/index.js";
import { TabbedLayout } from "/src/layouts/TabbedLayout";
import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx";
-import { Button, SvgIcon } from "@mui/material";
-import { AddBusinessOutlined, Edit } from "@mui/icons-material";
+import { Edit } from "@mui/icons-material";
import tabOptions from "./tabOptions";
-import NextLink from "next/link";
const Page = () => {
const pageTitle = "Tenants";
diff --git a/src/pages/tenant/backup/backup-wizard/restore.jsx b/src/pages/tenant/backup/backup-wizard/restore.jsx
index 566d1d6857b7..7790b1e2b04a 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";
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/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..f3cc2776b5ec 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";
diff --git a/src/pages/tenant/tools/individual-domains/index.js b/src/pages/tenant/tools/individual-domains/index.js
index 1210a6a2d6d6..0b8332fc2d4a 100644
--- a/src/pages/tenant/tools/individual-domains/index.js
+++ b/src/pages/tenant/tools/individual-domains/index.js
@@ -1,5 +1,4 @@
import { Box, Container } from "@mui/material";
-import { Grid } from "@mui/system";
import { Layout as DashboardLayout } from "/src/layouts/index.js";
import { CippDomainCards } from "../../../../components/CippCards/CippDomainCards";
diff --git a/src/pages/tenant/tools/tenantlookup/index.js b/src/pages/tenant/tools/tenantlookup/index.js
index 45446bc26349..0b2ab42e9326 100644
--- a/src/pages/tenant/tools/tenantlookup/index.js
+++ b/src/pages/tenant/tools/tenantlookup/index.js
@@ -1,4 +1,4 @@
-import { Box, Button, Container, Typography, CircularProgress, Skeleton, Link } from "@mui/material";
+import { Box, Button, Container, Typography, Skeleton, Link } from "@mui/material";
import { Grid } from "@mui/system";
import { Layout as DashboardLayout } from "/src/layouts/index.js";
import { useForm, useWatch } from "react-hook-form";
@@ -93,8 +93,8 @@ const Page = () => {
domains:
- {getTenant.data?.Domains?.map((domain) => (
-
+ {getTenant.data?.Domains?.map((domain, index) => (
+
{domain}
diff --git a/src/pages/tools/breachlookup/index.js b/src/pages/tools/breachlookup/index.js
index e632397030af..12231bd995f0 100644
--- a/src/pages/tools/breachlookup/index.js
+++ b/src/pages/tools/breachlookup/index.js
@@ -119,8 +119,8 @@ const Page = () => {
)}
- {getGeoIP.data?.map((breach) => (
-
+ {getGeoIP.data?.map((breach, index) => (
+
{breach.Title}>}
diff --git a/src/pages/tools/templatelib/index.jsx b/src/pages/tools/templatelib/index.jsx
index 7cbaf8bc0182..44a7512884ca 100644
--- a/src/pages/tools/templatelib/index.jsx
+++ b/src/pages/tools/templatelib/index.jsx
@@ -1,15 +1,13 @@
-import React, { useEffect } from "react";
-import { Divider, Typography, CircularProgress, Alert, Chip, Link } from "@mui/material";
+import { useEffect } from "react";
+import { Divider, Typography, Alert, Chip } from "@mui/material";
import { useForm, useWatch } 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";
import { useSettings } from "/src/hooks/use-settings";
import { CippFormTenantSelector } from "../../../components/CippComponents/CippFormTenantSelector";
-import { Box, Grid } from "@mui/system";
+import { Grid } from "@mui/system";
import { CippFormCondition } from "../../../components/CippComponents/CippFormCondition";
-import { ApiGetCall } from "/src/api/ApiCall";
-import NextLink from "next/link";
const TemplateLibrary = () => {
const currentTenant = useSettings().currentTenant;
diff --git a/src/sections/dashboard/components/onboarding/wizard.js b/src/sections/dashboard/components/onboarding/wizard.js
index 3751be751059..c4427d22d105 100644
--- a/src/sections/dashboard/components/onboarding/wizard.js
+++ b/src/sections/dashboard/components/onboarding/wizard.js
@@ -1,5 +1,4 @@
import { useCallback, useMemo, useState } from "react";
-import PropTypes from "prop-types";
import { Card, CardContent, Container, Stack } from "@mui/material";
import { WizardBusinessStep } from "../../../../components/CippWizard/CippWizardOptionsList";
import { WizardConfirmationStep } from "../../../../components/CippWizard/CippWizardConfirmation";
diff --git a/src/sections/dashboard/products/products-stats.js b/src/sections/dashboard/products/products-stats.js
index dec86105255a..8a8b415d1fa5 100644
--- a/src/sections/dashboard/products/products-stats.js
+++ b/src/sections/dashboard/products/products-stats.js
@@ -2,7 +2,7 @@ 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, SvgIcon, Typography, Unstable_Grid2 as Grid } from "@mui/material";
+import { Card, Stack, Typography, Unstable_Grid2 as Grid } from "@mui/material";
const stats = [
{
From 6f250e83f5e9c0a3122624e5732f227c619187f2 Mon Sep 17 00:00:00 2001
From: Zac Richards <107489668+Zacgoose@users.noreply.github.com>
Date: Fri, 6 Jun 2025 00:25:57 +0800
Subject: [PATCH 033/125] grid item removal (deprecated)
---
src/components/CippCards/CippDomainCards.jsx | 2 +-
src/components/CippCards/CippInfoBar.jsx | 2 +-
.../CippCards/CippUniversalSearch.jsx | 2 +-
.../CippAppPermissionBuilder.jsx | 22 +--
.../CippComponents/CippCentralSearch.jsx | 2 +-
.../CippComponents/CippGeoLocation.jsx | 4 +-
.../CippComponents/CippMessageViewer.jsx | 8 +-
.../CippComponents/CippNotificationForm.jsx | 12 +-
.../CippComponents/CippOffCanvas.jsx | 4 +-
.../CippFormPages/CippAddEditUser.jsx | 81 +++++-----
.../CippFormPages/CippAddGroupForm.jsx | 47 +++---
.../CippAddGroupTemplateForm.jsx | 12 +-
.../CippCustomDataMappingForm.jsx | 4 +-
.../CippFormPages/CippFormSkeleton.jsx | 2 +-
.../CippFormPages/CippInviteGuest.jsx | 8 +-
.../CippFormPages/CippSchedulerForm.jsx | 22 +--
.../CippIntegrationFieldMapping.jsx | 8 +-
.../CippIntegrationSettings.jsx | 6 +-
.../CippIntegrationTenantMapping.jsx | 16 +-
.../CippTable/CippGraphExplorerFilter.js | 28 ++--
.../CippWizard/CippAddTenantForm.jsx | 4 +-
.../CippWizard/CippIntunePolicy.jsx | 4 +-
.../CippWizard/CippWizardAutopilotOptions.jsx | 2 +-
.../CippWizard/CippWizardBulkOptions.jsx | 4 +-
.../CippWizard/CippWizardCSVImport.jsx | 8 +-
.../CippWizard/CippWizardConfirmation.jsx | 4 +-
.../CippWizard/CippWizardGroupTemplates.jsx | 34 +++--
.../CippWizard/CippWizardOffboarding.jsx | 10 +-
src/components/CippWizard/CustomerForm.jsx | 2 +-
src/layouts/index.js | 2 +-
src/pages/401.js | 2 +-
src/pages/404.js | 2 +-
src/pages/500.js | 2 +-
src/pages/api-offline.js | 2 +-
src/pages/authredirect.js | 2 +-
src/pages/cipp/advanced/exchange-cmdlets.js | 8 +-
src/pages/cipp/advanced/table-maintenance.js | 4 +-
src/pages/cipp/integrations/index.js | 2 +-
src/pages/cipp/settings/backend.js | 2 +-
src/pages/cipp/settings/index.js | 10 +-
src/pages/cipp/settings/partner-webhooks.js | 10 +-
src/pages/cipp/settings/permissions.js | 8 +-
src/pages/cipp/super-admin/tenant-mode.js | 4 +-
.../email/administration/contacts/add.jsx | 65 +++++++-
.../email/administration/contacts/edit.jsx | 140 +++++++++++++++++-
.../administration/mailboxes/addshared.jsx | 6 +-
.../tenant-allow-block-lists/add.jsx | 12 +-
.../resources/management/list-rooms/edit.jsx | 50 ++++---
.../spamfilter/list-connectionfilter/add.jsx | 6 +-
.../list-quarantine-policies/add.jsx | 10 +-
.../email/spamfilter/list-spamfilter/add.jsx | 6 +-
.../email/tools/mailbox-restores/add.jsx | 34 ++---
src/pages/email/tools/message-trace/index.js | 18 +--
.../email/transport/list-connectors/add.jsx | 6 +-
src/pages/email/transport/list-rules/add.jsx | 6 +-
src/pages/endpoint/applications/list/add.jsx | 88 ++++++-----
.../autopilot/add-status-page/index.js | 8 +-
.../endpoint/autopilot/list-profiles/add.jsx | 12 +-
src/pages/fullPageLoading.js | 2 +-
.../identity/administration/groups/edit.jsx | 18 +--
.../identity/administration/jit-admin/add.jsx | 30 ++--
.../identity/administration/users/invite.jsx | 2 +-
.../administration/users/user/bec.jsx | 8 +-
.../users/user/conditional-access.jsx | 4 +-
.../administration/users/user/devices.jsx | 4 +-
.../administration/users/user/exchange.jsx | 6 +-
.../administration/users/user/index.jsx | 8 +-
.../identity/reports/signin-report/index.js | 10 +-
src/pages/index.js | 18 +--
src/pages/loading.js | 2 +-
.../security/defender/deployment/index.js | 36 ++---
src/pages/teams-share/sharepoint/add-site.js | 10 +-
src/pages/teams-share/teams/list-team/add.jsx | 8 +-
.../app-consent-requests/index.js | 4 +-
.../tenant/administration/audit-logs/index.js | 14 +-
.../tenant/administration/audit-logs/log.js | 6 +-
.../administration/securescore/index.js | 8 +-
.../administration/securescore/table.js | 2 +-
.../tenant/administration/tenants/edit.js | 4 +-
.../administration/tenants/groups/add.js | 2 +-
.../administration/tenants/groups/edit.js | 2 +-
src/pages/tenant/backup/backup-wizard/add.jsx | 44 +++---
.../tenant/backup/backup-wizard/restore.jsx | 38 ++---
.../conditional/deploy-vacation/add.jsx | 10 +-
.../conditional/list-named-locations/add.jsx | 14 +-
.../relationships/relationship/index.js | 4 +-
src/pages/tenant/gdap-management/roles/add.js | 8 +-
.../tenant/standards/bpa-report/builder.js | 40 ++---
src/pages/tenant/standards/bpa-report/view.js | 4 +-
src/pages/tenant/standards/compare/index.js | 2 +-
.../tenant/standards/list-standards/index.js | 6 +-
src/pages/tenant/tools/geoiplookup/index.js | 16 +-
.../tenant/tools/graph-explorer/index.js | 2 +-
src/pages/tenant/tools/tenantlookup/index.js | 16 +-
src/pages/tools/breachlookup/index.js | 34 ++---
src/pages/tools/community-repos/repo.js | 4 +-
src/pages/tools/templatelib/index.jsx | 16 +-
src/pages/unauthenticated.js | 2 +-
98 files changed, 795 insertions(+), 564 deletions(-)
diff --git a/src/components/CippCards/CippDomainCards.jsx b/src/components/CippCards/CippDomainCards.jsx
index d8b4884b983a..b6d8adb58bf4 100644
--- a/src/components/CippCards/CippDomainCards.jsx
+++ b/src/components/CippCards/CippDomainCards.jsx
@@ -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 && (
{
{displayedResults.map((item, key) => (
-
+
))}
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.
-
+
importManifest()}
@@ -892,7 +892,7 @@ const CippAppPermissionBuilder = ({
-
+
Preview
-
+
{
filteredItems.length > 0 ? (
{filteredItems.map((item, index) => (
-
+
handleCardClick(item.path)}
diff --git a/src/components/CippComponents/CippGeoLocation.jsx b/src/components/CippComponents/CippGeoLocation.jsx
index 064b92e53a90..7a1609a2bedf 100644
--- a/src/components/CippComponents/CippGeoLocation.jsx
+++ b/src/components/CippComponents/CippGeoLocation.jsx
@@ -61,7 +61,7 @@ export default function CippGeoLocation({ ipAddress, cardProps }) {
return (
-
+
{geoLookup.isPending ? (
) : (
@@ -78,7 +78,7 @@ export default function CippGeoLocation({ ipAddress, cardProps }) {
>
)}
-
+
{
justifyContent: "space-between",
}}
>
-
+
@@ -417,7 +417,7 @@ export const CippMessageViewer = ({ emailSource }) => {
)}
-
+
{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 && (
-
+
Send Test Alert
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/CippFormPages/CippAddEditUser.jsx b/src/components/CippFormPages/CippAddEditUser.jsx
index a9fcbfe5ee8b..e1b42686c2ee 100644
--- a/src/components/CippFormPages/CippAddEditUser.jsx
+++ b/src/components/CippFormPages/CippAddEditUser.jsx
@@ -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 0c2b79c30352..7f52b810b81c 100644
--- a/src/components/CippFormPages/CippAddGroupTemplateForm.jsx
+++ b/src/components/CippFormPages/CippAddGroupTemplateForm.jsx
@@ -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:
@@ -278,10 +278,10 @@ const CippSchedulerForm = (props) => {
))}
-
+
-
+
{
compareValue={true}
formControl={formControl}
>
-
+
{
/>
-
+
{
]}
/>
-
+
{
formControl.trigger();
diff --git a/src/components/CippIntegrations/CippIntegrationFieldMapping.jsx b/src/components/CippIntegrations/CippIntegrationFieldMapping.jsx
index c03775e01179..ae0014d0e276 100644
--- a/src/components/CippIntegrations/CippIntegrationFieldMapping.jsx
+++ b/src/components/CippIntegrations/CippIntegrationFieldMapping.jsx
@@ -115,7 +115,7 @@ const CippIntegrationFieldMapping = () => {
{fieldMapping?.data?.CIPPFields?.filter(
(field) => field.FieldType === header.FieldType
).map((field, fieldIndex) => (
-
+
{
{fieldMapping.isLoading && (
-
+
-
+
@@ -170,7 +170,7 @@ const CippIntegrationFieldMapping = () => {
)}
{fieldMapping.isSuccess && !extension && (
-
+