Merge branch 'KelvinTegelaar:dev' into dev

Author: Jr7468

package.json

@@ -8,7 +8,7 @@
   },
   "license": "AGPL-3.0",
   "engines": {
-    "node": "^20.18.2"
+    "node": "^20.18.1"
   },
   "repository": {
     "type": "git",

public/assets/integrations/github.png

@@ -79,7 +79,6 @@ export const CippApiDialog = (props) => {
     } else {
       Object.keys(dataObject).forEach((key) => {
         const value = dataObject[key];
-
         if (typeof value === "string" && value.startsWith("!")) {
           newData[key] = value.slice(1);
         } else if (typeof value === "string") {

public/assets/integrations/github_dark.png

@@ -95,6 +95,7 @@ const Page = () => {
       apiUrl={apiUrl}
       simpleColumns={simpleColumns}
       queryKey={`Listlogs-${dateFilter}-${filterEnabled}`}
+      tenantInTitle={false}
       apiData={{
         DateFilter: dateFilter, // Pass date filter from state
         Filter: filterEnabled, // Pass filter toggle state

src/components/CippComponents/CippApiDialog.jsx

@@ -3,29 +3,31 @@ import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"
 import { Edit } from "@mui/icons-material";
 import { Button } from "@mui/material";
 import Link from "next/link";
+import TrashIcon from '@heroicons/react/24/outline/TrashIcon';
 
 const Page = () => {
   const pageTitle = "Contacts";
 
   const actions = [
     {
       label: "Remove Contact",
-      type: "POST",
+      type: "GET",
       url: "/api/RemoveContact",
       data: {
-        TenantFilter: "Tenant",
         GUID: "id",
       },
       confirmText: "Are you sure you want to delete this contact?",
       color: "danger",
+      icon: <TrashIcon />,
     },
+    /* TODO: Implement edit contact
     {
       label: "Edit Contact",
       link: "/email/administration/edit-contact/[id]",
       multiPost: false,
       icon: <Edit />,
       color: "warning",
-    },
+    },*/
   ];
 
   const simpleColumns = ["displayName", "mail", "companyName", "onPremisesSyncEnabled"];

src/pages/cipp/logs/index.js

@@ -131,6 +131,93 @@ const Page = () => {
       confirmText: "Are you sure you want to delete this mailbox?",
       multiPost: false,
     },
+    {
+      label: "Copy Sent Items to Shared Mailbox",
+      type: "GET",
+      url: "/api/ExecCopyForSent",
+      data: { ID: "UPN" },
+      confirmText: "Are you sure you want to enable Copy Sent Items to Shared Mailbox?",
+      icon: <MailOutline />,
+      condition: (row) =>
+        row.MessageCopyForSentAsEnabled === false && row.recipientTypeDetails === "SharedMailbox",
+    },
+    {
+      label: "Disable Copy Sent Items to Shared Mailbox",
+      type: "GET",
+      url: "/api/ExecCopyForSent",
+      data: { ID: "UPN", MessageCopyForSentAsEnabled: false },
+      confirmText: "Are you sure you want to disable Copy Sent Items to Shared Mailbox?",
+      icon: <MailOutline />,
+      condition: (row) =>
+        row.MessageCopyForSentAsEnabled === true && row.recipientTypeDetails === "SharedMailbox",
+    },
+    {
+      label: "Set mailbox locale",
+      type: "POST",
+      url: "/api/ExecSetMailboxLocale",
+      data: { user: "UPN", ProhibitSendQuota: true },
+      confirmText: "Enter a locale, e.g. en-US",
+      icon: <MailOutline />,
+      fields: [
+        {
+          label: "Locale",
+          name: "locale",
+          type: "textField",
+          placeholder: "e.g. en-US",
+        },
+      ],
+    },
+    {
+      label: "Set Send Quota",
+      type: "POST",
+      url: "/api/ExecSetMailboxQuota",
+      data: { user: "UPN", ProhibitSendQuota: true },
+      confirmText: "Enter a quota. e.g. 1000MB, 10GB,1TB",
+      icon: <MailOutline />,
+      fields: [
+        {
+          label: "Quota",
+          name: "quota",
+          type: "textField",
+          placeholder: "e.g. 1000MB, 10GB,1TB",
+        },
+      ],
+    },
+    {
+      label: "Set Send and Receive Quota",
+      type: "POST",
+      url: "/api/ExecSetMailboxQuota",
+      data: {
+        user: "UPN",
+        ProhibitSendReceiveQuota: true,
+      },
+      confirmText: "Enter a quota. e.g. 1000MB, 10GB,1TB",
+      icon: <MailOutline />,
+      fields: [
+        {
+          label: "Quota",
+          name: "quota",
+          type: "textField",
+          placeholder: "e.g. 1000MB, 10GB,1TB",
+        },
+      ],
+    },
+    {
+      label: "Set Quota Warning Level",
+      type: "POST",
+      url: "/api/ExecSetMailboxQuota",
+      data: { user: "UPN", IssueWarningQuota: true },
+      confirmText: "Enter a quota. e.g. 1000MB, 10GB,1TB",
+      icon: <MailOutline />,
+      fields: [
+        {
+          label: "Quota",
+          name: "quota",
+          type: "textField",
+          placeholder: "e.g. 1000MB, 10GB,1TB",
+        },
+      ],
+    },
   ];
 
   // Define off-canvas details

src/pages/email/administration/contacts/index.js

@@ -101,6 +101,7 @@ const Page = () => {
       },
       confirmText: "Are you sure you want to release this message?",
       icon: <Done />,
+      condition: (row) => row.ReleaseStatus !== "RELEASED",
     },
     {
       label: "Deny",
@@ -112,6 +113,7 @@ const Page = () => {
       },
       confirmText: "Are you sure you want to deny this message?",
       icon: <Block />,
+      condition: (row) => row.ReleaseStatus !== "DENIED",
     },
     {
       label: "Release & Allow Sender",
@@ -125,6 +127,7 @@ const Page = () => {
       confirmText:
         "Are you sure you want to release this email and add the sender to the whitelist?",
       icon: <DoneAll />,
+      condition: (row) => row.ReleaseStatus !== "RELEASED",
     },
   ];
 

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 { Button } from "@mui/material";
 import Link from "next/link";
+import TrashIcon from '@heroicons/react/24/outline/TrashIcon';
 
 const Page = () => {
   const pageTitle = "Tenant Allow/Block Lists";
@@ -12,12 +13,12 @@ const Page = () => {
       type: "POST",
       url: "/api/RemoveTenantAllowBlockList",
       data: {
-        TenantFilter: "Tenant",
         Entries: "Value",
         ListType: "ListType",
       },
       confirmText: "Are you sure you want to delete?",
       color: "danger",
+      icon: <TrashIcon />,
     },
   ];
 

src/pages/email/administration/quarantine/index.js

@@ -1,5 +1,6 @@
 import { Layout as DashboardLayout } from "/src/layouts/index.js";
 import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx";
+import { Block } from "@mui/icons-material";
 
 /* 
   NOTE for Devs:
@@ -18,10 +19,11 @@ const Page = () => {
       actions={[
         {
           label: "Block Sign In",
-          type: "POST",
+          type: "GET",
+          icon: <Block />,
           url: "/api/ExecDisableUser",
-          data: { TenantFilter: "Tenant", ID: "id" },
-          confirmText: "Are you sure you want to block this user from signing in?",
+          data: { ID: "id" },
+          confirmText: "Are you sure you want to block the sign-in for this user?",
         },
       ]}
       offCanvas={{