Merge pull request #701 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

src/data/Extensions.json

@@ -274,7 +274,7 @@
     "links": [
       {
         "name": "HaloPSA Documentation",
-        "url": "https://halopsa.com/guides/"
+        "url": "https://usehalo.com/halopsa/guides/2697"
       }
     ],
     "SettingOptions": [

src/data/alerts.json

@@ -187,6 +187,41 @@
     "label": "Alert on device compliance issues",
     "recommendedRunInterval": "4h"
   },
+  {
+    "name": "IntunePolicyConflicts",
+    "label": "Alert on Intune policy or app conflicts/errors",
+    "recommendedRunInterval": "4h",
+    "requiresInput": true,
+    "multipleInput": true,
+    "inputs": [
+      {
+        "inputType": "switch",
+        "inputLabel": "Alert per issue (off = aggregated)",
+        "inputName": "AlertEachIssue"
+      },
+      {
+        "inputType": "switch",
+        "inputLabel": "Include policy status issues",
+        "inputName": "IncludePolicies"
+      },
+      {
+        "inputType": "switch",
+        "inputLabel": "Include app install issues",
+        "inputName": "IncludeApplications"
+      },
+      {
+        "inputType": "switch",
+        "inputLabel": "Alert on conflicts",
+        "inputName": "AlertConflicts"
+      },
+      {
+        "inputType": "switch",
+        "inputLabel": "Alert on errors/failures",
+        "inputName": "AlertErrors"
+      }
+    ],
+    "description": "Monitors Intune policy assignment states and app install statuses for conflicts or errors. Defaults to aggregated alerts with all mechanisms enabled and both conflicts and errors included."
+  },
   {
     "name": "BreachAlert",
     "label": "Alert on (new) potentially breached passwords. Generates an alert if a password is found to be breached.",

src/pages/dashboardv2/identity/index.js

@@ -1,14 +1,4 @@
-import React from "react";
-import {
-  Container,
-  Typography,
-  Card,
-  CardContent,
-  CardHeader,
-  Box,
-  Stack,
-  Chip,
-} from "@mui/material";
+import { Container } from "@mui/material";
 import { TabbedLayout } from "/src/layouts/TabbedLayout";
 import { Layout as DashboardLayout } from "/src/layouts/index.js";
 import tabOptions from "../tabOptions";
@@ -34,47 +24,6 @@ const Page = () => {
   const identityTests =
     testsApi.data?.TestResults?.filter((test) => test.TestType === "Identity") || [];
 
-  const getStatusColor = (status) => {
-    switch (status?.toLowerCase()) {
-      case "passed":
-        return "success";
-      case "failed":
-        return "error";
-      case "investigate":
-        return "warning";
-      case "skipped":
-        return "default";
-      default:
-        return "default";
-    }
-  };
-
-  const getRiskColor = (risk) => {
-    switch (risk?.toLowerCase()) {
-      case "high":
-        return "error";
-      case "medium":
-        return "warning";
-      case "low":
-        return "info";
-      default:
-        return "default";
-    }
-  };
-
-  const getImpactColor = (impact) => {
-    switch (impact?.toLowerCase()) {
-      case "high":
-        return "error";
-      case "medium":
-        return "warning";
-      case "low":
-        return "info";
-      default:
-        return "default";
-    }
-  };
-
   const offCanvas = {
     size: "lg",
     children: (row) => <CippTestDetailOffCanvas row={row} />,