Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev

KleiDav · Jan 29, 2025 · bb28245 · bb28245
2 parents be8d2cf + 9a403c2
commit bb28245
Show file tree

Hide file tree

Showing 30 changed files with 235 additions and 269 deletions.
diff --git a/generate-placeholders.js b/generate-placeholders.js
@@ -35,11 +35,11 @@ const pages = [
   { title: "Backup Wizard", path: "/tenant/backup/backup-wizard" },
   { title: "Restore Wizard", path: "/tenant/backup/restore-wizard" },
   { title: "Tools", path: "/tenant/administration" },
-  { title: "Graph Explorer", path: "/tenant/administration/graph-explorer" },
-  { title: "Application Approval", path: "/tenant/administration/appapproval" },
+  { title: "Graph Explorer", path: "/tenant/tools/graph-explorer" },
+  { title: "Application Approval", path: "/tenant/tools/appapproval" },
   { title: "IP Database", path: "/tenant/tools/geoiplookup" },
   { title: "Tenant Lookup", path: "/tenant/administration/tenantlookup" },
-  { title: "Individual Domain Check", path: "/tenant/standards/individual-domains" },
+  { title: "Individual Domain Check", path: "/tenant/tools/individual-domains" },
   { title: "BPA Report Builder", path: "/tenant/tools/bpa-report-builder" },
   { title: "Standards", path: "/tenant/standards" },
   { title: "Edit Standards", path: "/tenant/standards/list-applied-standards" },
@@ -82,7 +82,7 @@ const pages = [
   { title: "Add Profile", path: "/endpoint/autopilot/add-profile" },
   { title: "Status Pages", path: "/endpoint/autopilot/list-status-pages" },
   { title: "Add Status Page", path: "/endpoint/autopilot/add-status-page" },
-  { title: "Devices", path: "/endpoint/reports/devices" },
+  { title: "Devices", path: "/endpoint/MEM/devices" },
   { title: "Configuration Policies", path: "/endpoint/MEM/list-policies" },
   { title: "Compliance Policies", path: "/endpoint/MEM/list-compliance-policies" },
   { title: "Protection Policies", path: "/endpoint/MEM/list-appprotection-policies" },
@@ -108,9 +108,9 @@ const pages = [
   { title: "Transport rules", path: "/email/transport/list-rules" },
   { title: "Deploy Transport rule", path: "/email/transport/deploy-rules" },
   { title: "Transport Templates", path: "/email/transport/list-templates" },
-  { title: "Connectors", path: "/email/connectors/list-connectors" },
+  { title: "Connectors", path: "/email/transport/list-connectors" },
   { title: "Deploy Connector Templates", path: "/email/connectors/deploy-connector" },
-  { title: "Connector Templates", path: "/email/connectors/list-connector-templates" },
+  { title: "Connector Templates", path: "/email/transport/list-connector-templates" },
   { title: "Spamfilter", path: "/email/spamfilter/list-spamfilter" },
   { title: "Apply Spamfilter Template", path: "/email/spamfilter/deploy" },
   { title: "Templates", path: "/email/spamfilter/list-templates" },

diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   },
   "license": "AGPL-3.0",
   "engines": {
-    "node": "^18.17.0"
+    "node": "^20.18.2"
   },
   "repository": {
     "type": "git",

diff --git a/src/components/CippComponents/CippUserActions.jsx b/src/components/CippComponents/CippUserActions.jsx
@@ -98,6 +98,7 @@ export const CippUserActions = () => {
             { label: "Disabled", value: "Disabled" },
           ],
           multiple: false,
+          creatable: false,
         },
       ],
       confirmText: "Are you sure you want to set per-user MFA for these users?",

diff --git a/src/layouts/config.js b/src/layouts/config.js
@@ -154,15 +154,15 @@ export const nativeMenuItems = [
         items: [
           {
             title: "Licence Report",
-            path: "/tenant/administration/list-licenses",
+            path: "/tenant/reports/list-licenses",
           },
           {
             title: "Sherweb Licence Report",
-            path: "/tenant/administration/list-csp-licenses",
+            path: "/tenant/reports/list-csp-licenses",
           },
           {
             title: "Consented Applications",
-            path: "/tenant/administration/application-consent",
+            path: "/tenant/reports/application-consent",
           },
         ],
       },
@@ -244,7 +244,7 @@ export const nativeMenuItems = [
         title: "Device Management",
         path: "/endpoint/MEM",
         items: [
-          { title: "Devices", path: "/endpoint/reports/devices" },
+          { title: "Devices", path: "/endpoint/MEM/devices" },
           { title: "Configuration Policies", path: "/endpoint/MEM/list-policies" },
           { title: "Compliance Policies", path: "/endpoint/MEM/list-compliance-policies" },
           { title: "Protection Policies", path: "/endpoint/MEM/list-appprotection-policies" },
@@ -300,7 +300,7 @@ export const nativeMenuItems = [
     items: [
       {
         title: "Administration",
-        path: "/email/Administration",
+        path: "/email/administration",
         items: [
           { title: "Mailboxes", path: "/email/administration/mailboxes" },
           { title: "Deleted Mailboxes", path: "/email/administration/deleted-mailboxes" },
@@ -315,17 +315,17 @@ export const nativeMenuItems = [
       },
       {
         title: "Transport",
-        path: "/email/Transport",
+        path: "/email/transport",
         items: [
           { title: "Transport rules", path: "/email/transport/list-rules" },
           {
             title: "Transport Templates",
             path: "/email/transport/list-templates",
           },
-          { title: "Connectors", path: "/email/connectors/list-connectors" },
+          { title: "Connectors", path: "/email/transport/list-connectors" },
           {
             title: "Connector Templates",
-            path: "/email/connectors/list-connector-templates",
+            path: "/email/transport/list-connector-templates",
           },
         ],
       },
@@ -335,8 +335,11 @@ export const nativeMenuItems = [
         items: [
           { title: "Spamfilter", path: "/email/spamfilter/list-spamfilter" },
           { title: "Spamfilter templates", path: "/email/spamfilter/list-templates" },
-          { title: "Connection filter", path: "/email/connectionfilter/list-connectionfilter" },
-          { title: "Connection filter templates", path: "/email/connectionfilter/list-templates" },
+          { title: "Connection filter", path: "/email/spamfilter/list-connectionfilter" },
+          {
+            title: "Connection filter templates",
+            path: "/email/spamfilter/list-connectionfilter-templates",
+          },
         ],
       },
       {
@@ -399,19 +402,19 @@ export const nativeMenuItems = [
         items: [
           {
             title: "Graph Explorer",
-            path: "/tenant/administration/graph-explorer",
+            path: "/tenant/tools/graph-explorer",
           },
           {
             title: "Application Approval",
-            path: "/tenant/administration/appapproval",
+            path: "/tenant/tools/appapproval",
           },
           { title: "Tenant Lookup", path: "/tenant/tools/tenantlookup" },
 
           { title: "IP Database", path: "/tenant/tools/geoiplookup" },
 
           {
             title: "Individual Domain Check",
-            path: "/tenant/standards/individual-domains",
+            path: "/tenant/tools/individual-domains",
           },
         ],
       },

diff --git a/src/pages/email/connectionfilter/deploy/index.js b/src/pages/email/connectionfilter/deploy/index.js
diff --git a/src/pages/email/connectors/deploy-connector/index.js b/src/pages/email/connectors/deploy-connector/index.js
diff --git a/src/pages/email/spamfilter/deploy/index.js b/src/pages/email/spamfilter/deploy/index.js
diff --git a/.../connectionfilter/list-templates/index.js → .../list-connectionfilter-templates/index.js b/.../connectionfilter/list-templates/index.js → .../list-connectionfilter-templates/index.js
diff --git a/...ctionfilter/list-connectionfilter/add.jsx → .../spamfilter/list-connectionfilter/add.jsx b/...ctionfilter/list-connectionfilter/add.jsx → .../spamfilter/list-connectionfilter/add.jsx
diff --git a/...tionfilter/list-connectionfilter/index.js → ...spamfilter/list-connectionfilter/index.js b/...tionfilter/list-connectionfilter/index.js → ...spamfilter/list-connectionfilter/index.js
@@ -1,6 +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 Link from "next/link";
 
 const Page = () => {
@@ -14,6 +15,7 @@ const Page = () => {
       dataFunction: (data) => {
         return { ...data };
       },
+      icon: <Book />,
       confirmText: "Are you sure you want to create a template based on this rule?",
     },
   ];
@@ -32,13 +34,7 @@ const Page = () => {
     actions: actions,
   };
 
-  const simpleColumns = [
-    "Name",
-    "IsDefault",
-    "IPAllowList",
-    "IPBlockList",
-    "EnableSafeList",
-  ];
+  const simpleColumns = ["Name", "IsDefault", "IPAllowList", "IPBlockList", "EnableSafeList"];
 
   return (
     <CippTablePage
@@ -49,7 +45,7 @@ const Page = () => {
       simpleColumns={simpleColumns}
       cardButton={
         <>
-          <Button component={Link} href="/email/connectionfilter/list-connectionfilter/add">
+          <Button component={Link} href="/email/spamfilter/list-connectionfilter/add">
             Deploy ConnectionFilter
           </Button>
         </>

diff --git a/...nectors/list-connector-templates/index.js → ...ansport/list-connector-templates/index.js b/...nectors/list-connector-templates/index.js → ...ansport/list-connector-templates/index.js
diff --git a/.../email/connectors/list-connectors/add.jsx → ...s/email/transport/list-connectors/add.jsx b/.../email/connectors/list-connectors/add.jsx → ...s/email/transport/list-connectors/add.jsx
diff --git a/...email/connectors/list-connectors/index.js → .../email/transport/list-connectors/index.js b/...email/connectors/list-connectors/index.js → .../email/transport/list-connectors/index.js
@@ -83,7 +83,7 @@ const Page = () => {
       }}
       cardButton={
         <>
-          <Button component={Link} href="/email/connectors/list-connectors/add">
+          <Button component={Link} href="/email/transport/list-connectors/add">
             Deploy Connector
           </Button>
         </>

diff --git a/src/pages/endpoint/reports/devices/index.js → src/pages/endpoint/MEM/devices/index.js b/src/pages/endpoint/reports/devices/index.js → src/pages/endpoint/MEM/devices/index.js
diff --git a/src/pages/endpoint/autopilot/add-status-page/index.js b/src/pages/endpoint/autopilot/add-status-page/index.js
@@ -1,14 +1,120 @@
-
+import React from "react";
+import { Grid, Divider } 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 { CippFormTenantSelector } from "/src/components/CippComponents/CippFormTenantSelector";
 
 const Page = () => {
-  const pageTitle = "Add Status Page";
+  const formControl = useForm({
+    mode: "onChange",
+    defaultValues: {
+      TimeOutInMinutes: "",
+      ErrorMessage: "",
+      ShowProgress: false,
+      EnableLog: false,
+      OBEEOnly: false,
+      blockDevice: false,
+      Allowretry: false,
+      AllowReset: false,
+      AllowFail: false,
+    },
+  });
 
   return (
-    <div>
-      <h1>{pageTitle}</h1>
-      <p>This is a placeholder page for the add status page section.</p>
-    </div>
+    <CippFormPage
+      resetForm={false}
+      queryKey="Autopilot Status Pages"
+      title="Autopilot Status Page Wizard"
+      formControl={formControl}
+      postUrl="/api/AddEnrollment"
+      backButtonTitle="Autopilot Status Pages"
+    >
+      <Grid container spacing={2}>
+        {/* Tenant Selector */}
+        <Grid item xs={12}>
+          <CippFormTenantSelector
+            label="Select Tenants"
+            formControl={formControl}
+            name="selectedTenants"
+            type="multiple"
+            allTenants={true}
+            validators={{ required: "At least one tenant must be selected" }}
+          />
+        </Grid>
+
+        <Divider sx={{ my: 2 }} />
+
+        {/* Form Fields */}
+        <Grid item xs={12} md={6}>
+          <CippFormComponent
+            type="textField"
+            label="Timeout in minutes"
+            name="TimeOutInMinutes"
+            formControl={formControl}
+            placeholder="60"
+            validators={{ required: "Timeout is required" }}
+          />
+        </Grid>
+
+        <Grid item xs={12}>
+          <CippFormComponent
+            type="textField"
+            label="Custom Error Message"
+            name="ErrorMessage"
+            formControl={formControl}
+            placeholder="Leave blank to not set."
+          />
+        </Grid>
+
+        {/* Switches */}
+        <Grid item xs={12}>
+          <CippFormComponent
+            type="switch"
+            label="Show progress to users"
+            name="ShowProgress"
+            formControl={formControl}
+          />
+          <CippFormComponent
+            type="switch"
+            label="Turn on log collection"
+            name="EnableLog"
+            formControl={formControl}
+          />
+          <CippFormComponent
+            type="switch"
+            label="Show status page only with OOBE setup"
+            name="OBEEOnly"
+            formControl={formControl}
+          />
+          <CippFormComponent
+            type="switch"
+            label="Block device usage during setup"
+            name="blockDevice"
+            formControl={formControl}
+          />
+          <CippFormComponent
+            type="switch"
+            label="Allow retry"
+            name="Allowretry"
+            formControl={formControl}
+          />
+          <CippFormComponent
+            type="switch"
+            label="Allow reset"
+            name="AllowReset"
+            formControl={formControl}
+          />
+          <CippFormComponent
+            type="switch"
+            label="Allow users to use device if setup fails"
+            name="AllowFail"
+            formControl={formControl}
+          />
+        </Grid>
+      </Grid>
+    </CippFormPage>
   );
 };