Merge pull request #3542 from KelvinTegelaar/dev

Dev to hotfix

Author: JohnDuprey

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" },

package.json

@@ -1,14 +1,14 @@
 {
   "name": "cipp",
-  "version": "7.0.0",
+  "version": "7.1.3",
   "author": "CIPP Contributors",
   "homepage": "https://cipp.app/",
   "bugs": {
     "url": "https://github.com/KelvinTegelaar/CIPP/issues"
   },
   "license": "AGPL-3.0",
   "engines": {
-    "node": "^18.17.0"
+    "node": "^20.18.1"
   },
   "repository": {
     "type": "git",

public/assets/integrations/github.png

@@ -1,3 +1,3 @@
 {
-  "version": "7.1.2"
+  "version": "7.1.3"
 }

public/assets/integrations/github_dark.png

@@ -91,6 +91,11 @@ export const CippUserInfoCard = (props) => {
             )
           }
         />
+        <PropertyListItem
+          divider
+          label="User ID"
+          value={isFetching ? <Skeleton variant="text" width={120} /> : user?.id || "N/A"}
+        />
         <PropertyListItem
           divider
           label="Email Address"

public/version.json

@@ -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") {

src/components/CippCards/CippUserInfoCard.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?",

src/components/CippComponents/CippApiDialog.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>

src/components/CippComponents/CippUserActions.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,