Merge pull request #658 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

src/components/CippIntegrations/CippIntegrationTenantMapping.jsx

@@ -10,7 +10,7 @@ import {
   Typography,
 } from "@mui/material";
 import { Grid } from "@mui/system";
-import { useState } from "react";
+import { useState, useMemo } from "react";
 import { useForm } from "react-hook-form";
 import { ApiGetCall, ApiPostCall } from "/src/api/ApiCall";
 import { useRouter } from "next/router";
@@ -144,6 +144,11 @@ const CippIntegrationSettings = ({ children }) => {
 
   const extension = extensions.find((extension) => extension.id === router.query.id);
 
+  // Memoize the removeOptions array to ensure it updates when tableData changes
+  const removedTenantIds = useMemo(() => {
+    return Array.isArray(tableData) ? tableData.map((item) => item.TenantId) : [];
+  }, [tableData]);
+
   useEffect(() => {
     if (mappings.isSuccess) {
       setTableData(mappings.data.Mappings ?? []);
@@ -173,7 +178,7 @@ const CippIntegrationSettings = ({ children }) => {
                     multiple={false}
                     required={false}
                     disableClearable={false}
-                    removeOptions={tableData.map((item) => item.TenantId)}
+                    removeOptions={removedTenantIds}
                     valueField="customerId"
                   />
                 </Box>

src/components/CippSettings/CippBackupRetentionSettings.jsx

@@ -0,0 +1,101 @@
+import { Button, ButtonGroup, SvgIcon, Typography, TextField, Box } from "@mui/material";
+import CippButtonCard from "/src/components/CippCards/CippButtonCard";
+import { ApiGetCall, ApiPostCall } from "/src/api/ApiCall";
+import { History } from "@mui/icons-material";
+import { useState, useEffect } from "react";
+
+const CippBackupRetentionSettings = () => {
+  const retentionSetting = ApiGetCall({
+    url: "/api/ExecBackupRetentionConfig?List=true",
+    queryKey: "BackupRetentionSettings",
+  });
+
+  const retentionChange = ApiPostCall({
+    datafromUrl: true,
+    relatedQueryKeys: "BackupRetentionSettings",
+  });
+
+  const [retentionDays, setRetentionDays] = useState(30);
+  const [error, setError] = useState("");
+
+  useEffect(() => {
+    if (retentionSetting?.data?.Results?.RetentionDays) {
+      setRetentionDays(retentionSetting.data.Results.RetentionDays);
+    }
+  }, [retentionSetting.data]);
+
+  const handleRetentionChange = () => {
+    const days = parseInt(retentionDays);
+
+    if (isNaN(days) || days < 7) {
+      setError("Retention must be at least 7 days");
+      return;
+    }
+
+    setError("");
+    retentionChange.mutate({
+      url: "/api/ExecBackupRetentionConfig",
+      data: { RetentionDays: days },
+      queryKey: "BackupRetentionPost",
+    });
+  };
+
+  const handleInputChange = (e) => {
+    const value = e.target.value;
+    setRetentionDays(value);
+
+    const days = parseInt(value);
+    if (!isNaN(days) && days < 7) {
+      setError("Retention must be at least 7 days");
+    } else if (isNaN(days)) {
+      setError("Please enter a valid number");
+    } else {
+      setError("");
+    }
+  };
+
+  const RetentionControls = () => {
+    return (
+      <Box sx={{ display: "flex", gap: 1, alignItems: "flex-start" }}>
+        <TextField
+          size="small"
+          type="number"
+          value={retentionDays}
+          onChange={handleInputChange}
+          disabled={retentionChange.isPending || retentionSetting.isLoading}
+          inputProps={{ min: 7 }}
+          error={!!error}
+          helperText={error}
+          sx={{ width: "120px" }}
+          label="Days"
+        />
+        <Button
+          variant="contained"
+          color="primary"
+          size="small"
+          disabled={retentionChange.isPending || retentionSetting.isLoading || !!error}
+          onClick={handleRetentionChange}
+          sx={{ mt: 0.5 }}
+        >
+          Save
+        </Button>
+      </Box>
+    );
+  };
+
+  return (
+    <CippButtonCard
+      title="Backup Retention"
+      cardSx={{ display: "flex", flexDirection: "column", height: "100%" }}
+      CardButton={<RetentionControls />}
+    >
+      <Typography variant="body2">
+        Configure how long to keep backup files. Both CIPP system backups and tenant backups will be
+        automatically deleted after this period. Minimum retention is 7 days, default is 30 days.
+        Cleanup runs daily at 2:00 AM.
+      </Typography>
+    </CippButtonCard>
+  );
+};
+
+export default CippBackupRetentionSettings;

src/data/alerts.json

@@ -239,6 +239,26 @@
     "recommendedRunInterval": "7d",
     "description": "Monitors Global Admin accounts and alerts when they don't have an alternate email address set, which is important for password recovery of key accounts."
   },
+  {
+    "name": "GlobalAdminAllowList",
+    "label": "Alert on Global Admins outside approved list",
+    "recommendedRunInterval": "4h",
+    "requiresInput": true,
+    "multipleInput": true,
+    "inputs": [
+      {
+        "inputType": "textField",
+        "inputLabel": "Approved Global Admin UPN prefixes (comma separated)",
+        "inputName": "ApprovedGlobalAdmins"
+      },
+      {
+        "inputType": "switch",
+        "inputLabel": "Alert per non-compliant admin? (off = single aggregated alert)",
+        "inputName": "AlertEachAdmin"
+      }
+    ],
+    "description": "Alerts when Global Administrator accounts are present whose UPN prefix (before @domain) is not in your approved comma-separated allow list. Toggle per-admin alerts to get one alert per user or a single aggregated alert."
+  },
   {
     "name": "NewRiskyUsers",
     "label": "Alert on new risky users (P2 License Required)",

src/pages/cipp/settings/index.js

@@ -10,6 +10,7 @@ import CippDnsSettings from "/src/components/CippSettings/CippDnsSettings";
 import CippCacheSettings from "/src/components/CippSettings/CippCacheSettings";
 import CippBackupSettings from "/src/components/CippSettings/CippBackupSettings";
 import CippBrandingSettings from "/src/components/CippSettings/CippBrandingSettings";
+import CippBackupRetentionSettings from "/src/components/CippSettings/CippBackupRetentionSettings";
 const Page = () => {
   return (
     <Container sx={{ pt: 3 }} maxWidth="xl">
@@ -29,6 +30,9 @@ const Page = () => {
         <Grid size={{ lg: 4, md: 6, sm: 12, xs: 12 }}>
           <CippBackupSettings />
         </Grid>
+        <Grid size={{ lg: 4, md: 6, sm: 12, xs: 12 }}>
+          <CippBackupRetentionSettings />
+        </Grid>
         <Grid size={{ lg: 4, md: 6, sm: 12, xs: 12 }}>
           <CippBrandingSettings />
         </Grid>

src/pages/endpoint/MEM/devices/index.js

@@ -169,6 +169,38 @@ const Page = () => {
       condition: (row) => row.operatingSystem === "macOS",
       confirmText: "Are you sure you want to retrieve the FileVault key for [deviceName]?",
     },
+    {
+      label: "Reset Passcode",
+      type: "POST",
+      icon: <PasswordOutlined />,
+      url: "/api/ExecDevicePasscodeAction",
+      data: {
+        GUID: "id",
+        Action: "resetPasscode",
+      },
+      condition: (row) =>
+        row.operatingSystem === "iOS" ||
+        row.operatingSystem === "macOS" ||
+        row.operatingSystem === "Android",
+      confirmText:
+        "Are you sure you want to reset the passcode for [deviceName]? A new passcode will be generated and displayed.",
+    },
+    {
+      label: "Remove Passcode",
+      type: "POST",
+      icon: <Password />,
+      url: "/api/ExecDevicePasscodeAction",
+      data: {
+        GUID: "id",
+        Action: "removeDevicePasscode",
+      },
+      condition: (row) =>
+        row.operatingSystem === "iOS" ||
+        row.operatingSystem === "macOS" ||
+        row.operatingSystem === "Android",
+      confirmText:
+        "Are you sure you want to remove the passcode from [deviceName]? This will remove the device passcode requirement.",
+    },
     {
       label: "Windows Defender Full Scan",
       type: "POST",

src/pages/identity/administration/jit-admin/index.js

@@ -5,6 +5,31 @@ import { AdminPanelSettings } from "@mui/icons-material";
 import Link from "next/link";
 
 const Page = () => {
+  const simpleColumns = [
+    "userPrincipalName",
+    "displayName",
+    "accountEnabled",
+    "jitAdminEnabled",
+    "jitAdminStartDate",
+    "jitAdminExpiration",
+    "jitAdminReason",
+    "jitAdminCreatedBy",
+    "memberOf",
+  ];
+
+  const filters = [
+    {
+      filterName: "Active JIT Admins",
+      value: [{ id: "jitAdminEnabled", value: true }],
+      type: "column",
+    },
+    {
+      filterName: "Expired/Disabled",
+      value: [{ id: "jitAdminEnabled", value: false }],
+      type: "column",
+    },
+  ];
+
   return (
     <CippTablePage
       cardButton={
@@ -17,7 +42,8 @@ const Page = () => {
       title="JIT Admin Table"
       apiUrl="/api/ListJITAdmin"
       apiDataKey="Results"
-      simpleColumns={[]}
+      simpleColumns={simpleColumns}
+      filters={filters}
     />
   );
 };