Skip to content

Commit

Permalink
Add related audit logs list
Browse files Browse the repository at this point in the history
  • Loading branch information
@hmiguim
hmiguim committed May 8, 2024
1 parent d04444b commit 5edcf97
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 14 deletions.
2 changes: 1 addition & 1 deletion roda-ui/roda-wui/src/main/java/org/roda/wui/api/v2/controller/NotificationController.java
View file
Expand Up @@ -99,7 +99,7 @@ public Notification findByUuid(String uuid) {
}

@Override
public IndexResult<Notification> find(FindRequest findRequest, String localeString) {
public IndexResult<Notification> find(@RequestBody FindRequest findRequest, String localeString) {
RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
return indexService.find(Notification.class, findRequest, localeString, requestContext);
}
Expand Down
28 changes: 28 additions & 0 deletions roda-ui/roda-wui/src/main/java/org/roda/wui/client/management/ShowLogEntry.java
View file
Expand Up @@ -12,9 +12,17 @@

import java.util.List;

import org.roda.core.data.common.RodaConstants;
import org.roda.core.data.v2.index.filter.Filter;
import org.roda.core.data.v2.index.filter.NotSimpleFilterParameter;
import org.roda.core.data.v2.index.filter.SimpleFilterParameter;
import org.roda.core.data.v2.log.LogEntry;
import org.roda.core.data.v2.log.LogEntryParameter;
import org.roda.wui.client.common.UserLogin;
import org.roda.wui.client.common.lists.LogEntryList;
import org.roda.wui.client.common.lists.utils.AsyncTableCellOptions;
import org.roda.wui.client.common.lists.utils.ListBuilder;
import org.roda.wui.client.common.search.SearchWrapper;
import org.roda.wui.client.common.utils.HtmlSnippetUtils;
import org.roda.wui.client.common.utils.JavascriptUtils;
import org.roda.wui.client.services.Services;
Expand All @@ -33,6 +41,7 @@
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.Widget;

import config.i18n.client.ClientMessages;
Expand Down Expand Up @@ -127,6 +136,10 @@ interface MyUiBinder extends UiBinder<Widget, ShowLogEntry> {
Label logInstanceIdLabel;
@UiField
Label logInstanceIdValue;
@UiField
SimplePanel expandedAuditLogs;
@UiField
SimplePanel expandedAuditLogsList;

/**
* Create a new panel to view a log entry
Expand Down Expand Up @@ -188,8 +201,23 @@ public ShowLogEntry(LogEntry logEntry) {
logStateLabel.setVisible(logEntry.getState() != null);
logStateValue.setVisible(logEntry.getState() != null);

Label aipTitle = new Label();
aipTitle.addStyleName("h5");
aipTitle.setText(messages.disposalScheduleListAips());
expandedAuditLogs.add(aipTitle);

ListBuilder<LogEntry> auditLogListBuilder = new ListBuilder<>(LogEntryList::new,
new AsyncTableCellOptions<>(LogEntry.class, "AuditLogs_triggeredLogs")
.withFilter(new Filter(new SimpleFilterParameter(RodaConstants.LOG_REQUEST_HEADER_UUID,
logEntry.getAuditLogRequestHeaders().getUuid()), new NotSimpleFilterParameter(RodaConstants.INDEX_UUID, logEntry.getUUID())))
.withSummary(messages.listOfAIPs()).bindOpener());

SearchWrapper aipsSearchWrapper = new SearchWrapper(false).createListAndSearchPanel(auditLogListBuilder);
expandedAuditLogsList.setWidget(aipsSearchWrapper);
expandedAuditLogsList.setVisible(true);
}


@Override
protected void onLoad() {
super.onLoad();
Expand Down
5 changes: 5 additions & 0 deletions roda-ui/roda-wui/src/main/java/org/roda/wui/client/management/ShowLogEntry.ui.xml
View file
Expand Up @@ -78,6 +78,11 @@
</g:Label>
<g:HTML styleName="value" ui:field="logStateValue" />
</g:FlowPanel>
<g:FlowPanel>
<g:SimplePanel ui:field="expandedAuditLogs">
</g:SimplePanel>
<g:SimplePanel ui:field="expandedAuditLogsList" addStyleNames="card representationsCard" />
</g:FlowPanel>
</g:FlowPanel>
</g:FlowPanel>
</g:FlowPanel>
Expand Down
24 changes: 12 additions & 12 deletions roda-ui/roda-wui/src/main/resources/config/i18n/client/ClientMessages.properties
View file
Expand Up @@ -31,10 +31,10 @@ ingestProcessTitle:Ingest process
internalProcessTitle:Internal actions
loginTitle:Login
searchTitle:Search
activityLogTitle:Audit log
showLogEntryTitle:Log entry
notificationsTitle:Notifications log
notificationTitle:Notifications log
activityLogTitle:Audit logs
showLogEntryTitle:Audit log
notificationsTitle:Notification logs
notificationTitle:Notification log
usersAndGroupsTitle:Users and groups
usersAndGroupsSearchPlaceHolder:Search users and groups...
logsTitle:Logs
Expand Down Expand Up @@ -186,7 +186,7 @@ allOfAObject[org.roda.core.data.v2.jobs.Job]:All jobs
allOfAObject[org.roda.core.data.v2.jobs.Report]:All reports
allOfAObject[org.roda.core.data.v2.jobs.IndexedReport]:All reports
allOfAObject[org.roda.core.data.v2.notifications.Notification]:All notifications
allOfAObject[org.roda.core.data.v2.log.LogEntry]:All log entries
allOfAObject[org.roda.core.data.v2.log.LogEntry]:All audit logs
allOfAObject[org.roda.core.data.v2.user.RODAMember]:All users and groups
allOfAObject[org.roda.core.data.v2.ip.metadata.DescriptiveMetadata]:All descriptive metadata
allOfAObject[org.roda.core.data.v2.ip.metadata.PreservationMetadata]:All preservation metadata
Expand All @@ -213,7 +213,7 @@ someOfAObject[org.roda.core.data.v2.jobs.Job]:jobs
someOfAObject[org.roda.core.data.v2.jobs.Report]:reports
someOfAObject[org.roda.core.data.v2.jobs.IndexedReport]:reports
someOfAObject[org.roda.core.data.v2.notifications.Notification]:notifications
someOfAObject[org.roda.core.data.v2.log.LogEntry]:log entries
someOfAObject[org.roda.core.data.v2.log.LogEntry]:Audit logs
someOfAObject[org.roda.core.data.v2.user.RODAMember]:users and groups
someOfAObject[org.roda.core.data.v2.ip.metadata.DescriptiveMetadata]:descriptive metadata
someOfAObject[org.roda.core.data.v2.ip.metadata.PreservationMetadata]:preservation metadata
Expand Down Expand Up @@ -246,7 +246,7 @@ oneOfAObject[org.roda.core.data.v2.jobs.Job]:job
oneOfAObject[org.roda.core.data.v2.jobs.Report]:report
oneOfAObject[org.roda.core.data.v2.jobs.IndexedReport]:report
oneOfAObject[org.roda.core.data.v2.notifications.Notification]:notification
oneOfAObject[org.roda.core.data.v2.log.LogEntry]:log entry
oneOfAObject[org.roda.core.data.v2.log.LogEntry]:Audit log
oneOfAObject[org.roda.core.data.v2.user.RODAMember]:user or group
oneOfAObject[org.roda.core.data.v2.ip.metadata.DescriptiveMetadata]:descriptive metadata
oneOfAObject[org.roda.core.data.v2.ip.metadata.PreservationMetadata]:preservation metadata
Expand Down Expand Up @@ -494,7 +494,7 @@ searchDropdownLabels[org.roda.core.data.v2.ri.RepresentationInformation]:represe
searchDropdownLabels[org.roda.core.data.v2.jobs.Job]:Jobs
searchDropdownLabels[org.roda.core.data.v2.jobs.IndexedReport]:Reports
searchDropdownLabels[org.roda.core.data.v2.notifications.Notification]:notifications
searchDropdownLabels[org.roda.core.data.v2.log.LogEntry]:log entries
searchDropdownLabels[org.roda.core.data.v2.log.LogEntry]:Audit logs
searchDropdownLabels[org.roda.core.data.v2.user.RODAMember]:users and groups
searchDropdownLabels[org.roda.core.data.v2.ip.metadata.DescriptiveMetadata]:descriptive metadata
searchDropdownLabels[org.roda.core.data.v2.ip.metadata.PreservationMetadata]:preservation metadata
Expand Down Expand Up @@ -982,10 +982,10 @@ title[administration_event_tasks]:Scheduler
title[administration_event_taskInstances]:List
title[administration_metadataEditor]:Metadata edition
title[administration_statistics]:Reporting
title[administration_log]:Audit log
title[administration_log]:Audit logs
title[administration_help]:Help
title[administration_preferences]:Preferences
title[administration_notifications]:Notifications log
title[administration_notifications]:Notification logs
title[administration_distributed_instances]:Distributed Instances
title[administration_local_instance_configuration]:Local Instance
title[administration_access_keys]:Access Keys
Expand Down Expand Up @@ -1314,7 +1314,7 @@ jobReportSource[org.roda.core.data.v2.ri.RepresentationInformation]:Source repre
jobReportSource[org.roda.core.data.v2.jobs.Job]:Source job
jobReportSource[org.roda.core.data.v2.jobs.Report]:Source report
jobReportSource[org.roda.core.data.v2.notifications.Notification]:Source notification
jobReportSource[org.roda.core.data.v2.log.LogEntry]:Source log entry
jobReportSource[org.roda.core.data.v2.log.LogEntry]:Source audit log
jobReportSource[org.roda.core.data.v2.user.RODAMember]:Source member
jobReportSource[org.roda.core.data.v2.ip.metadata.DescriptiveMetadata]:Source descriptive metadata
jobReportSource[org.roda.core.data.v2.ip.metadata.PreservationMetadata]:Source preservation metadata
Expand All @@ -1332,7 +1332,7 @@ jobReportOutcome[org.roda.core.data.v2.ri.RepresentationInformation]:Outcome rep
jobReportOutcome[org.roda.core.data.v2.jobs.Job]:Outcome job
jobReportOutcome[org.roda.core.data.v2.jobs.Report]:Outcome report
jobReportOutcome[org.roda.core.data.v2.notifications.Notification]:Outcome notification
jobReportOutcome[org.roda.core.data.v2.log.LogEntry]:Outcome log entry
jobReportOutcome[org.roda.core.data.v2.log.LogEntry]:Outcome audit log
jobReportOutcome[org.roda.core.data.v2.user.RODAMember]:Outcome member
jobReportOutcome[org.roda.core.data.v2.ip.metadata.DescriptiveMetadata]:Outcome descriptive metadata
jobReportOutcome[org.roda.core.data.v2.ip.metadata.PreservationMetadata]:Outcome preservation metadata
Expand Down
17 changes: 16 additions & 1 deletion roda-ui/roda-wui/src/main/resources/config/roda-wui.properties
View file
Expand Up @@ -879,6 +879,7 @@ ui.lists.SelectRiskDialog_risks.search.prefilters.visible = true
ui.lists.SelectTransferResourceDialog_transferredResources.search.prefilters.visible = true
ui.lists.ShowJob_reports.search.prefilters.visible = true
ui.lists.UserLog_logEntries.search.prefilters.visible = true
ui.lists.AuditLogs_triggeredLogs.search.prefilters.visible = true
ui.lists.Disposal_confirmations.search.prefilters.visible = true

##########################################################################
Expand Down Expand Up @@ -924,6 +925,7 @@ ui.lists.Search_AIPs.search.advanced.enabled = true
ui.lists.Search_files.search.advanced.enabled = true
ui.lists.Search_representations.search.advanced.enabled = true
ui.lists.UserLog_logEntries.search.advanced.enabled = true
ui.lists.AuditLogs_triggeredLogs.search.advanced.enabled = true
ui.lists.BrowseAIPPortal_aipChildren.search.advanced.enabled = true
ui.lists.Disposal_confirmations.search.advanced.enabled = true
ui.lists.DisposalOverdueRecords_aip.search.advanced.enabled = true
Expand All @@ -950,7 +952,7 @@ ui.lists.RiskShowPanel_riskIncidences.search.selectedInfo.alwaysVisible = true
ui.lists.BrowseAIPPortal_aipChildren.search.selectedInfo.alwaysVisible = true
ui.lists.ShowDisposalSchedule_aips.search.selectedInfo.alwaysVisible = true
ui.lists.ShowDisposalHold_aips.search.selectedInfo.alwaysVisible = true

ui.lists.AuditLogs_triggeredLogs.search.selectedInfo.alwaysVisible = true

##########################################################################
# List configuration
Expand Down Expand Up @@ -1852,6 +1854,19 @@ ui.lists.UserLog_logEntries.facets.parameters.username.sort = COUNT
ui.lists.UserLog_logEntries.facets.parameters.state.type = SimpleFacetParameter
ui.lists.UserLog_logEntries.facets.parameters.state.sort = COUNT

ui.lists.AuditLogs_triggeredLogs.facets.parameters = actionComponent
ui.lists.AuditLogs_triggeredLogs.facets.parameters = actionMethod
ui.lists.AuditLogs_triggeredLogs.facets.parameters = username
ui.lists.AuditLogs_triggeredLogs.facets.parameters = state
ui.lists.AuditLogs_triggeredLogs.facets.parameters.actionComponent.type = SimpleFacetParameter
ui.lists.AuditLogs_triggeredLogs.facets.parameters.actionComponent.sort = COUNT
ui.lists.AuditLogs_triggeredLogs.facets.parameters.actionMethod.type = SimpleFacetParameter
ui.lists.AuditLogs_triggeredLogs.facets.parameters.actionMethod.sort = COUNT
ui.lists.AuditLogs_triggeredLogs.facets.parameters.username.type = SimpleFacetParameter
ui.lists.AuditLogs_triggeredLogs.facets.parameters.username.sort = COUNT
ui.lists.AuditLogs_triggeredLogs.facets.parameters.state.type = SimpleFacetParameter
ui.lists.AuditLogs_triggeredLogs.facets.parameters.state.sort = COUNT

ui.lists.Disposal_confirmations.facets.parameters = state
ui.lists.Disposal_confirmations.facets.parameters = createdBy
ui.lists.Disposal_confirmations.facets.parameters.state.type = SimpleFacetParameter
Expand Down

0 comments on commit 5edcf97

Please sign in to comment.