audit log viewer panel cleanup. fixing MID-4400

Evolveum · Mar 2, 2018 · 537388e · 537388e
1 parent c660807
commit 537388e
Show file tree

Hide file tree

Showing 4 changed files with 162 additions and 146 deletions.
diff --git a/...rc/main/java/com/evolveum/midpoint/web/component/objectdetails/ObjectHistoryTabPanel.java b/...rc/main/java/com/evolveum/midpoint/web/component/objectdetails/ObjectHistoryTabPanel.java
@@ -33,6 +33,7 @@
 import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
@@ -58,7 +59,10 @@
  * Created by honchar.
  */
 public class ObjectHistoryTabPanel<F extends FocusType> extends AbstractObjectTabPanel<F> {
-    private static final String ID_MAIN_PANEL = "mainPanel";
+
+	private static final long serialVersionUID = 1L;
+
+	private static final String ID_MAIN_PANEL = "mainPanel";
     private static final Trace LOGGER = TraceManager.getTrace(ObjectHistoryTabPanel.class);
     private static final String DOT_CLASS = ObjectHistoryTabPanel.class.getName() + ".";
     private static final String OPERATION_RESTRUCT_OBJECT = DOT_CLASS + "restructObject";
@@ -71,38 +75,14 @@ public ObjectHistoryTabPanel(String id, Form mainForm, LoadableModel<ObjectWrapp
     }
 
     private void initLayout(final LoadableModel<ObjectWrapper<F>> focusWrapperModel, final PageAdminObjectDetails<F> page) {
-        Map<String, Boolean> visibilityMap = new HashMap<>();
-        visibilityMap.put(AuditLogViewerPanel.TARGET_NAME_LABEL_VISIBILITY, false);
-        visibilityMap.put(AuditLogViewerPanel.TARGET_NAME_FIELD_VISIBILITY, false);
-        visibilityMap.put(AuditLogViewerPanel.TARGET_OWNER_LABEL_VISIBILITY, false);
-        visibilityMap.put(AuditLogViewerPanel.TARGET_OWNER_FIELD_VISIBILITY, false);
-        visibilityMap.put(AuditLogViewerPanel.EVENT_STAGE_LABEL_VISIBILITY, false);
-        visibilityMap.put(AuditLogViewerPanel.EVENT_STAGE_FIELD_VISIBILITY, false);
-        visibilityMap.put(AuditLogViewerPanel.EVENT_STAGE_COLUMN_VISIBILITY, false);
-        visibilityMap.put(AuditLogViewerPanel.TARGET_COLUMN_VISIBILITY, false);
-        visibilityMap.put(AuditLogViewerPanel.TARGET_OWNER_COLUMN_VISIBILITY, false);
-        AuditLogViewerPanel panel = new AuditLogViewerPanel(ID_MAIN_PANEL, visibilityMap) {
+        AuditSearchDto auditSearchDto = createAuditSearchDto(focusWrapperModel.getObject().getObject().asObjectable());
+        AuditLogViewerPanel panel = new AuditLogViewerPanel(ID_MAIN_PANEL, Model.of(auditSearchDto), true) {
             private static final long serialVersionUID = 1L;
 
-            @Override
-            protected AuditSearchDto initAuditSearchDto(){
-                AuditSearchDto searchDto = new AuditSearchDto();
-                ObjectReferenceType ort = new ObjectReferenceType();
-                ort.setOid(focusWrapperModel.getObject().getOid());
-                searchDto.setTargetNames(asList(ort));
-                searchDto.setEventStage(AuditEventStageType.EXECUTION);
-
-                return searchDto;
-            }
-
-            @Override
-            protected boolean useSessionStorageOnPanelLoad(){
-                return false;
-            }
-
             @Override
             protected List<IColumn<AuditEventRecordType, String>> initColumns() {
                 List<IColumn<AuditEventRecordType, String>> columns = super.initColumns();
+
                 IColumn<AuditEventRecordType, String> column
                         = new MultiButtonColumn<AuditEventRecordType>(new Model(), 2) {
                     private static final long serialVersionUID = 1L;
@@ -173,11 +153,44 @@ public void clickPerformed(int id, AjaxRequestTarget target, IModel<AuditEventRe
                 return columns;
             }
 
+			@Override
+			protected void updateAuditSearchStorage(AuditSearchDto searchDto) {
+				getPageBase().getSessionStorage().getUserHistoryAuditLog().setSearchDto(searchDto);
+				getPageBase().getSessionStorage().getUserHistoryAuditLog().setPageNumber(0);
+
+
+			}
+
+			@Override
+			protected void resetAuditSearchStorage() {
+				getPageBase().getSessionStorage().getUserHistoryAuditLog().setSearchDto(createAuditSearchDto(focusWrapperModel.getObject().getObject().asObjectable()));
+
+			}
+
+			@Override
+			protected void updateCurrentPage(long current) {
+				getPageBase().getSessionStorage().getUserHistoryAuditLog().setPageNumber(current);
+
+			}
+
+			@Override
+			protected long getCurrentPage() {
+				return getPageBase().getSessionStorage().getUserHistoryAuditLog().getPageNumber();
+			}
+
         };
         panel.setOutputMarkupId(true);
         add(panel);
     }
 
+    private AuditSearchDto createAuditSearchDto(F focus) {
+    	AuditSearchDto searchDto = new AuditSearchDto();
+		ObjectReferenceType ort = ObjectTypeUtil.createObjectRef(focus);
+		searchDto.setTargetNames(asList(ort));
+		searchDto.setEventStage(AuditEventStageType.EXECUTION);
+		return searchDto;
+    }
+
     private void currentStateButtonClicked(AjaxRequestTarget target, String oid, String eventIdentifier,
                                            String date, Class type) {
         //TODO cases for PageRoleHistory, PageOrgHistory if needed...

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java b/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java
@@ -1,6 +1,9 @@
 package com.evolveum.midpoint.web.page.admin.reports;
 
 import com.evolveum.midpoint.web.page.admin.reports.component.AuditLogViewerPanel;
+import com.evolveum.midpoint.web.page.admin.reports.dto.AuditSearchDto;
+
+import org.apache.wicket.model.Model;
 
 import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
@@ -23,7 +26,34 @@ public PageAuditLogViewer() {
 	}
 
     private void initLayout(){
-        AuditLogViewerPanel panel = new AuditLogViewerPanel(ID_PANEL, null);
+        AuditLogViewerPanel panel = new AuditLogViewerPanel(ID_PANEL, Model.of(new AuditSearchDto()), false) {
+
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			protected void updateAuditSearchStorage(AuditSearchDto searchDto) {
+				getPageBase().getSessionStorage().getAuditLog().setSearchDto(searchDto);
+				getPageBase().getSessionStorage().getAuditLog().setPageNumber(0);
+			}
+
+			@Override
+			protected void resetAuditSearchStorage() {
+				getPageBase().getSessionStorage().getAuditLog().setSearchDto(new AuditSearchDto());
+
+			}
+
+			@Override
+			protected void updateCurrentPage(long current) {
+				getPageBase().getSessionStorage().getAuditLog().setPageNumber(current);
+
+			}
+
+			@Override
+			protected long getCurrentPage() {
+				return getPageBase().getSessionStorage().getAuditLog().getPageNumber();
+			}
+
+        };
         panel.setOutputMarkupId(true);
         add(panel);
     }