fix menu error and tenant filter change

OITApps · Dec 19, 2024 · 8d8bbe3 · 8d8bbe3
1 parent e74cae0
commit 8d8bbe3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/src/components/CippTable/CIPPTableToptoolbar.js b/src/components/CippTable/CIPPTableToptoolbar.js
@@ -174,7 +174,7 @@ export const CIPPTableToptoolbar = ({
         const selectedColumns = filter.$select.split(",");
         setSimpleColumns(selectedColumns);
         const setNestedVisibility = (col) => {
-          if (typeof col === 'object' && col !== null) {
+          if (typeof col === "object" && col !== null) {
             Object.keys(col).forEach((key) => {
               if (usedColumns.includes(key.trim())) {
                 setColumnVisibility((prev) => ({ ...prev, [key.trim()]: true }));
@@ -310,6 +310,17 @@ export const CIPPTableToptoolbar = ({
               <MenuItem onClick={() => setTableFilter("", "reset", "")}>
                 <ListItemText primary="Reset all filters" />
               </MenuItem>
+              {api?.url === "/api/ListGraphRequest" && (
+                <MenuItem
+                  onClick={() => {
+                    setFilterCanvasVisible(true);
+                    filterPopover.handleClose();
+                  }}
+                >
+                  <ListItemText primary="Edit filters" />
+                </MenuItem>
+              )}
+              <Divider />
               {filterList?.map((filter) => (
                 <MenuItem
                   key={filter.id}
@@ -318,19 +329,6 @@ export const CIPPTableToptoolbar = ({
                   <ListItemText primary={filter.filterName} />
                 </MenuItem>
               ))}
-              {api?.url === "/api/ListGraphRequest" && (
-                <>
-                  <Divider />
-                  <MenuItem
-                    onClick={() => {
-                      setFilterCanvasVisible(true);
-                      filterPopover.handleClose();
-                    }}
-                  >
-                    <ListItemText primary="Edit filters" />
-                  </MenuItem>
-                </>
-              )}
             </Menu>
             <MRT_ToggleFiltersButton table={table} />
             <Tooltip title="Toggle Column Visibility">

diff --git a/src/components/CippTable/CippDataTable.js b/src/components/CippTable/CippDataTable.js
@@ -75,6 +75,13 @@ export const CippDataTable = (props) => {
     }
   }, [data, api?.url]);
 
+  useEffect(() => {
+    if (api?.url) {
+      setInitialApi(api);
+      getRequestData.refetch();
+    }
+  }, [api?.url, api?.data]);
+
   useEffect(() => {
     if (getRequestData.isSuccess && !getRequestData.isFetching) {
       const lastPage = getRequestData.data?.pages[getRequestData.data.pages.length - 1];