Merge pull request #91 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev
bmsimp · Feb 11, 2025 · 0cc99c2 · 0cc99c2
2 parents 8dbef6f + 384d892
commit 0cc99c2
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 23 deletions.
diff --git a/src/components/CippComponents/CippApiResults.jsx b/src/components/CippComponents/CippApiResults.jsx
@@ -1,9 +1,23 @@
-import { Close } from "@mui/icons-material";
-import { Alert, CircularProgress, Collapse, IconButton, Typography } from "@mui/material";
+import { Close, Download, RouterOutlined } from "@mui/icons-material";
+import {
+  Alert,
+  CircularProgress,
+  Collapse,
+  IconButton,
+  Stack,
+  Typography,
+  Box,
+  SvgIcon,
+  Tooltip,
+} from "@mui/material";
 import { useEffect, useState, useMemo, useCallback } from "react";
 import { getCippError } from "../../utils/get-cipp-error";
 import { CippCopyToClipBoard } from "./CippCopyToClipboard";
-import { Grid } from "@mui/system";
+import React from "react";
+import { CippTableDialog } from "./CippTableDialog";
+import { EyeIcon } from "@heroicons/react/24/outline";
+import { useDialog } from "../../hooks/use-dialog";
+import { useRouter } from "next/router";
 
 const extractAllResults = (data) => {
   const results = [];
@@ -106,6 +120,9 @@ export const CippApiResults = (props) => {
   const [errorVisible, setErrorVisible] = useState(false);
   const [fetchingVisible, setFetchingVisible] = useState(false);
   const [finalResults, setFinalResults] = useState([]);
+  const tableDialog = useDialog();
+  const router = useRouter();
+  const pageTitle = `${document.title} - Results`;
   const correctResultObj = useMemo(() => {
     if (!apiObject.isSuccess) return;
 
@@ -174,12 +191,33 @@ export const CippApiResults = (props) => {
     setFinalResults((prev) => prev.map((r) => (r.id === id ? { ...r, visible: false } : r)));
   }, []);
 
+  const handleDownloadCsv = useCallback(() => {
+    if (!finalResults?.length) return;
+
+    const baseName = document.title.toLowerCase().replace(/[^a-z0-9]/g, "-");
+    const fileName = `${baseName}-results.csv`;
+
+    const headers = Object.keys(finalResults[0]);
+    const rows = finalResults.map((item) =>
+      headers.map((header) => `"${item[header] || ""}"`).join(",")
+    );
+    const csvContent = [headers.join(","), ...rows].join("\n");
+    const blob = new Blob([csvContent], { type: "text/csv;charset=utf-8;" });
+    const url = URL.createObjectURL(blob);
+    const link = document.createElement("a");
+    link.setAttribute("href", url);
+    link.setAttribute("download", fileName);
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+  }, [finalResults, apiObject]);
+
   const hasVisibleResults = finalResults.some((r) => r.visible);
   return (
-    <>
+    <Stack spacing={2}>
       {/* Loading alert */}
       {!errorsOnly && (
-        <Collapse in={fetchingVisible}>
+        <Collapse in={fetchingVisible} unmountOnExit>
           <Alert
             sx={alertSx}
             action={
@@ -203,7 +241,7 @@ export const CippApiResults = (props) => {
       )}
 
       {/* Error alert */}
-      <Collapse in={errorVisible}>
+      <Collapse in={errorVisible} unmountOnExit>
         {apiObject.isError && (
           <Alert
             sx={alertSx}
@@ -227,10 +265,10 @@ export const CippApiResults = (props) => {
 
       {/* Individual result alerts */}
       {apiObject.isSuccess && !errorsOnly && hasVisibleResults && (
-        <Grid container spacing={2}>
+        <>
           {finalResults.map((resultObj) => (
-            <Grid item size={12} key={resultObj.id}>
-              <Collapse in={resultObj.visible}>
+            <React.Fragment key={resultObj.id}>
+              <Collapse in={resultObj.visible} unmountOnExit>
                 <Alert
                   sx={alertSx}
                   variant="filled"
@@ -252,10 +290,35 @@ export const CippApiResults = (props) => {
                   {resultObj.text}
                 </Alert>
               </Collapse>
-            </Grid>
+            </React.Fragment>
           ))}
-        </Grid>
+        </>
+      )}
+      {apiObject.isSuccess || apiObject.isError ? (
+        <Box display="flex" flexDirection="row">
+          <Tooltip title="View Results">
+            <IconButton onClick={() => tableDialog.handleOpen()}>
+              <SvgIcon>
+                <EyeIcon />
+              </SvgIcon>
+            </IconButton>
+          </Tooltip>
+          <Tooltip title="Download Results">
+            <IconButton aria-label="download-csv" onClick={handleDownloadCsv}>
+              <Download />
+            </IconButton>
+          </Tooltip>
+        </Box>
+      ) : null}
+      {tableDialog.open && (
+        <CippTableDialog
+          createDialog={tableDialog}
+          title={pageTitle}
+          data={finalResults}
+          noCard={true}
+          simpleColumns={["severity", "text", "copyField"]}
+        />
       )}
-    </>
+    </Stack>
   );
 };
diff --git a/src/components/CippFormPages/CippJSONView.jsx b/src/components/CippFormPages/CippJSONView.jsx
@@ -189,6 +189,9 @@ function CippJsonView({
   };
 
   useEffect(() => {
+    if (!type && (object?.omaSettings || object?.settings || object?.added)) {
+      type = "intune";
+    }
     const blacklist = [
       "selectedOption",
       "GUID",

diff --git a/src/pages/endpoint/MEM/list-compliance-policies/index.js b/src/pages/endpoint/MEM/list-compliance-policies/index.js
@@ -13,7 +13,7 @@ const Page = () => {
       url: "/api/AddIntuneTemplate",
       data: {
         ID: "id",
-        URLName: "URLName",
+        ODataType: "@odata.type",
       },
       confirmText: "Are you sure you want to create a template based on this policy?",
       icon: <Book />,

diff --git a/src/pages/endpoint/MEM/list-policies/index.js b/src/pages/endpoint/MEM/list-policies/index.js
@@ -13,7 +13,7 @@ const Page = () => {
       url: "/api/AddIntuneTemplate",
       data: {
         ID: "id",
-        URLName: "URLName",
+        ODataType: "@odata.type",
       },
       confirmText: "Are you sure you want to create a template based on this policy?",
       icon: <Book />,

diff --git a/src/pages/tools/community-repos/repo.js b/src/pages/tools/community-repos/repo.js
@@ -28,16 +28,20 @@ const Page = () => {
   const [selectedBranch, setSelectedBranch] = useState(branch);
   const [selectedRepo, setSelectedRepo] = useState(name);
 
-  const searchMutation = ApiPostCall({
-    onResult: (resp) => {
-      if (resp?.Results === null || resp?.Results?.[0] === null) return;
-      setFileResults(resp?.Results || []);
-    },
-  });
-
   const fileQuery = ApiPostCall({
     onResult: (resp) => {
-      setJsonContent(JSON.parse(resp?.Results?.content || "{}"));
+      let content = resp?.Results?.content?.trim() || "{}";
+      // remove non-printable characters from the beginning and end
+      content = content.replace(
+        /^[\u0000-\u001F\u007F-\u009F]+|[\u0000-\u001F\u007F-\u009F]+$/g,
+        ""
+      );
+      try {
+        setJsonContent(JSON.parse(content));
+      } catch (e) {
+        console.error("Invalid JSON content:", e);
+        setJsonContent({});
+      }
     },
   });
 
@@ -171,7 +175,8 @@ const Page = () => {
                     ? { label: selectedBranch, value: selectedBranch }
                     : { label: "Loading branches", value: "" }
                 }
-                onChange={(event, newValue) => {
+                onChange={(newValue) => {
+                  if (newValue.value === selectedBranch) return;
                   setSelectedBranch(newValue.value);
                   updateQueryParams("branch", newValue.value);
                 }}