Merge ~ya-bo-ng/maas:logs-tab into maas:master

[Anthony Dillon]

LP: #1750015 - Reinstate the logic around node logs

Reinstate the access and view logic for node logs in the node details page.

[Lee Trager (ltrager)]

Thanks for fixing this. This bring back the logs tab but there are still two things wrong with the page

1. The drop doesn't work. It should always have Machine output (YAML), Machine output (XML), and if the machine is being deployed or is deployed the installation log.
2. The log output isn't readable, this seemed to be related to LP:1750007

Were you planning on fixing those separately?

https://screenshots.firefox.com/s37NLxsWjbciVlKM/10.0.0.2

review: Needs Information

[Anthony Dillon (ya-bo-ng)]

Thanks for the review Lee.

1. I noticed the drop down wasn't working but wasn't sure if there was only one option. I will take a look at the logic there.

2. Yeah, fixed in a current branch :) https://code.launchpad.net/~ya-bo-ng/maas/+git/maas/+merge/338451

[Andres Rodriguez (andreserl)]

@Ant,

I believe you've noticed already that the drop down is there, just not placed correctly [1]. Is this something that will be updated in this brnach or will you put a different branch?

If it is a different branch, I'm fine approving this one.

[1]: https://launchpadlibrarian.net/357905962/logs-tab-2-options-not-in-right-place.png

[Anthony Dillon (ya-bo-ng)]

@Andras Soory, was EOD. I will fix the drop down in this branch. I think its best to capture everything we can in page branches then rely on follow ups.

[Anthony Dillon (ya-bo-ng)]

@andres Pushed a fix for the drop down menu.

[Andres Rodriguez (andreserl)]

Lgtm!

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b logs-tab lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/1682/consoleText

[MAAS Lander (maas-lander)]

LANDING
-b logs-tab lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/1685/consoleText

[MAAS Lander (maas-lander)]

LANDING
-b logs-tab lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/1686/consoleText

[MAAS Lander (maas-lander)]

LANDING
-b logs-tab lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/1688/consoleText

diff --git a/src/maasserver/static/js/angular/directives/call_to_action.js b/src/maasserver/static/js/angular/directives/call_to_action.js
index b82d57c..f43ca05 100644
--- a/src/maasserver/static/js/angular/directives/call_to_action.js
+++ b/src/maasserver/static/js/angular/directives/call_to_action.js
@@ -7,7 +7,7 @@
 angular.module('MAAS').run(['$templateCache', function ($templateCache) {
     // Inject the cta.html into the template cache.
     $templateCache.put('directive/templates/cta.html', [
-      '<div>',
+      '<div class="p-contextual-menu">',
         '<button ',
           'class="p-button p-contextual-menu__toggle" ',
           'aria-controls="#cta-menu" ',
diff --git a/src/maasserver/static/partials/node-details.html b/src/maasserver/static/partials/node-details.html
index 2f9d2f9..b4b3cb9 100755
--- a/src/maasserver/static/partials/node-details.html
+++ b/src/maasserver/static/partials/node-details.html
@@ -297,9 +297,9 @@
                         data-ng-click="section.area = 'testing'"><span data-maas-script-status="script-status" data-script-status="node.testing_status"></span> Hardware tests</a>
                 </li>
                 <li class="p-tabs__item" role="presentation">
-                    <a role="tab" class="p-tabs__link" data-ng-if="machine_output.viewable"
+                    <a role="tab" class="p-tabs__link" data-ng-if="node.has_logs"
                         data-ng-class="{ 'is-active': section.area === 'logs'}"
-                        data-ng-click="section.area = 'logs'"><span data-maas-script-status="script-status" data-script-status="node.installation_status" data-ng-if="node.installation_results.length > 0"></span> Logs</a>
+                        data-ng-click="section.area = 'logs'"><span data-maas-script-status="script-status" data-script-status="node.installation_status" data-ng-if="node.installation_status !== -1"></span> Logs</a>
                 </li>
                 <li class="p-tabs__item" role="presentation">
                     <a role="tab" class="p-tabs__link" data-ng-if="!isDevice"
@@ -2682,28 +2682,23 @@
         </div>
     </section>
     <section class="p-strip" data-ng-if="section.area === 'logs'">
-        <div class="row">
-            <div class="col-12">
-                <div data-maas-cta="machine_output.views"
-                    data-ng-model="machine_output.selectedView">
+        <div data-ng-controller="NodeResultsController">
+            <div class="row" data-ng-if="!resultsLoaded">
+                <div class="col-12">
+                    <p class="u-text--loading"><i class="p-icon--spinner u-animation--spin"></i>&nbsp;&nbsp;Loading...</p>
                 </div>
             </div>
-        </div>
-        <div class="row" data-ng-if="machine_output.selectedView.name == 'summary_yaml'">
-            <div class="col-12">
-                <pre class="p-code-numbered" data-maas-code-lines="getSummaryData('yaml')">
-                </pre>
-            </div>
-        </div>
-        <div class="row" data-ng-if="machine_output.selectedView.name == 'summary_xml'">
-            <div class="col-12">
-                <pre class="p-code-numbered" data-maas-code-lines="getSummaryData('xml')">
-                </pre>
-            </div>
-        </div>
-        <div class="row" data-ng-if="machine_output.selectedView.name == 'installation'">
-            <div class="col-12">
-                <pre class="p-code-numbered" data-maas-code-lines="getInstallationData()"></pre>
+            <div data-ng-if="resultsLoaded">
+                <div class="row">
+                    <div class="col-12">
+                        <div data-maas-cta="logs.availableOptions" data-ng-model="logs.option" data-ng-change="updateLogOutput()"></div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-12">
+                        <pre class="p-code-numbered" data-maas-code-lines="logOutput"></pre>
+                    </div>
+                </div>
             </div>
         </div>
     </section>