Skip to content

Commit eb757d1

Browse files
jrichter1jrichter1
committed
Add template to confirm page
1 parent a3683a7 commit eb757d1

5 files changed

Lines changed: 71 additions & 85 deletions

File tree

‎browser/directives/componentPanel.html‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
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>
17+
</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>
23+
</div>
24+
</div>
25+
</div>
26+
</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>
34+
</div>
35+
</div>
36+
<!-- <div>
37+
<div class="message-container error-message" ng-show="!confCtrl.isDisabled
38+
&& (checkboxModel.jdk.isNotDetected() || checkboxModel.jdk.isInvalidVersionDetected())
39+
&& (checkboxModel.devstudio.selectedOption == 'install' || checkboxModel.jbosseap.selectedOption == 'install') && platform == 'darwin'">
40+
<span class="pficon pficon-error-circle-o"></span>
41+
<span>You have selected
42+
<span ng-show="checkboxModel.devstudio.selectedOption != 'install' && checkboxModel.jbosseap.selectedOption == 'install'">{{checkboxModel.jbosseap.productName}}</span>
43+
<span ng-show="checkboxModel.devstudio.selectedOption == 'install'">{{checkboxModel.devstudio.productName}}</span>
44+
which requires Java SE version {{checkboxModel.jdk.minimumVersion}} or higher to run installation. Due to licence limitations we may not install Java for you.
45+
Please <span ng-show="checkboxModel.jdk.isInvalidVersionDetected()">uninstall detected Java SE, </span>install JDK version {{checkboxModel.jdk.minimumVersion}} downloaded from
46+
<a type="button" class="pointer" ng-click="confCtrl.download(checkboxModel.jdk.downloadUrl)">this location</a> and restart Installer to continue.</span>
47+
</div>
48+
</div> -->
49+
</div>

‎browser/directives/componentPanel.js‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
'use strict';
2+
3+
function componentPanel() {
4+
return {
5+
restrict: 'E',
6+
replace: true,
7+
scope: {
8+
item: '='
9+
},
10+
templateUrl: 'directives/componentPanel.html'
11+
};
12+
}
13+
14+
export default componentPanel;

‎browser/main.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import startCtrl from './pages/start/controller';
1212
import pathValidator from './directives/pathValidator';
1313
import progressBar from './directives/progressBar';
1414
import breadcrumb from './directives/breadcrumb';
15+
import componentPanel from './directives/componentPanel';
1516
import InstallerDataService from './services/data';
1617
import Request from './services/request';
1718
import ComponentLoader from './services/componentLoader';
@@ -30,10 +31,11 @@ let mainModule =
3031
.factory('request', Request.factory)
3132
.value('electron', Electron)
3233
.directive(progressBar.name, progressBar)
34+
.directive(componentPanel.name, componentPanel)
3335
.directive(breadcrumb.name, breadcrumb)
3436
.directive(pathValidator.name, pathValidator)
3537
.config( ['$stateProvider', '$urlRouterProvider', ($stateProvider, $urlRouterProvider) => {
36-
$urlRouterProvider.otherwise('/account');
38+
$urlRouterProvider.otherwise('/confirm');
3739
$stateProvider
3840
.state('account', {
3941
url: '/account',

‎browser/pages/confirm/confirm.html‎

Lines changed: 2 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -142,89 +142,8 @@
142142
</div>
143143
</div>
144144

145-
<!-- JDK -->
146-
<div id="jdk-panel" class="panel panel-default panel2pxborder" ng-hide="checkboxModel.jdk === undefined" ng-class="{'zero-border':checkboxModel.jdk.hasOption('detected')&&checkboxModel.jdk.selectedOption === 'detected' || platform === 'darwin'}">
147-
<div id="jdk-panel-heading" class="panel-heading panel-normal"
148-
ng-class="{'dotted-panel':checkboxModel.jdk.hasOption('detected')&&checkboxModel.jdk.selectedOption === 'detected' || platform === 'darwin'}">
149-
<!--ng-click="checkboxModel.jdk.changeIsCollapsed()">-->
150-
<div class="checkbox-container verticalLine">
151-
<input id="jdk-checkbox" type="checkbox" ng-disabled="checkboxModel.jdk.isDisabled()" ng-model="checkboxModel.jdk.selectedOption" aria-label="Toggle ngHide" class="vallign-middle" ng-true-value="'install'" ng-false-value="'detected'">
152-
</div>
153-
<div class="checkbox-container" ng-show="false">
154-
<div id="arrow-jdk" class="arrow" ng-class="{'arrow-down':!checkboxModel.jdk.isCollapsed}" aria-label="Toggle ngHide"></div>
155-
</div>
156-
<div class="product-container">
157-
<div class="warnings-in-panel">
158-
<span id="jdk-installed-note" class="installed-note" ng-show="checkboxModel.jdk.hasOption('detected') && checkboxModel.jdk.selectedOption === 'detected'">
159-
<i class="fa fa-check"></i> Using detected version {{checkboxModel.jdk.option.detected.version}}
160-
</span>
161-
<div ng-show="checkboxModel.jdk.hasOption('detected')">
162-
<div id="jdk-newer-warning" ng-show="checkboxModel.jdk.option.detected.warning!=='' && checkboxModel.jdk.selectedOption === 'detected'" class="has-warning">
163-
<div class="help-block">
164-
<span class="pficon pficon-warning-triangle-o"></span>
165-
<span>Newer than required!</span>
166-
</div>
167-
</div>
168-
<div id="jdk-older-warning" ng-show="checkboxModel.jdk.option.detected.error!=='' && checkboxModel.jdk.selectedOption === 'detected'" class="has-warning">
169-
<div class="help-block">
170-
<span class="pficon pficon-warning-triangle-o"></span>
171-
<span>Older than required!</span>
172-
</div>
173-
</div>
174-
</div>
175-
</div>
176-
<span id="jdk-name" class="product-name">{{checkboxModel.jdk.productName}}</span><span id="jdk-version" class="product-version">{{checkboxModel.jdk.version}}</span>
177-
<div id="jdk-description">{{checkboxModel.jdk.productDesc}}</div>
178-
</div>
179-
</div>
180-
<div class="animate-show confirm-radio-container"
181-
ng-hide="checkboxModel.jdk.isCollapsed"
182-
ng-class="{'dotted-panel':checkboxModel.jdk.hasOption('detected')}">
183-
<div class="confirm-radio-container">
184-
<input type="radio" name="confirm-radio-btn-jdk-group" id="confirm-radio-btn-jdk-install" class="confirm-radio-btn"
185-
ng-model="checkboxModel.jdk.selectedOption" value='install'>
186-
<label for="confirm-radio-btn-jdk-install" class="confirm-radio-btn-label">
187-
Install
188-
</label>
189-
</div>
190-
<div class="confirm-radio-container" ng-show="!checkboxModel.jdk.existingInstallLocation" ng-hide="true">
191-
<input type="radio" name="confirm-radio-btn-jdk-group" id="confirm-radio-btn-jdk-exists" class="confirm-radio-btn"
192-
ng-model="checkboxModel.jdk.existingInstall">
193-
<label for="confirm-radio-btn-jdk-exists" class="confirm-radio-btn-label">
194-
Use the detected version {{checkboxModel.jdk.existingVersion}}
195-
</label>
196-
</div>
197-
<div class="confirm-radio-container" ng-show="false">
198-
<input type="radio" name="confirm-radio-btn-jdk-group" id="confirm-radio-btn-jdk-browse" class="confirm-radio-btn">
199-
<label for="confirm-radio-btn-jdk-browse" class="confirm-radio-btn-label">
200-
<div class="confirm-browse-container">
201-
<label for="confirm-browse-input-jdk" class="browse-browse-label">
202-
Use a different version
203-
</label>
204-
<input type="text" id="confirm-browse-input-jdk" name="confirm-browse-input-jdk" class="confirm-browse-input"
205-
ng-model="checkboxModel.jdk.existingInstallLocation"/>
206-
<button type="button" class="btn btn-primary confirm-browse-btn" ng-click="confCtrl.selectItem('jdk')">Browse</button>
207-
</div>
208-
<div ng-hide="checkboxModel.jdk.detected" class="has-warning">
209-
<div class="help-block">
210-
<span class="pficon pficon-warning-triangle-o"></span>
211-
<strong>The selection is either not a valid jdk installation or you do not have jdk on path. We will install jdk for you.</strong>
212-
</div>
213-
</div>
214-
<div ng-show="checkboxModel.jdk.detected && checkboxModel.jdk.existingVersion === checkboxModel.jdk.minimumVersion" class="has-warning">
215-
<div class="help-block">
216-
<strong>The detected jdk version is {{checkboxModel.jdk.existingVersion}}</strong>
217-
</div>
218-
</div>
219-
<div ng-show="checkboxModel.jdk.existingVersion > checkboxModel.jdk.minimumVersion" class="has-warning">
220-
<div class="help-block">
221-
<span class="pficon pficon-warning-triangle-o"></span>
222-
<strong>The selected jdk installation is newer than recommended {{checkboxModel.jdk.minimumVersion}}</strong>
223-
</div>
224-
</div>
225-
</label>
226-
</div>
227-
</div>
145+
<div>
146+
<component-panel item="checkboxModel.jdk"></component-panel>
228147
</div>
229148

230149
<div class="message-container error-message" ng-show="!checkboxModel.jdk.isConfigured() && checkboxModel.devstudio.selectedOption == 'install' && platform === 'win32'">

‎browser/pages/confirm/controller.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,16 @@ class ConfirmController {
7171
let nodes = graph.overallOrder() ;
7272
let checkboxModel = this.sc.checkboxModel;
7373
for (let node of nodes) {
74+
checkboxModel[node].dependenciesOf = [];
7475
checkboxModel[node].references=0;
7576
}
7677
for (let node of nodes) {
7778
function watchComponent (){
7879
let installer = checkboxModel[node];
7980
if(installer.isSelected()) {
80-
for(let dep of graph.dependenciesOf(node)) {
81+
for(let dep of this.graph.dependenciesOf(node)) {
8182
let depInstaller = checkboxModel[dep];
83+
installer.dependenciesOf.push(depInstaller);
8284
if(depInstaller.references==0 && depInstaller.isNotDetected()) {
8385
depInstaller.selectedOption = 'install';
8486
}

0 commit comments

Comments
 (0)