JBDS-4484 Fuse Tooling, Fuse and JBoss EAP should not be selected

Author: dgolovin

browser/model/installable-item.js

@@ -44,7 +44,7 @@ class InstallableItem {
 
     this.isCollapsed = true;
     this.option = new Set();
-    this.selectedOption = 'install';
+    this.selectedOption = requirement.defaultOption ? requirement.defaultOption : 'install';
 
     this.downloader = null;
     this.downloadFolder = this.installerDataSvc.tempDir();

browser/pages/confirm/controller.js

@@ -77,17 +77,17 @@ class ConfirmController {
       checkboxModel[node].references=0;
     }
     for (let node of nodes) {
-      let watchComponent = () => {
+      function watchComponent(newv, oldv) {
         let installer = checkboxModel[node];
         if(installer.isSelected()) {
-          for(let dep of this.graph.dependenciesOf(node)) {
+          for(let dep of graph.dependenciesOf(node)) {
             let depInstaller = checkboxModel[dep];
             if(depInstaller.references === 0 && depInstaller.isNotDetected()) {
               depInstaller.selectedOption = 'install';
             }
             depInstaller.references++;
           }
-        } else {
+        } else if(!installer.isSelected() && oldv === 'install') {
           for(let dep of graph.dependenciesOf(node)) {
             let depInstaller = checkboxModel[dep];
             depInstaller.references--;
@@ -96,7 +96,7 @@ class ConfirmController {
             }
           }
         }
-      };
+      }
       this.sc.$watch(`checkboxModel.${node}.selectedOption`, watchComponent);
     }
   }

requirements.json

@@ -35,6 +35,7 @@
     "additionalLocation": "",
     "additionalIus": "com.jboss.devstudio.fuse.feature.feature.group",
     "useDownload": false,
+    "defaultOption": "detected",
     "requires": ["devstudio"]
   },
   "fuseplatform": {
@@ -63,6 +64,7 @@
       }
     },
     "useDownload": true,
+    "defaultOption": "detected",
     "requires": ["jdk"]
   },
   "fuseplatformkaraf": {
@@ -80,6 +82,7 @@
      "fileName": "jboss-fuse-karaf-6.3.0.redhat-187.zip",
      "sha256sum": "4ef481bb22f4a9c688d03f46374917e0f2548229f94ebd817c33817baf203b0c",
      "useDownload": true,
+     "defaultOption": "detected",
      "requires": ["jdk"]
   },
   "jbosseap": {
@@ -97,6 +100,7 @@
     "fileName": "jboss-eap-7.0.0-installer.jar",
     "sha256sum": "8c4432464414ab986d0aa4c6b0faee94b797cf1f66949dd98496ca0ae54d7d35",
     "version": "7.0.0.GA",
+    "defaultOption": "detected",
     "requires": ["jdk"]
   },
   "jdk": {

test/ui/install-test.js

@@ -8,7 +8,7 @@ let loadMetadata = require('../../browser/services/metadata');
 let requirements = loadMetadata(require(path.join(rootPath, 'requirements.json')), process.platform);
 
 for (var key in requirements) {
-  if (requirements[key].bundle === 'tools') {
+  if (requirements[key].bundle === 'tools' || requirements[key].defaultOption && requirements[key].defaultOption === 'detected') {
     delete requirements[key];
   }
 }
@@ -19,8 +19,7 @@ describe('Installation page', function() {
 
   beforeAll(function() {
     browser.ignoreSynchronization = true;
-    browser.setLocation('install')
-    .then(function() {
+    browser.setLocation('install').then(function() {
       for (var key in requirements) {
         requirements[key].name = requirements[key].name.toUpperCase();
         requirements[key].panel = element(By.id(key + '-progress'));

test/unit/pages/confirm/controller-test.js

@@ -176,7 +176,7 @@ describe('ConfirmController', function() {
             && (el[0] == 'checkboxModel.jbosseap.selectedOption'
             || el[0] == 'checkboxModel.devstudio.selectedOption'
             || el[0] == 'checkboxModel.fusetools.selectedOption')) {
-            el[1]();
+            el[1]('detected', 'install');
           }
         });
         expect(confirmController.sc.checkboxModel.jdk.selectedOption).equals('detected');
@@ -187,12 +187,13 @@ describe('ConfirmController', function() {
       return confirmController.initPage().then(function() {
         expect(confirmController.sc.checkboxModel.jdk.selectedOption).equals('install');
         expect(confirmController.sc.checkboxModel.devstudio.selectedOption).equals('install');
-        expect(confirmController.sc.checkboxModel.jbosseap.selectedOption).equals('install');
+        expect(confirmController.sc.checkboxModel.jbosseap.selectedOption).equals('detected');
+        confirmController.sc.checkboxModel.jbosseap.selectedOption = 'install';
         $watch.args.forEach(function(el) {
           if(el[1].name == 'watchComponent'
             && ( el[0] == 'checkboxModel.jbosseap.selectedOption'
               || el[0] == 'checkboxModel.devstudio.selectedOption')) {
-            el[1]();
+            el[1]('install', 'install'); // the same does angular avter initialization
           }
         });
         confirmController.sc.checkboxModel.devstudio.selectedOption = 'detected';
@@ -201,7 +202,7 @@ describe('ConfirmController', function() {
           if(el[1].name == 'watchComponent'
             && ( el[0] == 'checkboxModel.jbosseap.selectedOption'
               || el[0] == 'checkboxModel.devstudio.selectedOption')) {
-            el[1]('detected');
+            el[1]('detected', 'install');
           }
         });
         expect(confirmController.sc.checkboxModel.jdk.selectedOption).equals('detected');
@@ -210,7 +211,7 @@ describe('ConfirmController', function() {
         $watch.args.forEach(function(el) {
           if(el[1].name == 'watchComponent'
             && el[0] == 'checkboxModel.devstudio.selectedOption') {
-            el[1]('install');
+            el[1]('install','detected');
           }
         });
         expect(confirmController.sc.checkboxModel.jdk.selectedOption).equals('install');
@@ -224,14 +225,14 @@ describe('ConfirmController', function() {
         $watch.args.forEach(function(el) {
           if(el[1].name == 'watchComponent'
             && el[0] == 'checkboxModel.cdk.selectedOption') {
-            el[1]('detected');
+            el[1]('install', 'detected');
           }
         });
         confirmController.sc.checkboxModel.cdk.selectedOption = 'detected';
         $watch.args.forEach(function(el) {
           if(el[1].name == 'watchComponent'
             && el[0] == 'checkboxModel.cdk.selectedOption') {
-            el[1]('detected');
+            el[1]('detected', 'install');
           }
         });
         expect(confirmController.sc.checkboxModel.cygwin.selectedOption).equals('detected');