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 3851492

Browse files
Merge branch 'audit_logs_postrelease_fix' into 'master'
fix(ui): Move audit logs into Manage menu + small screen layout fix See merge request postgres-ai/database-lab!954
2 parents f842bbc + 5be5369 commit 3851492

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
@@ -603,27 +603,6 @@ function OrganizationMenu(parentProps: OrganizationMenuProps) {
603603
</ListItem>
604604
</List>
605605
</Collapse>
606-
{orgPermissions && orgPermissions.auditLogView && (<ListItem
607-
button
608-
className={cn(parentProps.classes.menuSectionHeader, parentProps.classes.menuSectionHeaderCollapsible)}
609-
disabled={isBlocked}
610-
id="menuSettingsTitle"
611-
>
612-
<NavLink
613-
className={parentProps.classes.menuSectionHeaderLink}
614-
activeClassName={cn(parentProps.classes.menuSectionHeaderActiveLink, parentProps.classes.menuSingleSectionHeaderActiveLink)}
615-
to={
616-
orgPermissions && orgPermissions.settingsOrganizationUpdate
617-
? '/' + org + '/audit'
618-
: '#'
619-
}
620-
>
621-
<span className={parentProps.classes.menuSectionHeaderIcon}>
622-
{icons.auditLogIcon}
623-
</span>
624-
Audit
625-
</NavLink>
626-
</ListItem>)}
627606
<ListItem
628607
button
629608
className={parentProps.classes.menuSectionHeader}
@@ -746,14 +725,32 @@ function OrganizationMenu(parentProps: OrganizationMenuProps) {
746725
</NavLink>
747726
</ListItem>
748727
)}
728+
{orgPermissions && orgPermissions.auditLogView && (
729+
<ListItem
730+
disabled={
731+
(orgPermissions && !orgPermissions.auditLogView) || isBlocked
732+
}
733+
button
734+
className={parentProps.classes.menuItem}
735+
id="menuSettingsAuditLogs"
736+
>
737+
<NavLink
738+
className={parentProps.classes.menuItemLink}
739+
activeClassName={parentProps.classes.menuItemActiveLink}
740+
to={'/' + org + '/audit'}
741+
>
742+
Audit logs
743+
</NavLink>
744+
</ListItem>
745+
)}
749746
{orgData !== null && orgPermissions && Permissions.isAdmin(orgData) && orgPermissions.auditLogView && (
750747
<ListItem
751748
disabled={
752749
(orgPermissions && !orgPermissions.auditLogView) || isBlocked
753750
}
754751
button
755752
className={parentProps.classes.menuItem}
756-
id="menuSettingsAudit"
753+
id="menuSettingsAuditSettings"
757754
>
758755
<NavLink
759756
className={parentProps.classes.menuItemLink}

0 commit comments

Comments
(0)

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