[pull] main from KelvinTegelaar:main

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "8.7.0",
+  "version": "8.7.1",
   "author": "CIPP Contributors",
   "homepage": "https://cipp.app/",
   "bugs": {
@@ -89,8 +89,6 @@
     "react-leaflet": "5.0.0",
     "react-leaflet-markercluster": "^5.0.0-rc.0",
     "react-markdown": "10.1.0",
-    "rehype-raw": "^7.0.0",
-    "remark-gfm": "^3.0.1",
     "react-media-hook": "^0.5.0",
     "react-papaparse": "^4.4.0",
     "react-quill": "^2.0.0",
@@ -103,6 +101,8 @@
     "redux-devtools-extension": "2.13.9",
     "redux-persist": "^6.0.0",
     "redux-thunk": "3.1.0",
+    "rehype-raw": "^7.0.0",
+    "remark-gfm": "^3.0.1",
     "simplebar": "6.3.2",
     "simplebar-react": "3.3.2",
     "stylis-plugin-rtl": "2.1.1",
@@ -114,4 +114,4 @@
     "eslint": "9.35.0",
     "eslint-config-next": "15.5.2"
   }
-}
+}

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "8.7.0"
-}
+  "version": "8.7.1"
+}

src/components/CippCards/CippPageCard.jsx

@@ -25,27 +25,12 @@ const CippPageCard = (props) => {
       <Box
         sx={{
           flexGrow: 1,
-          py: 4,
+          pb: 4,
         }}
       >
         <Container maxWidth={cardSize}>
           <Stack spacing={2}>
             <Stack spacing={2}>
-              <div>
-                {!hideBackButton && (
-                  <Button
-                    color="inherit"
-                    onClick={handleBackClick} // Go back to the previous page
-                    startIcon={
-                      <SvgIcon fontSize="small">
-                        <ArrowLeftIcon />
-                      </SvgIcon>
-                    }
-                  >
-                    {backButtonTitle}
-                  </Button>
-                )}
-              </div>
               {hideTitleText !== true && (
                 <div>
                   <Typography variant="h4">{title}</Typography>

src/components/CippComponents/CippApiDialog.jsx

@@ -41,7 +41,7 @@ export const CippApiDialog = (props) => {
   }
 
   const formHook = useForm({
-    defaultValues: defaultvalues || {},
+    defaultValues: typeof defaultvalues === "function" ? defaultvalues(row) : defaultvalues || {},
     mode: "onChange", // Enable real-time validation
   });
 

src/components/CippComponents/CippApiLogsDrawer.jsx

@@ -10,6 +10,7 @@ export const CippApiLogsDrawer = ({
   apiFilter = null,
   tenantFilter = null,
   standardFilter = null,
+  scheduledTaskFilter = null,
   requiredPermissions = [],
   PermissionButton = Button,
   title = "API Logs",
@@ -28,7 +29,9 @@ export const CippApiLogsDrawer = ({
   // Build the API URL with the filter
   const apiUrl = `/api/ListLogs?Filter=true${apiFilter ? `&API=${apiFilter}` : ""}${
     tenantFilter ? `&Tenant=${tenantFilter}` : ""
-  }${standardFilter ? `&StandardTemplateId=${standardFilter}` : ""}`;
+  }${standardFilter ? `&StandardTemplateId=${standardFilter}` : ""}${
+    scheduledTaskFilter ? `&ScheduledTaskId=${scheduledTaskFilter}` : ""
+  }`;
 
   // Define the columns for the logs table
   const simpleColumns = [
@@ -74,7 +77,9 @@ export const CippApiLogsDrawer = ({
               url: apiUrl,
               dataKey: "",
             }}
-            queryKey={`APILogs-${apiFilter || "All"}`}
+            queryKey={`APILogs-${apiFilter || "All"}-${tenantFilter || "AllTenants"}-${
+              standardFilter || "NoStandard"
+            }-${scheduledTaskFilter || "NoTask"}`}
             simpleColumns={simpleColumns}
             exportEnabled={true}
             offCanvas={{

src/components/CippComponents/CippApiResults.jsx

@@ -158,8 +158,27 @@ export const CippApiResults = (props) => {
 
   const allResults = useMemo(() => {
     const apiResults = extractAllResults(correctResultObj);
+
+    // Also extract error results if there's an error
+    if (apiObject.isError && apiObject.error) {
+      const errorResults = extractAllResults(apiObject.error.response.data);
+      if (errorResults.length > 0) {
+        // Mark all error results with error severity and merge with success results
+        return [...apiResults, ...errorResults.map((r) => ({ ...r, severity: "error" }))];
+      }
+
+      // Fallback to getCippError if extraction didn't work
+      const processedError = getCippError(apiObject.error);
+      if (typeof processedError === "string") {
+        return [
+          ...apiResults,
+          { text: processedError, copyField: processedError, severity: "error" },
+        ];
+      }
+    }
+
     return apiResults;
-  }, [correctResultObj]);
+  }, [correctResultObj, apiObject.isError, apiObject.error]);
 
   useEffect(() => {
     setErrorVisible(!!apiObject.isError);
@@ -250,31 +269,8 @@ export const CippApiResults = (props) => {
           </Alert>
         </Collapse>
       )}
-      {/* Error alert */}
-      <Collapse in={errorVisible} unmountOnExit>
-        {apiObject.isError && (
-          <Alert
-            sx={alertSx}
-            variant="filled"
-            severity="error"
-            action={
-              <IconButton
-                aria-label="close"
-                color="inherit"
-                size="small"
-                onClick={() => setErrorVisible(false)}
-              >
-                <Close fontSize="inherit" />
-              </IconButton>
-            }
-          >
-            {getCippError(apiObject.error)}
-          </Alert>
-        )}
-      </Collapse>
-
       {/* Individual result alerts */}
-      {apiObject.isSuccess && !errorsOnly && hasVisibleResults && (
+      {hasVisibleResults && (
         <>
           {finalResults.map((resultObj) => (
             <React.Fragment key={resultObj.id}>

src/components/CippComponents/CippAutocomplete.jsx

@@ -5,6 +5,7 @@ import {
   createFilterOptions,
   TextField,
   IconButton,
+  Tooltip,
 } from "@mui/material";
 import { useEffect, useState, useMemo, useCallback, useRef } from "react";
 import { useSettings } from "../../hooks/use-settings";
@@ -89,6 +90,7 @@ export const CippAutoComplete = (props) => {
   const [offCanvasVisible, setOffCanvasVisible] = useState(false);
   const [fullObject, setFullObject] = useState(null);
   const [internalValue, setInternalValue] = useState(null); // Track selected value internally
+  const [open, setOpen] = useState(false); // Control popover open state
 
   // Sync internalValue when external value or defaultValue prop changes (e.g., when editing a form)
   useEffect(() => {
@@ -295,6 +297,15 @@ export const CippAutoComplete = (props) => {
       <Autocomplete
         ref={autocompleteRef}
         key={stableKey}
+        open={open}
+        onOpen={() => setOpen(true)}
+        onClose={(event, reason) => {
+          // Keep open if Tab was used in multiple mode
+          if (reason === "selectOption" && multiple && event?.type === "click") {
+            return;
+          }
+          setOpen(false);
+        }}
         disabled={disabled || actionGetRequest.isFetching || isFetching}
         popupIcon={
           actionGetRequest.isFetching || isFetching ? (
@@ -425,6 +436,17 @@ export const CippAutoComplete = (props) => {
               event.preventDefault();
               // Trigger a click on the highlighted option
               highlightedOption.click();
+
+              // In multiple mode, keep the popover open and refocus
+              if (multiple) {
+                setTimeout(() => {
+                  setOpen(true);
+                  const input = autocompleteRef.current?.querySelector("input");
+                  if (input) {
+                    input.focus();
+                  }
+                }, 50);
+              }
             }
           }
         }}
@@ -439,79 +461,83 @@ export const CippAutoComplete = (props) => {
               {...other}
             />
             {api?.url && api?.showRefresh && (
-              <IconButton
-                size="small"
-                onClick={() => {
-                  actionGetRequest.refetch();
-                }}
-              >
-                <Sync />
-              </IconButton>
+              <Tooltip title="Refresh">
+                <IconButton
+                  size="small"
+                  onClick={() => {
+                    actionGetRequest.refetch();
+                  }}
+                >
+                  <Sync />
+                </IconButton>
+              </Tooltip>
             )}
             {api?.templateView && (
-              <IconButton
-                size="small"
-                onClick={() => {
-                  // Use internalValue if value prop is not available
-                  const currentValue = value || internalValue;
-
-                  // Get the full object from the selected value
-                  if (multiple) {
-                    // For multiple selection, get all full objects
-                    const fullObjects = currentValue
-                      .map((v) => {
-                        const valueToFind = v?.value || v;
-                        const found = usedOptions.find((opt) => opt.value === valueToFind);
-                        let rawData = found?.rawData;
-
-                        // If property is specified, extract and parse JSON from that property
-                        if (rawData && api?.templateView?.property) {
-                          try {
-                            const propertyValue = rawData[api.templateView.property];
-                            if (typeof propertyValue === "string") {
-                              rawData = JSON.parse(propertyValue);
-                            } else {
-                              rawData = propertyValue;
+              <Tooltip title={`View ${api?.templateView.title}` || "View details"}>
+                <IconButton
+                  size="small"
+                  onClick={() => {
+                    // Use internalValue if value prop is not available
+                    const currentValue = value || internalValue;
+
+                    // Get the full object from the selected value
+                    if (multiple) {
+                      // For multiple selection, get all full objects
+                      const fullObjects = currentValue
+                        .map((v) => {
+                          const valueToFind = v?.value || v;
+                          const found = usedOptions.find((opt) => opt.value === valueToFind);
+                          let rawData = found?.rawData;
+
+                          // If property is specified, extract and parse JSON from that property
+                          if (rawData && api?.templateView?.property) {
+                            try {
+                              const propertyValue = rawData[api.templateView.property];
+                              if (typeof propertyValue === "string") {
+                                rawData = JSON.parse(propertyValue);
+                              } else {
+                                rawData = propertyValue;
+                              }
+                            } catch (e) {
+                              console.error("Failed to parse JSON from property:", e);
+                              // Keep original rawData if parsing fails
                             }
-                          } catch (e) {
-                            console.error("Failed to parse JSON from property:", e);
-                            // Keep original rawData if parsing fails
                           }
-                        }
 
-                        return rawData;
-                      })
-                      .filter(Boolean);
-                    setFullObject(fullObjects);
-                  } else {
-                    // For single selection, get the full object
-                    const valueToFind = currentValue?.value || currentValue;
-                    const selectedOption = usedOptions.find((opt) => opt.value === valueToFind);
-                    let rawData = selectedOption?.rawData || null;
-
-                    // If property is specified, extract and parse JSON from that property
-                    if (rawData && api?.templateView?.property) {
-                      try {
-                        const propertyValue = rawData[api.templateView.property];
-                        if (typeof propertyValue === "string") {
-                          rawData = JSON.parse(propertyValue);
-                        } else {
-                          rawData = propertyValue;
+                          return rawData;
+                        })
+                        .filter(Boolean);
+                      setFullObject(fullObjects);
+                    } else {
+                      // For single selection, get the full object
+                      const valueToFind = currentValue?.value || currentValue;
+                      const selectedOption = usedOptions.find((opt) => opt.value === valueToFind);
+                      let rawData = selectedOption?.rawData || null;
+
+                      // If property is specified, extract and parse JSON from that property
+                      if (rawData && api?.templateView?.property) {
+                        try {
+                          const propertyValue = rawData[api.templateView.property];
+                          if (typeof propertyValue === "string") {
+                            rawData = JSON.parse(propertyValue);
+                          } else {
+                            rawData = propertyValue;
+                          }
+                        } catch (e) {
+                          console.error("Failed to parse JSON from property:", e);
+                          // Keep original rawData if parsing fails
                         }
-                      } catch (e) {
-                        console.error("Failed to parse JSON from property:", e);
-                        // Keep original rawData if parsing fails
                       }
-                    }
 
-                    setFullObject(rawData);
-                  }
-                  setOffCanvasVisible(true);
-                }}
-                title={api?.templateView.title || "View details"}
-              >
-                <Visibility />
-              </IconButton>
+                      setFullObject(rawData);
+                    }
+                    setOffCanvasVisible(true);
+                  }}
+                  title={api?.templateView.title || "View details"}
+                >
+                  <Visibility />
+                </IconButton>
+              </Tooltip>
             )}
           </Stack>
         )}