Skip to content

[pull] main from KelvinTegelaar:main #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 6 commits into from
Mar 5, 2025
Merged

[pull] main from KelvinTegelaar:main #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
091055d
fix: move y padding back to buttonbase
JohnDuprey Mar 4, 2025
7e0ef97
fix: don't show table skeletons after first page
JohnDuprey Mar 4, 2025
570305e
fix: prevent refetch for alltenants
JohnDuprey Mar 4, 2025
c02e8a7
tweak spacing
JohnDuprey Mar 4, 2025
6b19c9f
Update version.json
JohnDuprey Mar 5, 2025
30f780f
Merge pull request #3736 from KelvinTegelaar/dev
JohnDuprey Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion public/version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "7.3.0"
"version": "7.3.1"
}
2 changes: 1 addition & 1 deletion src/components/CippComponents/CippTenantSelector.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand Down
6 changes: 5 additions & 1 deletion src/components/CippTable/CippDataTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ? (
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/side-nav-item.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ export const SideNavItem = (props) => {
alignItems: "center",
width: "100%",
px: `${indent * 6}px`,
py: "12px",
}}
>
<ButtonBase
Expand All @@ -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}
>
Expand Down
3 changes: 1 addition & 2 deletions src/layouts/top-nav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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"}
Expand Down