Merge pull request #142 from KelvinTegelaar/main

[pull] main from KelvinTegelaar:main

Author: pull[bot]

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "7.3.0"
+  "version": "7.3.1"
 }

src/components/CippComponents/CippTenantSelector.jsx

@@ -63,7 +63,7 @@ export const CippTenantSelector = (props) => {
   }, [currentTenant?.value]);
 
   useEffect(() => {
-    if (tenant && currentTenant?.value) {
+    if (tenant && currentTenant?.value && currentTenant?.value !== 'AllTenants') {
       tenantDetails.refetch();
     }
   }, [tenant, offcanvasVisible]);

src/components/CippTable/CippDataTable.js

@@ -178,7 +178,11 @@ export const CippDataTable = (props) => {
     data: memoizedData,
     state: {
       columnVisibility,
-      showSkeletons: getRequestData.isFetching ? getRequestData.isFetching : isFetching,
+      showSkeletons: getRequestData.isFetchingNextPage
+        ? false
+        : getRequestData.isFetching
+        ? getRequestData.isFetching
+        : isFetching,
     },
     renderEmptyRowsFallback: ({ table }) =>
       getRequestData.data?.pages?.[0].Metadata?.QueueMessage ? (

src/layouts/side-nav-item.js

@@ -152,7 +152,6 @@ export const SideNavItem = (props) => {
           alignItems: "center",
           width: "100%",
           px: `${indent * 6}px`,
-          py: "12px",
         }}
       >
         <ButtonBase
@@ -167,6 +166,7 @@ export const SideNavItem = (props) => {
             textAlign: "left",
             whiteSpace: "nowrap",
             width: "calc(100% - 20px)", // Adjust the width to leave space for the bookmark icon
+            py: "12px",
           }}
           {...linkProps}
         >

src/layouts/top-nav.js

@@ -124,7 +124,7 @@ export const TopNav = (props) => {
             </IconButton>
           )}
         </Stack>
-        <Stack alignItems="center" direction="row" spacing={2}>
+        <Stack alignItems="center" direction="row" spacing={1.5}>
           {!mdDown && (
             <IconButton color="inherit" onClick={handleThemeSwitch}>
               <SvgIcon color="action" fontSize="small">
@@ -187,7 +187,6 @@ export const TopNav = (props) => {
           </Popover>
           <CippCentralSearch open={searchDialog.open} handleClose={searchDialog.handleClose} />
           <NotificationsPopover />
-
           <AccountPopover
             onThemeSwitch={handleThemeSwitch}
             paletteMode={settings.currentTheme?.value === "light" ? "dark" : "light"}