gh-3892 Add toggle btn for server tasks line wrapping

gchq · Nov 2, 2023 · b10178e · b10178e
1 parent 1c8e707
commit b10178e
Show file tree

Hide file tree

Showing 9 changed files with 149 additions and 125 deletions.
diff --git a/stroom-app/src/main/resources/ui/images/save.svg b/stroom-app/src/main/resources/ui/images/save.svg
diff --git a/stroom-app/src/main/resources/ui/images/text-wrap.svg b/stroom-app/src/main/resources/ui/images/text-wrap.svg
diff --git a/stroom-app/src/main/resources/ui/raw-images/save.svg b/stroom-app/src/main/resources/ui/raw-images/save.svg
diff --git a/stroom-app/src/main/resources/ui/raw-images/text-wrap.svg b/stroom-app/src/main/resources/ui/raw-images/text-wrap.svg
diff --git a/stroom-core-client/src/main/java/stroom/task/client/presenter/TaskManagerListPresenter.java b/stroom-core-client/src/main/java/stroom/task/client/presenter/TaskManagerListPresenter.java
@@ -106,6 +106,7 @@ public class TaskManagerListPresenter
     private final ButtonView collapseAllButton;
     private final ButtonView warningsButton;
     private final InlineSvgToggleButton autoRefreshButton;
+    private final InlineSvgToggleButton wrapToggleButton;
 
     private String currentWarnings;
     private Column<TaskProgress, Expander> expanderColumn;
@@ -148,6 +149,12 @@ public TaskManagerListPresenter(final EventBus eventBus,
         warningsButton = getView().addButton(SvgPresets.ALERT.title("Show Warnings"));
         warningsButton.setVisible(false);
 
+        wrapToggleButton = new InlineSvgToggleButton();
+        wrapToggleButton.setSvg(SvgImage.TEXT_WRAP);
+        wrapToggleButton.setTitle("Toggle wrapping of Info column");
+        wrapToggleButton.setOff();
+        getView().addButton(wrapToggleButton);
+
         updateButtonStates();
 
         initTableColumns();
@@ -213,6 +220,17 @@ protected void onBind() {
                 }
             }
         }));
+
+        registerHandler(wrapToggleButton.addClickHandler(event -> {
+            if ((event.getNativeButton() & NativeEvent.BUTTON_LEFT) != 0) {
+                if (wrapToggleButton.isOff()) {
+                    wrapToggleButton.setTitle("Turn Cell Line Wrapping On");
+                } else {
+                    wrapToggleButton.setTitle("Turn Cell Line Wrapping Off");
+                }
+                internalRefresh();
+            }
+        }));
     }
 
     private void showWarnings() {
@@ -308,12 +326,12 @@ protected void showInfo(final TaskProgress row, final PopupPosition popupPositio
 
         // Name.
         dataGrid.addResizableColumn(
-                DataGridUtil.htmlColumnBuilder(getColouredCellFunc(TaskProgress::getTaskName))
+                DataGridUtil.htmlColumnBuilder(getWrapableColouredCellFunc(TaskProgress::getTaskName))
                         .withSorting(FindTaskProgressCriteria.FIELD_NAME)
                         .withStyleName(MyDataGrid.RESOURCES.dataGridStyle().dataGridCellVerticalTop())
                         .build(),
                 FindTaskProgressCriteria.FIELD_NAME,
-                150);
+                250);
 
         // User.
         dataGrid.addResizableColumn(
@@ -346,9 +364,8 @@ protected void showInfo(final TaskProgress row, final PopupPosition popupPositio
 
         // Info
         dataGrid.addAutoResizableColumn(
-                DataGridUtil.htmlColumnBuilder(getColouredCellFunc(TaskProgress::getTaskInfo))
+                DataGridUtil.htmlColumnBuilder(getWrapableColouredCellFunc(TaskProgress::getTaskInfo))
                         .withSorting(FindTaskProgressCriteria.FIELD_INFO)
-                        .withStyleName(MyDataGrid.RESOURCES.dataGridStyle().dataGridCellWrapText())
                         .withStyleName(MyDataGrid.RESOURCES.dataGridStyle().dataGridCellVerticalTop())
                         .build(),
                 FindTaskProgressCriteria.FIELD_INFO,
@@ -392,6 +409,23 @@ private Function<TaskProgress, SafeHtml> getColouredCellFunc(final Function<Task
                 TaskProgress::isMatchedInFilter);
     }
 
+    private Function<TaskProgress, SafeHtml> getWrapableColouredCellFunc(final Function<TaskProgress, String> extractor) {
+        final Function<TaskProgress, SafeHtml> colouredCellFunc = getColouredCellFunc(extractor);
+
+        return (TaskProgress row) -> {
+            final Attribute wrapClassAttr = Attribute.className(
+                    MyDataGrid.RESOURCES.dataGridStyle().dataGridCellWrapText());
+            final SafeHtml colouredText = colouredCellFunc.apply(row);
+            if (wrapToggleButton.isOn()) {
+                return HtmlBuilder.builder()
+                        .div(htmlBuilder -> htmlBuilder.append(colouredText), wrapClassAttr)
+                        .toSafeHtml();
+            } else {
+                return colouredText;
+            }
+        };
+    }
+
     private Expander buildExpander(final TaskProgress row) {
         return row.getExpander();
     }