From 091055d55c1f129769ee1ea95d39bc00bebd8c74 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Tue, 4 Mar 2025 15:18:25 -0500 Subject: [PATCH 1/5] fix: move y padding back to buttonbase --- src/layouts/side-nav-item.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/side-nav-item.js b/src/layouts/side-nav-item.js index a3f5e73b79eb..74ad14f6969d 100644 --- a/src/layouts/side-nav-item.js +++ b/src/layouts/side-nav-item.js @@ -152,7 +152,6 @@ export const SideNavItem = (props) => { alignItems: "center", width: "100%", px: `${indent * 6}px`, - py: "12px", }} > { textAlign: "left", whiteSpace: "nowrap", width: "calc(100% - 20px)", // Adjust the width to leave space for the bookmark icon + py: "12px", }} {...linkProps} > From 7e0ef973787577abbf872246e45f2af8676c92e4 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Tue, 4 Mar 2025 15:36:31 -0500 Subject: [PATCH 2/5] fix: don't show table skeletons after first page --- src/components/CippTable/CippDataTable.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/CippTable/CippDataTable.js b/src/components/CippTable/CippDataTable.js index 3a040dd4c1eb..307106098392 100644 --- a/src/components/CippTable/CippDataTable.js +++ b/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 ? ( From 570305ecf5cc45f1d496b6c2bf53c4af81286339 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Tue, 4 Mar 2025 16:25:50 -0500 Subject: [PATCH 3/5] fix: prevent refetch for alltenants --- src/components/CippComponents/CippTenantSelector.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/CippComponents/CippTenantSelector.jsx b/src/components/CippComponents/CippTenantSelector.jsx index 9db78af9b6b4..67b66eded8ca 100644 --- a/src/components/CippComponents/CippTenantSelector.jsx +++ b/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]); From c02e8a7504bca665e010cbbf67938902f32fe5a9 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Tue, 4 Mar 2025 16:41:28 -0500 Subject: [PATCH 4/5] tweak spacing --- src/layouts/top-nav.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/layouts/top-nav.js b/src/layouts/top-nav.js index ea2e7d4d0a86..0cebc1ac3acd 100644 --- a/src/layouts/top-nav.js +++ b/src/layouts/top-nav.js @@ -124,7 +124,7 @@ export const TopNav = (props) => { )} - + {!mdDown && ( @@ -187,7 +187,6 @@ export const TopNav = (props) => { - Date: Tue, 4 Mar 2025 19:01:59 -0500 Subject: [PATCH 5/5] Update version.json --- public/version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/version.json b/public/version.json index 712c1fd057e1..c0ab80971e47 100644 --- a/public/version.json +++ b/public/version.json @@ -1,3 +1,3 @@ { - "version": "7.3.0" + "version": "7.3.1" }