Introduce arbitrary message conditions

Author: jrichter1

browser/directives/componentPanel.html

@@ -52,4 +52,12 @@
         <span>{{item.messages.dependency.message.split(item.messages.dependency.linkDescription)[1]}}</span>
       </span>
   </div>
+
+  <div ng-repeat="message in item.messages.misc">
+    <div ng-show="evaluateCondition(message.isVisible)" class="message-container" ng-class="{'error-message': message.type === 'error', 'warning-message': message.type === 'warning'}">
+      <span ng-show="message.type === 'error'" class="pficon pficon-error-circle-o"></span>
+      <span ng-show="message.type === 'warning'" class="pficon pficon-warning-triangle-o"></span>
+      <span>{{message.message}}</span>
+    </div>
+  </div>
 </div>

browser/directives/componentPanel.js

@@ -2,10 +2,15 @@
 
 function componentPanel() {
   return {
-    controller: ('componentController', ['$scope', 'electron', function($scope, electron) {
+    controller: ('componentController', ['$scope', 'electron', 'installerDataSvc', function($scope, electron, installerDataSvc) {
       $scope.openUrl = function(url) {
         electron.shell.openExternal(url);
-      }
+      };
+
+      $scope.evaluateCondition = function(content) {
+        let evaluate = new Function('installerDataSvc', 'return ' + content);
+        return evaluate(installerDataSvc);
+      };
     }]),
     restrict: 'E',
     replace: true,

browser/model/installable-item.js

@@ -54,7 +54,7 @@ class InstallableItem {
     this.authRequired = authRequired;
     this.references = 0;
 
-    this.messages = require('./messages.json')[this.keyName];
+    this.messages = requirement.messages;
   }
 
   getProductName() {

browser/model/messages.json

@@ -13,21 +13,6 @@
 
     <div ng-repeat="item in checkboxModel">
       <component-panel item="item"></component-panel>
-
-      <div class="message-container error-message" ng-show="item.keyName === 'virtualbox' && !confCtrl.isDisabled && !checkboxModel.hyperv.isConfigured() && checkboxModel.virtualbox.virtualizationEnabled === false && (checkboxModel.cdk.selectedOption == 'install' || checkboxModel.virtualbox.selectedOption == 'install') && platform === 'win32'">
-        <span class="pficon pficon-error-circle-o"></span>
-        <span>Please enable hardware virtualization support in BIOS for your platform.</span>
-      </div>
-
-      <div class="message-container error-message" ng-show="item.keyName === 'virtualbox' && !confCtrl.isDisabled && checkboxModel.virtualbox.virtualizationEnabled === false && (checkboxModel.cdk.selectedOption == 'install' || checkboxModel.virtualbox.selectedOption == 'install') && platform === 'darwin'">
-        <span class="pficon pficon-error-circle-o"></span>
-        <span>Please enable hardware virtualization for your platform.</span>
-      </div>
-
-      <div class="message-container warning-message" ng-show="item.keyName === 'virtualbox' && !confCtrl.isDisabled && !checkboxModel.hyperv.isConfigured() && checkboxModel.virtualbox.virtualizationEnabled === undefined && checkboxModel.cdk.selectedOption == 'install'">
-        <span class="pficon pficon-warning-triangle-o"></span>
-        <span>Please make sure hardware virtualization is enabled on your platform if supported.</span>
-      </div>
     </div>
   </form>
 

browser/pages/confirm/confirm.html

@@ -126,7 +126,13 @@
         "fileName": "",
         "sha256sum": "",
         "version": "1.8.0",
-        "virusTotalReport": ""
+        "virusTotalReport": "",
+        "messages": {
+          "dependency": {
+            "message": "Due to licence limitations we may not install Java for you. Please install JDK version 1.8.0 downloaded from this location and restart the Installer to continue.",
+            "linkDescription": "this location"
+          }
+        }
       },
       "linux": {
         "name": "OpenJDK",
@@ -189,6 +195,13 @@
     "detectable": false,
     "targetFolderName": "kompose",
     "version": "1.0.0 Technology Preview",
+    "messages": {
+      "info": {
+        "message": "For additional information and documentation visit http://kompose.io",
+        "link": "http://kompose.io",
+        "linkDescription": "http://kompose.io"
+      }
+    },
     "platform": {
       "win32": {
         "url": "https://github.com/kubernetes/kompose/releases/download/v1.0.0/kompose-windows-amd64.exe",
@@ -221,6 +234,13 @@
     "revision": "112440",
     "virusTotalReport": "",
     "vendor": "Microsoft, Inc.",
+    "messages": {
+      "info": {
+        "message": "Follow these steps to install and enable Microsoft Hyper-V on Windows 10",
+        "link": "https://access.redhat.com/documentation/en-us/red_hat_container_development_kit/2.4/html/installation_guide/installing_container_development_kit_on_microsoft_windows#windows-add-sw",
+        "linkDescription": "these steps"
+      }
+    },
     "platform": {
       "win32": {}
     }
@@ -235,6 +255,28 @@
     "bundle": "no",
     "targetFolderName": "virtualbox",
     "installAfter": "jdk",
+    "messages": {
+      "dependency": {
+        "message": "Please uninstall detected Oracle VirtualBox and restart Installer to continue."
+      },
+      "misc": {
+        "vtxDisabledWin": {
+          "message": "Please enable hardware virtualization support in BIOS for your platform.",
+          "type": "error",
+          "isVisible": "!installerDataSvc.getInstallable('hyperv').isConfigured() && installerDataSvc.getInstallable('virtualbox').virtualizationEnabled === false && (installerDataSvc.getInstallable('cdk').selectedOption == 'install' || installerDataSvc.getInstallable('virtualbox').selectedOption == 'install') && process.platform === 'win32'"
+        },
+        "vtxDisabledDawin": {
+          "message": "Please enable hardware virtualization for your platform.",
+          "type": "error",
+          "isVisible": "installerDataSvc.getInstallable('virtualbox').virtualizationEnabled === false && (installerDataSvc.getInstallable('cdk').selectedOption == 'install' || installerDataSvc.getInstallable('virtualbox').selectedOption == 'install') && process.platform === 'darwin'"
+        },
+        "vtxUndefined": {
+          "message": "Please make sure hardware virtualization is enabled on your platform if supported.",
+          "type": "warning",
+          "isVisible": "!installerDataSvc.getInstallable('hyperv').isConfigured() && installerDataSvc.getInstallable('virtualbox').virtualizationEnabled === undefined && installerDataSvc.getInstallable('cdk').selectedOption == 'install'"
+        }
+      }
+    },
     "platform": {
       "win32": {
         "url": "http://download.virtualbox.org/virtualbox/5.1.24/VirtualBox-5.1.24-117012-Win.exe",