Move some logic from template to items

Author: jrichter1

browser/directives/componentPanel.html

@@ -1,7 +1,7 @@
-<div>
-  <div id="{{item.keyName}}-panel" class="panel panel-default panel2pxborder" ng-hide="item === undefined" ng-class="{'zero-border':item.isDetected() || (item.installable === false && item.detectable === true && item.selectedOption === 'detected')}">
+<div ng-hide="item === undefined || item.hidden === true">
+  <div id="{{item.keyName}}-panel" class="panel panel-default panel2pxborder" ng-class="{'zero-border':item.isDetected()}">
     <div id="{{item.keyName}}-panel-heading" class="panel-heading panel-normal"
-         ng-class="{'dotted-panel':item.isDetected() || (item.installable === false && item.detectable === true && item.selectedOption === 'detected')}">
+         ng-class="{'dotted-panel':item.isDetected()}">
          <div class="checkbox-container verticalLine">
            <input id="{{item.keyName}}-checkbox" type="checkbox" ng-disabled="item.isDisabled()" ng-model="item.selectedOption" aria-label="Toggle ngHide" class="vallign-middle" ng-true-value="'install'" ng-false-value="'detected'">
          </div>
@@ -34,20 +34,20 @@
   <div class="help-block" ng-show="item.messages.info !== undefined && !item.isDetected()">
     <span class="pficon pficon-info"></span>
     <span>{{item.messages.info.message.split(item.messages.info.linkDescription)[0]}}</span>
-    <a type="button" class="pointer" ng-click="confCtrl.download(item.messages.info.link ? item.messages.info.link : item.downloadUrl)">
+    <a type="button" class="pointer" ng-click="openUrl(item.messages.info.link ? item.messages.info.link : item.downloadUrl)">
       {{item.messages.info.linkDescription}}</a>
     <span>{{item.messages.info.message.split(item.messages.info.linkDescription)[1]}}</span>
   </div>
 
-  <div class="message-container error-message" ng-show="filtered.length > 0 && !item.isConfigured() && !confCtrl.isDisabled">
+  <div class="message-container error-message" ng-show="filtered.length > 0 && !item.isConfigured()">
     <span class="pficon pficon-error-circle-o"></span>
     <span>You have selected
       <ng-repeat ng-repeat="dep in filtered = (item.dependenciesOf | filter: {selectedOption: 'install'} | limitTo:1)">
         <span>{{dep.productName}},</span>
       </ng-repeat> which requires {{item.productName}} version {{item.minimumVersion}} or higher.</span>
       <span ng-show="item.messages.dependency !== undefined">
         <span>{{item.messages.dependency.message.split(item.messages.dependency.linkDescription)[0]}}</span>
-        <a type="button" class="pointer" ng-click="confCtrl.download(item.messages.dependency.link ? item.messages.dependency.link : item.downloadUrl)">
+        <a type="button" class="pointer" ng-click="openUrl(item.messages.dependency.link ? item.messages.dependency.link : item.downloadUrl)">
           {{item.messages.dependency.linkDescription}}</a>
         <span>{{item.messages.dependency.message.split(item.messages.dependency.linkDescription)[1]}}</span>
       </span>

browser/directives/componentPanel.js

@@ -2,12 +2,17 @@
 
 function componentPanel() {
   return {
-    controller: 'ConfirmController as confCtrl',
+    controller: ('componentController', ['$scope', 'electron', function($scope, electron) {
+      $scope.openUrl = function(url) {
+        electron.shell.openExternal(url);
+      }
+    }]),
     restrict: 'E',
     replace: true,
     scope: {
       item: '='
     },
+    transclude: true,
     templateUrl: 'directives/componentPanel.html'
   };
 }

browser/model/hyperv.js

@@ -20,6 +20,7 @@ class HypervInstall extends InstallableItem {
           this.addOption('detected', '', '', detected);
         }
         this.hypervstatus = detected;
+        this.hidden = this.hypervstatus === undefined;
         this.selectedOption = 'detected';
         return Promise.resolve(detected);
       }).then((detected)=> {
@@ -47,6 +48,14 @@ class HypervInstall extends InstallableItem {
     return Platform.OS == 'win32' && this.option.detected != undefined;
   }
 
+  isDetected() {
+    if (Platform.getOS() === 'win32') {
+      return this.hypervstatus || this.hypervstatus === false;
+    } else {
+      return false;
+    }
+  }
+
   isSkipped() {
     if (Platform.OS === 'win32') {
       return super.isSkipped();

browser/model/installable-item.js

@@ -17,8 +17,6 @@ class InstallableItem {
     this.productName = requirement.name;
     this.productVersion = requirement.version;
     this.productDesc = requirement.description;
-    this.detectable = requirement.detectable;
-    this.installable = requirement.installable;
     this.targetFolderName = targetFolderName;
     this.installerDataSvc = installerDataSvc;
     this.existingInstall = false;

browser/model/jdk-install.js

@@ -197,12 +197,20 @@ class JdkInstall extends InstallableItem {
   }
 
   isConfigured() {
-    if (Platform.OS === 'darwin') {
-      return this.isDetected() && this.option['detected'].valid;
+    if (Platform.getOS() === 'darwin') {
+      return this.isDetected() && this.option.detected && this.option.detected.valid;
     }
     return super.isConfigured();
   }
 
+  isDetected() {
+    if (Platform.getOS() === 'darwin') {
+      return true;
+    } else {
+      return super.isDetected();
+    }
+  }
+
   isNotDetected() {
     if (Platform.getOS() === 'darwin') {
       return false;