Skip to content
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

Jump to bottom

Audit Log UI Improvements #1805

Merged
merged 7 commits into from
Mar 15, 2023
Merged

Audit Log UI Improvements #1805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
13b59db
Set a min and max width for audit log columns
Pezmc Mar 13, 2023
3cdc318
Time column can collapse to hide seconds
Pezmc Mar 13, 2023
ba011fb
Encourage filter column to shrink earlier
Pezmc Mar 13, 2023
6c0f905
Switch to mobile view at 1024px instead of 640px
joepavitt Mar 14, 2023
5d50a41
improved responsive margin/padding
joepavitt Mar 14, 2023
cd3af79
Increase default cypress screen width to 1024
joepavitt Mar 14, 2023
d823792
Use grid-area layout for audit entry
joepavitt Mar 15, 2023
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: 2 additions & 0 deletions config/cypress.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
const { defineConfig } = require('cypress')

module.exports = defineConfig({
viewportWidth: 1024,
viewportHeight: 768,
e2e: {
baseUrl: 'http://localhost:3000',
experimentalSessionAndOrigin: true,
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/PageHeader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<nav-item label="Create New Team" :icon="plusIcon"
@click="mobileTeamSelectionOpen = false; $router.push({name: 'CreateTeam'})"></nav-item>
</div>
<div class="hidden sm:flex">
<div class="hidden lg:flex">
<ff-team-selection data-action="team-selection" />
<!-- Desktop: User Options -->
<ff-dropdown v-if="user" class="ff-navigation ff-user-options" options-align="right" data-action="user-options" data-cy="user-options">
Expand Down
21 changes: 12 additions & 9 deletions frontend/src/components/audit-log/AuditEntry.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
<template>
<div class="ff-audit-entry py-3 border-b text-base">
<div class="ff-audit-entry py-1 lg:py-3 border-b text-base">
<!-- Time -->
<div class="ff-audit-entry-time w-20 text-gray-500">{{ entry.time }}</div>
<div class="ff-audit-entry-time">{{ entry.time }}</div>

<!-- Icon -->
<div class="ff-audit-entry-icon w-12 flex justify-center">
<AuditEntryIcon v-if="entry.body?.error" event="error"></AuditEntryIcon>
<AuditEntryIcon v-else :event="entry.event"></AuditEntryIcon>
</div>
<!-- Event -->
<div class="ff-audit-entry-description">
<AuditEntryVerbose :entry="entry"></AuditEntryVerbose>
<div class="ff-audit-entry-info flex items-center gap-4 lg:ml-3">
<div class="ff-audit-entry-icon text-center">
<AuditEntryIcon v-if="entry.body?.error" event="error"></AuditEntryIcon>
<AuditEntryIcon v-else :event="entry.event"></AuditEntryIcon>
</div>
<!-- Event -->
<div class="ff-audit-entry-description">
<AuditEntryVerbose :entry="entry"></AuditEntryVerbose>
</div>
</div>
<!-- User/Trigger -->
<div v-if="entry.trigger.name !== 'unknown'" class="ff-audit-entry-trigger">
Expand Down
32 changes: 27 additions & 5 deletions frontend/src/stylesheets/components/audit-log.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
@import '~@flowforge/forge-ui-components/dist/scss/forge-colors.scss';
@import '~@flowforge/forge-ui-components/dist/scss/forge-variables.scss';

.ff-audit-entry {
align-items: center;
display: grid;
grid-template-columns: 75px 50px 1fr 200px;
grid-template-areas:
'time author'
'entry entry';
grid-gap: 0.25rem;
align-items: center;
label {
font-weight: 500;
}
Expand Down Expand Up @@ -51,10 +55,28 @@
}
}

.ff-audit-entry-trigger {
color: $ff-grey-400;
text-align: right;
.ff-audit-entry-info {
grid-area: entry;
}

.ff-audit-entry-trigger, .ff-audit-entry-time {
grid-area: time;
display: block;
color: $ff-grey-500;
overflow-x: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}

.ff-audit-entry-trigger {
grid-area: author;
text-align: right;
}


@media screen and (min-width: $ff-screen-lg) {
.ff-audit-entry {
grid-template-areas: 'time entry author';
grid-template-columns: min-content 1fr min-content;
}
}
12 changes: 12 additions & 0 deletions frontend/src/stylesheets/layouts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,19 @@ $nav_height: 60px;
}
}

/* MOBILE LAYOUT */
@media screen and (min-width: $ff-screen-sm) {
/* Platform */
.ff-layout--platform--wrapper {
main {
margin: 12px;
padding: 24px;
}
}
}

/* MOBILE LAYOUT */
@media screen and (min-width: $ff-screen-lg) {
/* Box */
.ff-layout--box--wrapper {
width: 85%;
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/stylesheets/pages/admin.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.ff-admin-audit {
display: grid;
grid-template-columns: 1fr 240px;
grid-template-columns: 2fr minmax(min-content, 240px);
gap: 24px;
}