Merge pull request #423 from wttech/reformat-summary

reformat summary entries
wttech · Oct 31, 2023 · 102f3d0 · 102f3d0
2 parents 511d1c9 + e447e9b
commit 102f3d0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 23 deletions.
diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/services/ExecutionResult.java b/app/aem/api/src/main/java/com/cognifide/apm/api/services/ExecutionResult.java
@@ -42,12 +42,8 @@ interface Entry {
 
     List<String> getMessages();
 
-    List<String> getPrettyMessages();
-
     List<String> getParameters();
 
-    List<String> getPrettyParameters();
-
     Status getStatus();
   }
 }
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/logger/ProgressEntry.java b/app/aem/core/src/main/java/com/cognifide/apm/core/logger/ProgressEntry.java
@@ -26,7 +26,6 @@
 import com.google.common.collect.ImmutableList;
 import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class ProgressEntry implements Entry {
 
@@ -71,25 +70,11 @@ public List<String> getMessages() {
     return messages;
   }
 
-  @Override
-  public List<String> getPrettyMessages() {
-    return messages.stream()
-        .map(message -> message.replaceAll("\n", "<br>").replaceAll("\t", "&nbsp;&nbsp;&nbsp;&nbsp;"))
-        .collect(Collectors.toList());
-  }
-
   @Override
   public List<String> getParameters() {
     return parameters;
   }
 
-  @Override
-  public List<String> getPrettyParameters() {
-    return parameters.stream()
-        .map(message -> message.replaceAll("\n", "<br>").replaceAll("\t", "&nbsp;&nbsp;&nbsp;&nbsp;"))
-        .collect(Collectors.toList());
-  }
-
   @Override
   public Status getStatus() {
     return status;

diff --git a/.../ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/summary/css/styles.less b/.../ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/summary/css/styles.less
@@ -23,4 +23,8 @@
       background-color: rgba(221, 52, 52, 0.7);
     }
   }
-}
+}
+
+li {
+  white-space: pre-wrap;
+}
diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/components/reference/reference.html b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/components/reference/reference.html
@@ -50,7 +50,7 @@ <h3><a name="available-commands">Available commands</a></h3>
             <p>${map.description}</p>
             <div data-sly-test="${map.examples}" class="code-example">
               <strong>Examples</strong>
-              <code data-sly-repeat.example="${map.examples}">${example @ context='html'}</code>
+              <code data-sly-repeat.example="${map.examples}">${example}</code>
             </div>
           </td>
         </tr>

diff --git a/...ui.apps.base/src/main/content/jcr_root/apps/apm/components/summaryTable/summaryTable.html b/...ui.apps.base/src/main/content/jcr_root/apps/apm/components/summaryTable/summaryTable.html
@@ -55,15 +55,15 @@
         <td class="_coral-Table-cell">${execution.command.toUpperCase}</td>
         <td class="_coral-Table-cell">
           <ul>
-            <li data-sly-repeat.text="${execution.prettyParameters}">${text @ context='html'}</li>
+            <li data-sly-repeat.text="${execution.parameters}">${text}</li>
           </ul>
         </td>
         <td class="_coral-Table-cell">
           <coral-icon title="${execution.status.iconTitle}" icon="${execution.status.iconType}"/>
         </td>
         <td class="_coral-Table-cell">
           <ul>
-            <li data-sly-repeat.text="${execution.prettyMessages}">${text @ context='html'}</li>
+            <li data-sly-repeat.text="${execution.messages}">${text}</li>
           </ul>
         </td>
       </tr>
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,4 +23,8 @@ @@
           background-color: rgba(221, 52, 52, 0.7);
         }
       }
-    }
+    }
+    li {
+      white-space: pre-wrap;
+    }