Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 5be5369

Browse files
fix(ui): Move audit logs into Manage menu + small screen layout fix
1 parent 9def6c7 commit 5be5369

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

‎ui/packages/platform/src/components/AuditSettingsForm/AuditSettingsForm.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ const useStyles = makeStyles(
9191
'margin-top': '20px',
9292
},
9393
},
94+
formContainer: {
95+
flexWrap: 'nowrap'
96+
},
9497
textField: {
9598
...styles.inputField,
9699
},
@@ -304,7 +307,7 @@ const AuditSettingsForm: React.FC<AuditSettingsFormProps> = (props) => {
304307
<form onSubmit={formik.handleSubmit}>
305308
<Grid container spacing={3}>
306309
<Grid item xs={12} sm={12} lg={12} className={classes.container}>
307-
<Grid container item xs={12}sm={12}lg={8} direction={'column'}>
310+
<Grid container item lg={8} direction={'column'}className={classes.formContainer}>
308311
{!isAuditLogsSettingsAvailable && <Typography variant="body2" className={classes.unlockNote}>
309312
<Link external to="https://postgres.ai/contact/" target="_blank">
310313
Become an Enterprise customer

‎ui/packages/platform/src/components/IndexPage/IndexPage.tsx

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -602,27 +602,6 @@ function OrganizationMenu(parentProps: OrganizationMenuProps) {
602602
</ListItem>
603603
</List>
604604
</Collapse>
605-
{orgPermissions && orgPermissions.auditLogView && (<ListItem
606-
button
607-
className={cn(parentProps.classes.menuSectionHeader, parentProps.classes.menuSectionHeaderCollapsible)}
608-
disabled={isBlocked}
609-
id="menuSettingsTitle"
610-
>
611-
<NavLink
612-
className={parentProps.classes.menuSectionHeaderLink}
613-
activeClassName={cn(parentProps.classes.menuSectionHeaderActiveLink, parentProps.classes.menuSingleSectionHeaderActiveLink)}
614-
to={
615-
orgPermissions && orgPermissions.settingsOrganizationUpdate
616-
? '/' + org + '/audit'
617-
: '#'
618-
}
619-
>
620-
<span className={parentProps.classes.menuSectionHeaderIcon}>
621-
{icons.auditLogIcon}
622-
</span>
623-
Audit
624-
</NavLink>
625-
</ListItem>)}
626605
<ListItem
627606
button
628607
className={cn(parentProps.classes.menuSectionHeader, parentProps.classes.menuSectionHeaderCollapsible)}
@@ -728,14 +707,32 @@ function OrganizationMenu(parentProps: OrganizationMenuProps) {
728707
</NavLink>
729708
</ListItem>
730709
)}
710+
{orgPermissions && orgPermissions.auditLogView && (
711+
<ListItem
712+
disabled={
713+
(orgPermissions && !orgPermissions.auditLogView) || isBlocked
714+
}
715+
button
716+
className={parentProps.classes.menuItem}
717+
id="menuSettingsAuditLogs"
718+
>
719+
<NavLink
720+
className={parentProps.classes.menuItemLink}
721+
activeClassName={parentProps.classes.menuItemActiveLink}
722+
to={'/' + org + '/audit'}
723+
>
724+
Audit logs
725+
</NavLink>
726+
</ListItem>
727+
)}
731728
{orgData !== null && orgPermissions && Permissions.isAdmin(orgData) && orgPermissions.auditLogView && (
732729
<ListItem
733730
disabled={
734731
(orgPermissions && !orgPermissions.auditLogView) || isBlocked
735732
}
736733
button
737734
className={parentProps.classes.menuItem}
738-
id="menuSettingsAudit"
735+
id="menuSettingsAuditSettings"
739736
>
740737
<NavLink
741738
className={parentProps.classes.menuItemLink}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /