Merge branch 'KelvinTegelaar:dev' into dev

bmsimp · Jan 31, 2025 · bcf469c · bcf469c
2 parents 9470053 + 2198b45
commit bcf469c
Show file tree

Hide file tree

Showing 52 changed files with 490 additions and 127 deletions.
diff --git a/src/components/CippFormPages/CippAddGroupForm.jsx b/src/components/CippFormPages/CippAddGroupForm.jsx
@@ -51,7 +51,7 @@ const CippAddGroupForm = (props) => {
           formControl={formControl}
           name="owners"
           label="Owners"
-          multiple={false}
+          multiple={true}
           select={"id,userPrincipalName,displayName"}
         />
       </Grid>
@@ -62,7 +62,7 @@ const CippAddGroupForm = (props) => {
           formControl={formControl}
           name="members"
           label="Members"
-          multiple={false}
+          multiple={true}
           select={"id,userPrincipalName,displayName"}
         />
       </Grid>

diff --git a/src/components/CippFormPages/CippFormPage.jsx b/src/components/CippFormPages/CippFormPage.jsx
@@ -27,7 +27,7 @@ const CippFormPage = (props) => {
     formControl,
     postUrl,
     customDataformatter,
-    resetForm = true,
+    resetForm = false,
     hideBackButton = false,
     hidePageType = false,
     hideTitle = false,
@@ -36,7 +36,6 @@ const CippFormPage = (props) => {
     ...other
   } = props;
   const router = useRouter();
-
   //check if there are
   const postCall = ApiPostCall({
     datafromUrl: true,

diff --git a/src/components/CippStandards/CippStandardsSideBar.jsx b/src/components/CippStandards/CippStandardsSideBar.jsx
@@ -1,14 +1,5 @@
 import PropTypes from "prop-types";
-import {
-  Card,
-  CardContent,
-  CardHeader,
-  Divider,
-  formControlLabelClasses,
-  Stack,
-  SvgIcon,
-  Typography,
-} from "@mui/material";
+import { Card, CardContent, CardHeader, Divider, Stack, SvgIcon, Typography } from "@mui/material";
 import { styled } from "@mui/material/styles";
 import {
   Timeline,
@@ -24,7 +15,7 @@ import { ActionListItem } from "/src/components/action-list-item";
 import CheckIcon from "@heroicons/react/24/outline/CheckIcon";
 import CloseIcon from "@mui/icons-material/Close";
 import { useWatch } from "react-hook-form";
-import { useEffect, useState } from "react";
+import { use, useEffect, useState } from "react";
 import _ from "lodash";
 import CippFormComponent from "/src/components/CippComponents/CippFormComponent";
 import { CippFormTenantSelector } from "../CippComponents/CippFormTenantSelector";
@@ -127,6 +118,15 @@ const CippStandardsSideBar = ({
             fullWidth
           />
           <Divider />
+          <CippFormComponent
+            type="richText"
+            name="description"
+            label="Description"
+            formControl={formControl}
+            placeholder="Enter a description for the template"
+            fullWidth
+          />
+          <Divider />
           <CippFormTenantSelector
             allTenants={true}
             label="Included Tenants"
@@ -225,6 +225,7 @@ const CippStandardsSideBar = ({
           data: {
             tenantFilter: "tenantFilter",
             excludedTenants: "excludedTenants",
+            description: "description",
             templateName: "templateName",
             standards: "standards",
             ...(edit ? { GUID: "GUID" } : {}),

diff --git a/src/components/bulk-actions-menu.js b/src/components/bulk-actions-menu.js
@@ -2,6 +2,33 @@ import PropTypes from "prop-types";
 import ChevronDownIcon from "@heroicons/react/24/outline/ChevronDownIcon";
 import { Button, Link, ListItemText, Menu, MenuItem, SvgIcon } from "@mui/material";
 import { usePopover } from "../hooks/use-popover";
+import { FilePresent, Laptop, Mail, Share, Shield, ShieldMoon } from "@mui/icons-material";
+import { GlobeAltIcon, UsersIcon, ServerIcon } from "@heroicons/react/24/outline";
+
+function getIconByName(iconName) {
+  switch (iconName) {
+    case "GlobeAltIcon":
+      return <GlobeAltIcon />;
+    case "Mail":
+      return <Mail />;
+    case "UsersIcon":
+      return <UsersIcon />;
+    case "FilePresent":
+      return <FilePresent />;
+    case "ServerIcon":
+      return <ServerIcon />;
+    case "Laptop":
+      return <Laptop />;
+    case "Share":
+      return <Share />;
+    case "Shield":
+      return <Shield />;
+    case "ShieldMoon":
+      return <ShieldMoon />;
+    default:
+      return null;
+  }
+}
 
 export const BulkActionsMenu = (props) => {
   const { buttonName, sx, row, actions = [], ...other } = props;
@@ -55,12 +82,14 @@ export const BulkActionsMenu = (props) => {
                 target="_blank"
                 rel="noreferrer"
               >
+                <SvgIcon sx={{ mr: 1 }}>{getIconByName(action.icon)}</SvgIcon>
                 <ListItemText primary={action.label} />
               </MenuItem>
             );
           } else {
             return (
               <MenuItem key={index} onClick={action.onClick}>
+                <SvgIcon sx={{ mr: 1 }}>{getIconByName(action.icon)}</SvgIcon>
                 <ListItemText primary={action.label} />
               </MenuItem>
             );

diff --git a/src/data/portals.json b/src/data/portals.json
@@ -6,7 +6,7 @@
     "variable": "customerId",
     "target": "_blank",
     "external": true,
-    "icon": "cog"
+    "icon": "GlobeAltIcon"
   },
   {
     "label": "Exchange Portal",
@@ -15,7 +15,7 @@
     "variable": "defaultDomainName",
     "target": "_blank",
     "external": true,
-    "icon": "mail-bulk"
+    "icon": "Mail"
   },
   {
     "label": "Entra Portal",
@@ -24,7 +24,7 @@
     "variable": "defaultDomainName",
     "target": "_blank",
     "external": true,
-    "icon": "users"
+    "icon": "UsersIcon"
   },
   {
     "label": "Teams Portal",
@@ -33,7 +33,7 @@
     "variable": "defaultDomainName",
     "target": "_blank",
     "external": true,
-    "icon": "comments"
+    "icon": "FilePresent"
   },
   {
     "label": "Azure Portal",
@@ -42,7 +42,7 @@
     "variable": "defaultDomainName",
     "target": "_blank",
     "external": true,
-    "icon": "server"
+    "icon": "ServerIcon"
   },
   {
     "label": "Intune Portal",
@@ -51,7 +51,16 @@
     "variable": "defaultDomainName",
     "target": "_blank",
     "external": true,
-    "icon": "laptop-code"
+    "icon": "Laptop"
+  },
+  {
+    "label": "SharePoint Admin",
+    "name": "SharePoint_Admin",
+    "url": "https://admin.microsoft.com/Partner/beginclientsession.aspx?CTID=customerId&CSDEST=SharePoint",
+    "variable": "customerId",
+    "target": "_blank",
+    "external": true,
+    "icon": "Share"
   },
   {
     "label": "Security Portal",
@@ -60,7 +69,7 @@
     "variable": "customerId",
     "target": "_blank",
     "external": true,
-    "icon": "shield-alt"
+    "icon": "Shield"
   },
   {
     "label": "Compliance Portal",
@@ -69,15 +78,6 @@
     "variable": "customerId",
     "target": "_blank",
     "external": true,
-    "icon": "shield-alt"
-  },
-  {
-    "label": "SharePoint Admin",
-    "name": "SharePoint_Admin",
-    "url": "https://admin.microsoft.com/Partner/beginclientsession.aspx?CTID=customerId&CSDEST=SharePoint",
-    "variable": "customerId",
-    "target": "_blank",
-    "external": true,
-    "icon": "book"
+    "icon": "ShieldMoon"
   }
 ]
diff --git a/src/pages/cipp/settings/tenants.js b/src/pages/cipp/settings/tenants.js
@@ -5,7 +5,7 @@ import tabOptions from "./tabOptions";
 import { Button, SvgIcon } from "@mui/material";
 import { CippApiDialog } from "/src/components/CippComponents/CippApiDialog";
 import { useDialog } from "/src/hooks/use-dialog";
-import { Sync } from "@mui/icons-material";
+import { Sync, Block, PlayArrow, RestartAlt, Delete, Add } from "@mui/icons-material";
 
 const Page = () => {
   const pageTitle = "Tenants - Backend";
@@ -17,6 +17,7 @@ const Page = () => {
       label: "Exclude Tenants",
       type: "POST",
       url: `/api/ExecExcludeTenant?AddExclusion=true`,
+      icon: <Block />,
       data: { value: "customerId" },
       confirmText: "Are you sure you want to exclude these tenants?",
       multiPost: false,
@@ -25,6 +26,7 @@ const Page = () => {
       label: "Include Tenants",
       type: "POST",
       url: `/api/ExecExcludeTenant?RemoveExclusion=true`,
+      icon: <Add />,
       data: { value: "customerId" },
       confirmText: "Are you sure you want to include these tenants?",
       multiPost: false,
@@ -33,6 +35,7 @@ const Page = () => {
       label: "Refresh CPV Permissions",
       type: "POST",
       url: `/api/ExecCPVPermissions`,
+      icon: <PlayArrow />,
       data: { TenantFilter: "customerId" },
       confirmText: "Are you sure you want to refresh the CPV permissions for these tenants?",
       multiPost: false,
@@ -41,6 +44,7 @@ const Page = () => {
       label: "Reset CPV Permissions",
       type: "POST",
       url: `/api/ExecCPVPermissions?&ResetSP=true`,
+      icon: <RestartAlt />,
       data: { TenantFilter: "customerId" },
       confirmText:
         "Are you sure you want to reset the CPV permissions for these tenants? (This will delete the Service Principal and re-add it.)",
@@ -50,6 +54,7 @@ const Page = () => {
       label: "Remove Tenant",
       type: "POST",
       url: `/api/ExecRemoveTenant`,
+      icon: <Delete />,
       data: { TenantID: "customerId" },
       confirmText: "Are you sure you want to remove this tenant?",
       multiPost: false,

diff --git a/src/pages/email/administration/contacts/index.js b/src/pages/email/administration/contacts/index.js
@@ -1,6 +1,6 @@
 import { Layout as DashboardLayout } from "/src/layouts/index.js";
 import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx";
-import { Edit } from "@mui/icons-material";
+import { Edit, PersonAdd } from "@mui/icons-material";
 import { Button } from "@mui/material";
 import Link from "next/link";
 import TrashIcon from '@heroicons/react/24/outline/TrashIcon';
@@ -40,7 +40,11 @@ const Page = () => {
       simpleColumns={simpleColumns}
       cardButton={
         <>
-          <Button component={Link} href="/email/administration/contacts/add">
+          <Button
+            component={Link}
+            href="/email/administration/contacts/add"
+            startIcon={<PersonAdd />}
+          >
             Add contact
           </Button>
         </>

diff --git a/src/pages/email/administration/mailboxes/index.js b/src/pages/email/administration/mailboxes/index.js
@@ -2,6 +2,7 @@ import { Layout as DashboardLayout } from "/src/layouts/index.js";
 import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx";
 import Link from "next/link";
 import { Button } from "@mui/material";
+import { Add } from "@mui/icons-material";
 
 import {
   Archive,
@@ -269,7 +270,11 @@ const Page = () => {
       filters={filterList}
       cardButton={
         <>
-          <Button component={Link} href="/email/administration/mailboxes/addshared">
+          <Button
+            component={Link}
+            startIcon={<Add />}
+            href="/email/administration/mailboxes/addshared"
+          >
             Add Shared Mailbox
           </Button>
         </>

diff --git a/src/pages/email/administration/tenant-allow-block-lists/index.js b/src/pages/email/administration/tenant-allow-block-lists/index.js
@@ -2,7 +2,8 @@ import { Layout as DashboardLayout } from "/src/layouts/index.js";
 import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx";
 import { Button } from "@mui/material";
 import Link from "next/link";
-import TrashIcon from '@heroicons/react/24/outline/TrashIcon';
+import TrashIcon from "@heroicons/react/24/outline/TrashIcon";
+import { PlaylistAdd } from "@mui/icons-material";
 
 const Page = () => {
   const pageTitle = "Tenant Allow/Block Lists";
@@ -49,7 +50,11 @@ const Page = () => {
       }}
       cardButton={
         <>
-          <Button component={Link} href="/email/administration/tenant-allow-block-lists/add">
+          <Button
+            component={Link}
+            href="/email/administration/tenant-allow-block-lists/add"
+            startIcon={<PlaylistAdd />}
+          >
             Add Entry
           </Button>
         </>

diff --git a/src/pages/email/resources/management/list-rooms/index.js b/src/pages/email/resources/management/list-rooms/index.js
@@ -2,6 +2,7 @@ import { Layout as DashboardLayout } from "/src/layouts/index.js";
 import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx";
 import { Button } from "@mui/material";
 import Link from "next/link";
+import { AddHomeWork } from "@mui/icons-material";
 
 const Page = () => {
   const pageTitle = "Rooms";
@@ -12,7 +13,11 @@ const Page = () => {
       apiUrl="/api/ListRooms"
       simpleColumns={["displayName", "building", "floorNumber", "capacity", "bookingType"]}
       cardButton={
-        <Button component={Link} href="/email/resources/management/list-rooms/add">
+        <Button
+          component={Link}
+          href="/email/resources/management/list-rooms/add"
+          startIcon={<AddHomeWork />}
+        >
           Add Room
         </Button>
       }

diff --git a/src/pages/email/resources/management/room-lists/index.js b/src/pages/email/resources/management/room-lists/index.js
@@ -1,15 +1,17 @@
 import { Layout as DashboardLayout } from "/src/layouts/index.js";
 import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx";
+import { Visibility } from "@mui/icons-material";
 
 const Page = () => {
   const pageTitle = "Room Lists";
-  const apiUrl = "/api/ListRoomLists"
+  const apiUrl = "/api/ListRoomLists";
 
   const actions = [
     {
       label: "View included Rooms",
       link: `/email/resources/management/room-lists/list/view?roomAddress=[emailAddress]`,
       color: "info",
+      icon: <Visibility />,
     },
   ];
 

diff --git a/src/pages/email/spamfilter/list-connectionfilter/index.js b/src/pages/email/spamfilter/list-connectionfilter/index.js
@@ -1,7 +1,7 @@
 import { Layout as DashboardLayout } from "/src/layouts/index.js";
 import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx";
 import { Button } from "@mui/material";
-import { Book } from "@mui/icons-material";
+import { Book, AddModerator } from "@mui/icons-material";
 import Link from "next/link";
 
 const Page = () => {
@@ -45,7 +45,11 @@ const Page = () => {
       simpleColumns={simpleColumns}
       cardButton={
         <>
-          <Button component={Link} href="/email/spamfilter/list-connectionfilter/add">
+          <Button
+            component={Link}
+            href="/email/spamfilter/list-connectionfilter/add"
+            startIcon={<AddModerator />}
+          >
             Deploy ConnectionFilter
           </Button>
         </>