MID-6271 responsiveness on task activities item processing panel

Evolveum · May 18, 2022 · 05e89f4 · 05e89f4
1 parent 94fb57d
commit 05e89f4
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/gui/admin-gui/src/frontend/scss/midpoint-theme.scss b/gui/admin-gui/src/frontend/scss/midpoint-theme.scss
@@ -1818,3 +1818,9 @@ span.yui-skin-sam {
 .login-footer {
   font-size: 13px;
 }
+
+.info-box.activity-item-processing > .info-box-content > .progress-description {
+  overflow-wrap: break-word;
+  word-break: break-word;
+  max-width: 50vw;
+}
diff --git a/...m/evolveum/midpoint/gui/impl/page/admin/task/component/ActivitiesItemProcessingPanel.html b/...m/evolveum/midpoint/gui/impl/page/admin/task/component/ActivitiesItemProcessingPanel.html
@@ -19,17 +19,17 @@ <h4><div wicket:id="wallClockThroughput"/></h4>
             <div class="card-body">
                 <div class="row">
                     <wicket:enclosure wicket:child="currentItems">
-                        <div class="col-xs-12 col-sm-6 col-md-6 col-lg-3">
+                        <div class="col-12 col-xl-8 col-xxl-3">
                             <div wicket:id="currentItems"/>
                         </div>
                     </wicket:enclosure>
-                    <div class="col-xs-10 col-sm-6 col-md-5 col-lg-3">
+                    <div class="col-12 col-xl-4 col-xxl-3 mb-3">
                         <canvas wicket:id="chart" width="200" height="100"></canvas>
                     </div>
-                    <div class="col-sm-12 col-md-7 col-lg-6">
-                        <div wicket:id="successItem"/>
-                        <div wicket:id="failedItem"/>
-                        <div wicket:id="skippedItem"/>
+                    <div class="col-xl-12 col-xxl-6">
+                        <div class="activity-item-processing" wicket:id="successItem"/>
+                        <div class="activity-item-processing" wicket:id="failedItem"/>
+                        <div class="activity-item-processing" wicket:id="skippedItem"/>
                     </div>
                 </div>
             </div>

diff --git a/...a/com/evolveum/midpoint/gui/impl/page/admin/task/component/ActivitiesStatisticsPanel.html b/...a/com/evolveum/midpoint/gui/impl/page/admin/task/component/ActivitiesStatisticsPanel.html
@@ -11,32 +11,30 @@
     <div wicket:id="itemProcessing"/>
 
     <div class="row">
-        <div class="col-12">
-            <div wicket:id="synchronizationStatistics">
-                <div wicket:id="synchronizationSituationTransitions"></div>
-            </div>
+        <div class="col-12" wicket:id="synchronizationStatistics">
+            <div wicket:id="synchronizationSituationTransitions"/>
         </div>
         <div class="col-xl-12 col-xxl-6">
-            <div wicket:id="resultingActionsExecuted"></div>
+            <div wicket:id="resultingActionsExecuted"/>
         </div>
         <div class="col-xl-12 col-xxl-6">
-            <div wicket:id="allActionsExecuted"></div>
+            <div wicket:id="allActionsExecuted"/>
         </div>
     </div>
 
     <wicket:fragment wicket:id="resultingActionsExecutedTitle">
         <h3 class="card-title">
             <wicket:message key="TaskOperationStatisticsPanel.resultingEntry"/>
         </h3>
-        <div><wicket:message key="TaskOperationStatisticsPanel.resultingEntry.info"/></div>
+        <span class="ml-1"><wicket:message key="TaskOperationStatisticsPanel.resultingEntry.info"/></span>
     </wicket:fragment>
 
 
     <wicket:fragment wicket:id="allActionsExecutedTitle">
         <h3 class="card-title">
             <wicket:message key="TaskOperationStatisticsPanel.actionEntry"/>
         </h3>
-        <div><wicket:message key="TaskOperationStatisticsPanel.actionEntry.info"/></div>
+        <span class="ml-1"><wicket:message key="TaskOperationStatisticsPanel.actionEntry.info"/></span>
     </wicket:fragment>
 
 </wicket:panel>

diff --git a/...a/com/evolveum/midpoint/gui/impl/page/admin/task/component/ActivitiesStatisticsPanel.java b/...a/com/evolveum/midpoint/gui/impl/page/admin/task/component/ActivitiesStatisticsPanel.java
@@ -27,6 +27,7 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
@@ -38,6 +39,7 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
 
+import javax.management.Attribute;
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;
 import java.util.ArrayList;
@@ -118,9 +120,8 @@ protected WebMarkupContainer createHeader(String headerId) {
                         return new Fragment(headerId, titleId, ActivitiesStatisticsPanel.this);
                     }
                 };
-
+        actionTable.getDataTableContainer().add(AttributeAppender.append("class", "table-responsive"));
         actionTable.setOutputMarkupId(true);
-//        actionTable.add(new VisibleBehaviour(() -> !dataProvider.getAvailableData().isEmpty() || dataProvider.size() > 0));
         add(actionTable);
     }