preview page simplified, tabs only visible when there are more objects

Evolveum · Feb 21, 2023 · 0d55388 · 0d55388
1 parent 9bfff1a
commit 0d55388
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 18 deletions.
diff --git a/...a/com/evolveum/midpoint/gui/impl/page/admin/component/preview/PreviewChangesTabPanel.html b/...a/com/evolveum/midpoint/gui/impl/page/admin/component/preview/PreviewChangesTabPanel.html
@@ -17,19 +17,18 @@
         </div>
     </div>
 
-    <!--
-    <hr class="my-5"/>
+    <wicket:enclosure child="primaryDeltas">
+        <hr class="my-5"/>
 
-    <div class="row" style="padding-bottom: 20px">
-        <div class="col-md-6">
-            <div wicket:id="primaryDeltas"/>
-        </div>
-        <div class="col-md-6">
-            <div wicket:id="secondaryDeltas"/>
+        <div class="row" style="padding-bottom: 20px">
+            <div class="col-md-6">
+                <div wicket:id="primaryDeltas"/>
+            </div>
+            <div class="col-md-6">
+                <div wicket:id="secondaryDeltas"/>
+            </div>
         </div>
-    </div>
-    -->
-
+    </wicket:enclosure>
 
     <div class="row" wicket:id="policyViolationsContainer">
         <div class="col-md-12">

diff --git a/...a/com/evolveum/midpoint/gui/impl/page/admin/component/preview/PreviewChangesTabPanel.java b/...a/com/evolveum/midpoint/gui/impl/page/admin/component/preview/PreviewChangesTabPanel.java
@@ -10,8 +10,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import com.evolveum.midpoint.web.component.prism.show.ChangesPanel;
-
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
@@ -33,6 +31,7 @@
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.web.component.prism.show.ChangesPanel;
 import com.evolveum.midpoint.web.component.prism.show.VisualizationDto;
 import com.evolveum.midpoint.web.component.prism.show.VisualizationPanel;
 import com.evolveum.midpoint.web.component.prism.show.WrapperVisualization;
@@ -141,8 +140,13 @@ private void initModels() {
     }
 
     private void initLayout() {
-//        add(new VisualizationPanel(ID_PRIMARY_DELTAS, primaryDeltasModel));
-//        add(new VisualizationPanel(ID_SECONDARY_DELTAS, secondaryDeltasModel));
+        VisualizationPanel primaryDeltas = new VisualizationPanel(ID_PRIMARY_DELTAS, primaryDeltasModel);
+        primaryDeltas.add(VisibleBehaviour.ALWAYS_INVISIBLE);
+        add(primaryDeltas);
+
+        VisualizationPanel secondaryDeltas = new VisualizationPanel(ID_SECONDARY_DELTAS, secondaryDeltasModel);
+        secondaryDeltas.add(VisibleBehaviour.ALWAYS_INVISIBLE);
+        add(secondaryDeltas);
 
         add(new ChangesPanel("primary", null, primaryDeltasModel) {
 

diff --git a/...rc/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/PageFocusPreviewChanges.html b/...rc/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/PageFocusPreviewChanges.html
@@ -11,6 +11,7 @@
 <wicket:extend>
     <form wicket:id="mainForm" class="form-horizontal">
         <div wicket:id="tabbedPanel" class="nav-tabs-custom" />
+        <div wicket:id="simplePanel"/>
         <div class="main-button-bar">
             <a class="btn btn-default" wicket:id="continueEditing" />
             <a class="btn btn-primary" wicket:id="save" />

diff --git a/...rc/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/PageFocusPreviewChanges.java b/...rc/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/PageFocusPreviewChanges.java
@@ -11,10 +11,12 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.wicket.Component;
 import org.apache.wicket.RestartResponseException;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.extensions.markup.html.tabs.ITab;
 import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
@@ -57,6 +59,7 @@ public class PageFocusPreviewChanges<O extends ObjectType> extends PageBase {
     private static final String ID_TABBED_PANEL = "tabbedPanel";
     private static final String ID_CONTINUE_EDITING = "continueEditing";
     private static final String ID_SAVE = "save";
+    private static final String ID_SIMPLE_PANEL = "simplePanel";
 
     private static final Trace LOGGER = TraceManager.getTrace(PageFocusPreviewChanges.class);
 
@@ -85,9 +88,19 @@ private void initLayout() {
         add(mainForm);
 
         List<ITab> tabs = createTabs();
-        TabbedPanel<ITab> previewChangesTabbedPanel = WebComponentUtil.createTabPanel(ID_TABBED_PANEL, this, tabs, null);
-        previewChangesTabbedPanel.setOutputMarkupId(true);
-        mainForm.add(previewChangesTabbedPanel);
+        TabbedPanel<ITab> tabbedPanel = WebComponentUtil.createTabPanel(ID_TABBED_PANEL, this, tabs, null);
+        tabbedPanel.add(new VisibleBehaviour(() -> tabs.size() > 1));
+        tabbedPanel.setOutputMarkupId(true);
+        mainForm.add(tabbedPanel);
+
+        Component simplePanel;
+        if (tabs.size() == 1) {
+            simplePanel = tabs.get(0).getPanel(ID_SIMPLE_PANEL);
+        } else {
+            simplePanel = new Label(ID_SIMPLE_PANEL);
+        }
+        simplePanel.add(new VisibleBehaviour(() -> tabs.size() == 1));
+        mainForm.add(simplePanel);
 
         initButtons(mainForm);
     }