Merge pull request #1371 from thiagotalma/dry-tabs

Show Dry Run Result with tabs
huginn · Mar 27, 2016 · d13edc2 · d13edc2
2 parents 692844f + 92064a0
commit d13edc2
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/app/assets/javascripts/components/utils.js.coffee b/app/assets/javascripts/components/utils.js.coffee
@@ -99,18 +99,32 @@ class @Utils
         $('body').css(cursor: 'auto')
       .done (json) =>
         Utils.showDynamicModal """
-          <h5>Log</h5>
-          <pre class="agent-dry-run-log"></pre>
-          <h5>Events</h5>
-          <pre class="agent-dry-run-events"></pre>
-          <h5>Memory</h5>
-          <pre class="agent-dry-run-memory"></pre>
+          <!-- Nav tabs -->
+          <ul id="resultTabs" class="nav nav-tabs agent-dry-run-tabs" role="tablist">
+            <li role="presentation"><a href="#tabEvents" aria-controls="tabEvents" role="tab" data-toggle="tab">Events</a></li>
+            <li role="presentation"><a href="#tabLog" aria-controls="tabLog" role="tab" data-toggle="tab">Log</a></li>
+            <li role="presentation"><a href="#tabMemory" aria-controls="tabMemory" role="tab" data-toggle="tab">Memory</a></li>
+          </ul>
+          <!-- Tab panes -->
+          <div class="tab-content">
+            <div role="tabpanel" class="tab-pane" id="tabEvents">
+              <pre class="agent-dry-run-events"></pre>
+            </div>
+            <div role="tabpanel" class="tab-pane" id="tabLog">
+              <pre><small class="agent-dry-run-log"></small></pre>
+            </div>
+            <div role="tabpanel" class="tab-pane" id="tabMemory">
+              <pre class="agent-dry-run-memory"></pre>
+            </div>
+          </div>
           """,
           body: (body) ->
             $(body).
               find('.agent-dry-run-log').text(json.log).end().
               find('.agent-dry-run-events').text(json.events).end().
               find('.agent-dry-run-memory').text(json.memory)
+            active = if json.events.match(/^\[?\s*\]?$/) then 'tabLog' else 'tabEvents'
+            $('#resultTabs a[href="#' + active + '"]').tab('show')
           title: 'Dry Run Results',
           onHide: callback
       .fail (xhr, status, error) ->

diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb
@@ -94,6 +94,11 @@ span.not-applicable:after {
   content: "n/a";
 }
 
+// Dry Run Results Tabs
+.nav.agent-dry-run-tabs {
+  margin-bottom: 20px;
+}
+
 // Navbar
 .nav > li {
   &.job-indicator, &#event-indicator {