Skip to content

Commit 44f4f54

Browse files
committed
Fix for templatified version of confirmation page
1. errors thrown if hyper-v is not supported 2. improved loading of dependents 3. fixed dependency graph loading
1 parent de85c7a commit 44f4f54

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

browser/pages/confirm/controller.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ class ConfirmController {
5252
}).then(
5353
()=> this.setIsDisabled()
5454
).catch((error)=> {
55-
Logger.error(error);
5655
this.setIsDisabled();
5756
});
5857
}
@@ -72,16 +71,17 @@ class ConfirmController {
7271
let checkboxModel = this.sc.checkboxModel;
7372
for (let node of nodes) {
7473
checkboxModel[node].dependenciesOf = [];
74+
for(let dependant of this.graph.dependantsOf(node)) {
75+
checkboxModel[node].dependenciesOf.push(checkboxModel[dependant]);
76+
}
7577
checkboxModel[node].references=0;
7678
}
7779
for (let node of nodes) {
7880
let watchComponent = () => {
7981
let installer = checkboxModel[node];
80-
installer.dependenciesOf = [];
8182
if(installer.isSelected()) {
8283
for(let dep of this.graph.dependenciesOf(node)) {
8384
let depInstaller = checkboxModel[dep];
84-
depInstaller.dependenciesOf.push(installer);
8585
if(depInstaller.references === 0 && depInstaller.isNotDetected()) {
8686
depInstaller.selectedOption = 'install';
8787
}

browser/services/componentLoader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class ComponentLoader {
113113
let orDeps = dep.split('||');
114114
for(let orDep of orDeps) {
115115
let installable = svc.getInstallable(orDep);
116-
if(installable.isConfigured() || installable.isSelected()) {
116+
if(installable.isDetected()) {
117117
graph.addDependency(key, orDep);
118118
break;
119119
}

requirements.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
"vtxDisabledWin": {
264264
"message": "Please enable hardware virtualization support in BIOS for your platform.",
265265
"type": "error",
266-
"isVisible": "process.platform === 'win32' && !installerDataSvc.getInstallable('hyperv').isConfigured() && installerDataSvc.getInstallable('virtualbox').virtualizationEnabled === false && (installerDataSvc.getInstallable('cdk').selectedOption == 'install' || installerDataSvc.getInstallable('virtualbox').selectedOption == 'install')"
266+
"isVisible": "process.platform === 'win32' && installerDataSvc.getInstallable('hyperv') && !installerDataSvc.getInstallable('hyperv').isConfigured() && installerDataSvc.getInstallable('virtualbox').virtualizationEnabled === false && (installerDataSvc.getInstallable('cdk').selectedOption == 'install' || installerDataSvc.getInstallable('virtualbox').selectedOption == 'install')"
267267
},
268268
"vtxDisabledDawin": {
269269
"message": "Please enable hardware virtualization for your platform.",
@@ -273,7 +273,7 @@
273273
"vtxUndefined": {
274274
"message": "Please make sure hardware virtualization is enabled on your platform if supported.",
275275
"type": "warning",
276-
"isVisible": "!installerDataSvc.getInstallable('hyperv').isConfigured() && installerDataSvc.getInstallable('virtualbox').virtualizationEnabled === undefined && installerDataSvc.getInstallable('cdk').selectedOption == 'install'"
276+
"isVisible": "installerDataSvc.getInstallable('hyperv') && !installerDataSvc.getInstallable('hyperv').isConfigured() && installerDataSvc.getInstallable('virtualbox').virtualizationEnabled === undefined && installerDataSvc.getInstallable('cdk').selectedOption == 'install'"
277277
}
278278
}
279279
},

0 commit comments

Comments
 (0)