Merge pull request #630 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "8.7.0",
+  "version": "8.7.1",
   "author": "CIPP Contributors",
   "homepage": "https://cipp.app/",
   "bugs": {
@@ -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/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={{