Skip to content

fix(audit-log): filter event audit logs by every SummitEvent subclass #1088

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

Open
smarcet wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(audit-log): filter event audit logs by every SummitEvent subclass #1088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/actions/event-actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,10 @@ export const saveEvent = (entity, publish) => async (dispatch, getState) => {
}
dispatch(
getAuditLog(
[`event_id==${entity.id}`, "class_name==SummitEventAuditLog"],
[
`event_id==${entity.id}`,
"class_name==SummitEvent||Presentation||SummitEventWithFile||SummitGroupEvent"
],
null,
DEFAULT_CURRENT_PAGE,
DEFAULT_PER_PAGE
Expand Down
5 changes: 4 additions & 1 deletion src/components/forms/event-form/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2241,7 +2241,10 @@ class EventForm extends React.Component {
>
<AuditLogs
filterId="activity"
entityFilter={[`event_id==${entity.id}`, "class_name==SummitEvent"]}
entityFilter={[
`event_id==${entity.id}`,
"class_name==SummitEvent||Presentation||SummitEventWithFile||SummitGroupEvent"
]}
/>
</Panel>
{entity.id !== 0 && (
Expand Down
6 changes: 4 additions & 2 deletions src/pages/audit-log/__tests__/audit-log-page.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,13 @@ describe("AuditLogPage", () => {
);
});

it("scopes AuditLogs to the standalone context, filtered to SummitEvent audit logs", () => {
it("scopes AuditLogs to the standalone context, filtered to every SummitEvent subclass", () => {
renderPage(0);

const props = JSON.parse(screen.getByTestId("audit-logs-mock").textContent);
expect(props.filterId).toBe("standalone");
expect(props.entityFilter).toEqual(["class_name==SummitEvent"]);
expect(props.entityFilter).toEqual([
"class_name==SummitEvent||Presentation||SummitEventWithFile||SummitGroupEvent"
]);
});
});
4 changes: 3 additions & 1 deletion src/pages/audit-log/audit-log-page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ const AuditLogPage = ({ totalLogEntries }) => (
</h3>
<AuditLogs
filterId="standalone"
entityFilter={["class_name==SummitEvent"]}
entityFilter={[
"class_name==SummitEvent||Presentation||SummitEventWithFile||SummitGroupEvent"
]}
/>
</div>
);
Expand Down
Loading