Merge ~steverydz/maas:1830133-undefined-logs into maas:master

[Steve Rydz]

LP: #1830133 - Fix broken logs

Done:
- Fix some minor eslint issues
- Added a guard against undefined VLAN
- Fixed logs showing as undefined

QA:
- Go to a machine detail page and click the logs (this needs to be a machine with logs)
- See that the logs show information rather than just a list of the string "undefined"

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

[Caleb Ellis (caleb-ellis)]

LGTM +1

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b 1830133-undefined-logs lp:~steverydz/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/5739/consoleText

diff --git a/src/maasserver/static/js/angular/controllers/node_details.js b/src/maasserver/static/js/angular/controllers/node_details.js
index 1c9833b..d8cc6ba 100644
--- a/src/maasserver/static/js/angular/controllers/node_details.js
+++ b/src/maasserver/static/js/angular/controllers/node_details.js
@@ -152,6 +152,7 @@ function NodeDetailsController(
     if (
       !$scope.hideHighAvailabilityNotification &&
       $scope.node.dhcp_on &&
+      $scope.vlan &&
       $scope.vlan.rack_sids.length > 1 &&
       !$scope.vlan.secondary_rack &&
       $scope.node.node_type !== NodeTypes.REGION_CONTROLLER
@@ -161,12 +162,10 @@ function NodeDetailsController(
         $scope.section.area === "vlans"
       ) {
         return true;
-      } else {
-        return false;
       }
-    } else {
-      return false;
     }
+
+    return false;
   };
 
   // Get the display text for device ip assignment type.
diff --git a/src/maasserver/static/js/angular/controllers/node_results.js b/src/maasserver/static/js/angular/controllers/node_results.js
index 6ebccb9..2b98c99 100644
--- a/src/maasserver/static/js/angular/controllers/node_results.js
+++ b/src/maasserver/static/js/angular/controllers/node_results.js
@@ -40,7 +40,6 @@ function NodeResultsController(
 
   function updateLogs() {
     var i;
-    var option;
     var had_installation = $scope.logs.availableOptions.length === 3;
     $scope.logs.availableOptions.length = 0;
     // XXX ltrager 2017-12-01 - Only show the current installation log
diff --git a/src/maasserver/static/js/angular/directives/code_lines.js b/src/maasserver/static/js/angular/directives/code_lines.js
index 1c78b1f..43265a9 100644
--- a/src/maasserver/static/js/angular/directives/code_lines.js
+++ b/src/maasserver/static/js/angular/directives/code_lines.js
@@ -29,8 +29,8 @@ function maasCodeLines() {
 
         // Each line is to be wrapped by a span which is style & given
         // its appropriate line number
-        angular.forEach(lines, function() {
-          insert += newLine + '<span class="code-line">' + this + "</span>";
+        angular.forEach(lines, function(line) {
+          insert += newLine + '<span class="code-line">' + line + "</span>";
           newLine = "\n";
         });
         insert += "</code>";
diff --git a/src/maasserver/static/partials/node-details.html b/src/maasserver/static/partials/node-details.html
index be59e3d..7d4e436 100755
--- a/src/maasserver/static/partials/node-details.html
+++ b/src/maasserver/static/partials/node-details.html
@@ -3160,7 +3160,6 @@
                                 No logs found.
                             </p>
                         </div>
-
                     </div>
                 </div>
             </div>