fix query key

tidy up audit log searches page

Author: JohnDuprey

src/hooks/use-guid-resolver.js

@@ -98,8 +98,9 @@ const findGuids = (obj, guidsSet = new Set(), partnerGuidsMap = new Map()) => {
   return { guidsSet, partnerGuidsMap };
 };
 
-export const useGuidResolver = () => {
+export const useGuidResolver = (manualTenant = null) => {
   const tenantFilter = useSettings().currentTenant;
+  const activeTenant = manualTenant || tenantFilter;
 
   // GUID resolution state
   const [guidMapping, setGuidMapping] = useState({});
@@ -195,7 +196,7 @@ export const useGuidResolver = () => {
               directoryObjectsMutation.mutate({
                 url: "/api/ListDirectoryObjects",
                 data: {
-                  tenantFilter: tenantFilter,
+                  tenantFilter: activeTenant,
                   ids: guidsToSend,
                   $select: "id,displayName,userPrincipalName,mail",
                 },
@@ -249,7 +250,7 @@ export const useGuidResolver = () => {
         setIsLoadingGuids(false);
       }
     },
-    [guidMapping, tenantFilter] // Only depend on guidMapping and tenantFilter
+    [guidMapping, activeTenant] // Only depend on guidMapping and activeTenant
   );
 
   return {

src/pages/tenant/administration/audit-logs/search-results.js

@@ -1,11 +1,10 @@
 import { useRouter } from "next/router";
 import { useState, useEffect } from "react";
 import { Layout as DashboardLayout } from "/src/layouts/index.js";
-import { TabbedLayout } from "/src/layouts/TabbedLayout";
 import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx";
-import { EyeIcon } from "@heroicons/react/24/outline";
+import { EyeIcon, ArrowLeftIcon } from "@heroicons/react/24/outline";
 import CippAuditLogDetails from "/src/components/CippComponents/CippAuditLogDetails.jsx";
-import tabOptions from "./tabOptions.json";
+import { Button, SvgIcon } from "@mui/material";
 
 const searchResultsColumns = [
   "createdDateTime",
@@ -41,6 +40,10 @@ const Page = () => {
 
   const pageTitle = searchName ? `${searchName}` : `Search Results - ${searchId}`;
 
+  const handleBackClick = () => {
+    router.push("/tenant/administration/audit-logs/searches");
+  };
+
   // Define offcanvas configuration with larger size for audit log details
   const offcanvas = {
     title: "Audit Log Details",
@@ -51,6 +54,20 @@ const Page = () => {
   return (
     <CippTablePage
       title={pageTitle}
+      cardButton={
+        <Button
+          variant="outlined"
+          color="primary"
+          onClick={handleBackClick}
+          startIcon={
+            <SvgIcon fontSize="small">
+              <ArrowLeftIcon />
+            </SvgIcon>
+          }
+        >
+          Back to Searches
+        </Button>
+      }
       apiUrl="/api/ListAuditLogSearches"
       apiDataKey="Results"
       simpleColumns={searchResultsColumns}
@@ -65,10 +82,6 @@ const Page = () => {
   );
 };
 
-Page.getLayout = (page) => (
-  <DashboardLayout>
-    <TabbedLayout tabOptions={tabOptions}>{page}</TabbedLayout>
-  </DashboardLayout>
-);
+Page.getLayout = (page) => <DashboardLayout>{page}</DashboardLayout>;
 
 export default Page;

src/pages/tenant/administration/audit-logs/searches.js

@@ -12,6 +12,7 @@ import { Grid } from "@mui/system";
 import { Add } from "@mui/icons-material";
 import { useDialog } from "/src/hooks/use-dialog";
 import tabOptions from "./tabOptions.json";
+import { useSettings } from "/src/hooks/use-settings";
 
 const simpleColumns = ["displayName", "status", "filterStartDateTime", "filterEndDateTime"];
 
@@ -41,6 +42,7 @@ const actions = [
 
 const Page = () => {
   const createSearchDialog = useDialog();
+  const currentTenant = useSettings().currentTenant;
 
   const filterControl = useForm({
     mode: "onChange",
@@ -460,7 +462,9 @@ const Page = () => {
         apiUrl={apiUrlWithFilters}
         apiDataKey="Results"
         simpleColumns={simpleColumns}
-        queryKey="AuditLogSearches"
+        queryKey={`AuditLogSearches-${filterControl.getValues().StatusFilter?.value || "All"}-${
+          filterControl.getValues().DateFilter?.value || "AllTime"
+        }-${currentTenant}`}
         actions={actions}
         cardButton={
           <Button