Skip to content

Commit d4cd045

Browse files
jrichter1jrichter1
committed
wip working template without messages
1 parent eb757d1 commit d4cd045

4 files changed

Lines changed: 50 additions & 35 deletions

File tree

‎browser/directives/componentPanel.html‎

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,34 @@
1-
<div id="{{item.keyName}}-panel" class="panel panel-default panel2pxborder" ng-hide="item === undefined" ng-class="{'zero-border':item.isDetected() || (item.selectedOption === 'detected' && !item.hasOption('detected'))}">
2-
<div id="{{item.keyName}}-panel-heading" class="panel-heading panel-normal"
3-
ng-class="{'dotted-panel':item.isDetected() || (item.selectedOption === 'detected' && !item.hasOption('detected'))}">
4-
<div class="checkbox-container verticalLine">
5-
<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'">
6-
</div>
7-
<div class="product-container">
8-
<div class="warnings-in-panel">
9-
<span id="{{item.keyName}}-installed-note" class="installed-note" ng-show="item.hasOption('detected') && item.selectedOption === 'detected'">
10-
<i class="fa fa-check"></i> Using detected version {{item.option.detected.version}}
11-
</span>
12-
<div ng-show="item.hasOption('detected')">
13-
<div id="{{item.keyName}}-newer-warning" ng-show="item.option.detected.warning !== '' && item.selectedOption === 'detected'" class="has-warning">
14-
<div class="help-block">
15-
<span class="pficon pficon-warning-triangle-o"></span>
16-
<span>Newer than required!</span>
1+
<div>
2+
<div id="{{item.keyName}}-panel" class="panel panel-default panel2pxborder" ng-hide="item === undefined" ng-class="{'zero-border':item.isDetected() || (item.selectedOption === 'detected' && !item.hasOption('detected'))}">
3+
<div id="{{item.keyName}}-panel-heading" class="panel-heading panel-normal"
4+
ng-class="{'dotted-panel':item.isDetected() || (item.selectedOption === 'detected' && !item.hasOption('detected'))}">
5+
<div class="checkbox-container verticalLine">
6+
<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'">
7+
</div>
8+
<div class="product-container">
9+
<div class="warnings-in-panel">
10+
<span id="{{item.keyName}}-installed-note" class="installed-note" ng-show="item.hasOption('detected') && item.selectedOption === 'detected'">
11+
<i class="fa fa-check"></i> Using detected version {{item.option.detected.version}}
12+
</span>
13+
<div ng-show="item.hasOption('detected')">
14+
<div id="{{item.keyName}}-newer-warning" ng-show="item.option.detected.warning !== '' && item.selectedOption === 'detected'" class="has-warning">
15+
<div class="help-block">
16+
<span class="pficon pficon-warning-triangle-o"></span>
17+
<span>Newer than required!</span>
18+
</div>
1719
</div>
18-
</div>
19-
<div id="{{item.keyName}}-older-warning" ng-show="item.option.detected.error !=='' && item.selectedOption === 'detected'" class="has-warning">
20-
<div class="help-block">
21-
<span class="pficon pficon-warning-triangle-o"></span>
22-
<span>Older than required!</span>
20+
<div id="{{item.keyName}}-older-warning" ng-show="item.option.detected.error !=='' && item.selectedOption === 'detected'" class="has-warning">
21+
<div class="help-block">
22+
<span class="pficon pficon-warning-triangle-o"></span>
23+
<span>Older than required!</span>
24+
</div>
2325
</div>
2426
</div>
2527
</div>
28+
<span id="{{item.keyName}}-name" class="product-name">{{item.productName}}</span><span id="{{item.keyName}-version" class="product-version">{{item.version}}</span>
29+
<div id="{{item.keyName}}-description">{{item.productDesc}}</div>
2630
</div>
27-
<span id="{{item.keyName}}-name" class="product-name">{{item.productName}}</span><span id="{{item.keyName}-version" class="product-version">{{item.version}}</span>
28-
<div id="{{item.keyName}}-description">{{item.productDesc}}</div>
29-
</div>
30-
</div>
31-
<div ng-show="item.dependenciesOf.length > 0 && !item.isConfigured()">
32-
<span class="pficon pficon-error-circle-o"></span>
33-
<span>You have selected {{item.dependenciesOf[0].productName}} which requires {{item.productName}}</span>
3431
</div>
35-
</div>
3632
<!-- <div>
3733
<div class="message-container error-message" ng-show="!confCtrl.isDisabled
3834
&& (checkboxModel.jdk.isNotDetected() || checkboxModel.jdk.isInvalidVersionDetected())
@@ -46,4 +42,14 @@
4642
<a type="button" class="pointer" ng-click="confCtrl.download(checkboxModel.jdk.downloadUrl)">this location</a> and restart Installer to continue.</span>
4743
</div>
4844
</div> -->
45+
</div>
46+
47+
<div ng-show="filtered.length > 0 && !item.isConfigured()">
48+
<span class="pficon pficon-error-circle-o"></span>
49+
<span>You have selected
50+
<ng-repeat ng-repeat="dep in filtered = (item.dependenciesOf | filter: { selectedOption: 'install'} | limitTo:1)">
51+
<span>{{dep.productName}},</span>
52+
</ng-repeat> which requires {{item.productName}}.</span>
53+
<span>{{item.messages.dependency}}</span>
54+
</div>
4955
</div>

‎browser/model/jdk-install.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,14 @@ class JdkInstall extends InstallableItem {
203203
return super.isConfigured();
204204
}
205205

206+
isNotDetected() {
207+
if (Platform.getOS() === 'darwin') {
208+
return false;
209+
} else {
210+
return super.isNotDetected();
211+
}
212+
}
213+
206214
isDisabled() {
207215
return !this.hasOption('detected') && (this.references > 0)
208216
|| this.hasOption('detected') && !this.option.detected.valid && (this.references > 0)

‎browser/pages/confirm/confirm.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
<component-panel item="checkboxModel.jdk"></component-panel>
147147
</div>
148148

149-
<div class="message-container error-message" ng-show="!checkboxModel.jdk.isConfigured() && checkboxModel.devstudio.selectedOption == 'install' && platform === 'win32'">
149+
<!-- <div class="message-container error-message" ng-show="!checkboxModel.jdk.isConfigured() && checkboxModel.devstudio.selectedOption == 'install' && platform === 'win32'">
150150
<span class="pficon pficon-error-circle-o"></span>
151151
<span>You are required to install OpenJDK because you have selected Red Hat JBoss Developer Studio and that requires Java VM version 1.8.0 or higher to run installation.</span>
152152
</div>
@@ -160,7 +160,7 @@
160160
which requires Java SE version {{checkboxModel.jdk.minimumVersion}} or higher to run installation. Due to licence limitations we may not install Java for you.
161161
Please <span ng-show="checkboxModel.jdk.isInvalidVersionDetected()">uninstall detected Java SE, </span>install JDK version {{checkboxModel.jdk.minimumVersion}} downloaded from
162162
<a type="button" class="pointer" ng-click="confCtrl.download(checkboxModel.jdk.downloadUrl)">this location</a> and restart Installer to continue.</span>
163-
</div>
163+
</div> -->
164164

165165
<!-- CDK -->
166166
<div id="cdk-panel" class="panel panel-default panel2pxborder" ng-hide="checkboxModel.cdk === undefined" ng-class="{'zero-border':checkboxModel.cdk.hasOption('detected')}">

‎browser/pages/confirm/controller.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,14 @@ class ConfirmController {
7575
checkboxModel[node].references=0;
7676
}
7777
for (let node of nodes) {
78-
function watchComponent (){
78+
let watchComponent = () => {
7979
let installer = checkboxModel[node];
80+
installer.dependenciesOf = [];
8081
if(installer.isSelected()) {
8182
for(let dep of this.graph.dependenciesOf(node)) {
8283
let depInstaller = checkboxModel[dep];
83-
installer.dependenciesOf.push(depInstaller);
84-
if(depInstaller.references==0 && depInstaller.isNotDetected()) {
84+
depInstaller.dependenciesOf.push(installer);
85+
if(depInstaller.references === 0 && depInstaller.isNotDetected()) {
8586
depInstaller.selectedOption = 'install';
8687
}
8788
depInstaller.references++;
@@ -90,7 +91,7 @@ class ConfirmController {
9091
for(let dep of graph.dependenciesOf(node)) {
9192
let depInstaller = checkboxModel[dep];
9293
depInstaller.references--;
93-
if(depInstaller.references==0) {
94+
if(depInstaller.references === 0) {
9495
depInstaller.selectedOption = 'detected';
9596
}
9697
}

0 commit comments

Comments
 (0)