Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
HAWKULAR-370 Add new deployment wizard
Browse files Browse the repository at this point in the history
  • Loading branch information
mtho11 committed Sep 9, 2015
1 parent 6f2fa77 commit ee54b47
Show file tree
Hide file tree
Showing 12 changed files with 540 additions and 132 deletions.
6 changes: 5 additions & 1 deletion console/src/main/scripts/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
"angular-toastr": "1.4.1",
"ngInfiniteScroll": "1.2.1",
"bootstrap-select": "1.6",
"hawkular-charts": "0.4.15",
"hawkular-ui-services": "0.6.3",
"hawkular-charts": "0.5.0",
"hawkular-ui-services": "0.6.10",
"hawtio-core-navigation": "2.0.51",
Expand All @@ -32,13 +34,15 @@
"lodash": "3.2.0",
"moment": "2.10.3",
"patternfly": "1.3.0",
"keycloak": "1.3.1"
"keycloak": "1.3.1",
"angular-wizard": "0.5.3"
},
"devDependencies": {
"hawtio-core-dts": "2.0.18"
},
"resolutions": {
"patternfly": "1.3.0",
"lodash": "~3.2.0",
"angular": "~1.4.4",
"keycloak": "1.3.1"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ <h3 class="pull-left">
<div class="hk-event"><strong>Alert Summary</strong>: alert details.</div>
</div>
</div>

<!-- Deployments Table -->
<div ng-show="vm.resourceList.$resolved && vm.resourceList.length <= 0">
<div class="hk-info-top clearfix">
Expand All @@ -53,7 +52,9 @@ <h3>Deployments</h3>
<i class="fa fa-cubes"></i>
</div>
<h1>No deployments.</h1>
<div style="padding-top: 20px;"><button class="btn btn-primary btn-lg">Add Deployment</button></div>
<div style="padding-top: 20px;">
<button class="btn btn-primary btn-lg"
ng-click="vm.showDeploymentAddDialog()">Add Deployment</button></div>
</div>
</div>
</div>
Expand All @@ -62,7 +63,8 @@ <h1>No deployments.</h1>
<div class="hk-info-top clearfix">
<h3>Deployments</h3>
<div class="actions-table">
<button class="btn btn-default add" type="button" disabled>Add Deployment</button>
<button class="btn btn-primary add" type="button"
ng-click="vm.showDeploymentAddDialog()">Add Deployment</button>
<div class="dropdown">
<button class="btn btn-default" type="button" id="dropdownMenu1" dropdown-toggle ng-disabled="vm.selectCount === 0">
Actions
Expand Down Expand Up @@ -95,7 +97,6 @@ <h3>Deployments</h3>
<th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Deployments 10: activate to sort column ascending">Deployments <span class="label label-default label-alert pull-right" tooltip-trigger tooltip-placement="top" tooltip="Total alerts" ng-show="vm.alertList.length">{{vm.alertList.length}}</span></th>
<th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Enabled/Disabled: activate to sort column ascending">Enabled/Disabled</th>
<th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Computed Health: activate to sort column ascending">Computed Health</th>
<th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Actions: activate to sort column ascending">Actions</th>
</tr>
</thead>
<tbody>
Expand All @@ -112,20 +113,6 @@ <h3>Deployments</h3>
<td class="success" ng-show="true">Good</td>
<td class="warning" ng-show="false">Fair</td>
<td class="danger" ng-show="false">Poor</td>
<td class="actions">
<div class="dropdown">
<button class="btn btn-default" type="button" id="dropdownMenu2" ng-click="vm.selectItem(res)" dropdown-toggle>
Actions
<span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu2">
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" ng-click="vm.performOperation('Deploy', res.id)">Enable</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" ng-click="vm.performOperation('Redeploy', res.id)">Redeploy</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" ng-click="vm.performOperation('Undeploy', res.id)">Disable</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" ng-click="vm.performOperation('Remove', res.id)">Remove</a></li>
</ul>
</div>
</td>
</tr>
</tbody>
</table>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
<div class="modal-header">
<button type="button" class="close" aria-hidden="true" ng-click="dac.onClose()">
<span class="pficon pficon-close"></span>
</button>
<h4 class="modal-title">Add Deployment</h4>
</div>


<div class="modal-body">

<wizard name="deployAdd" on-finish="dac.finishedDeployWizard()">

<wz-step title="Select a Deployment File">

<p><strong>Step 1 of 3: Select a Deployment File</strong></p>

<p class="required-info">* All fields are required.</p>

<form class="form-horizontal" name="deployFileForm" novalidate>
<div class="form-group">
<label class="col-sm-3 control-label">Deployment File</label>

<div class="col-sm-9">
<input fileread="dac.deploymentData.binaryFile" type="file" accept="application/zip"
ng-model="dac.deploymentData.filePath" hk-valid-file required
name="deployFile" />
<i ng-show="deployFileForm.deployFile.$error.required">* required</i><br>
</div>
</div>
</form>
<div class="pull-right">
<button type="button" class="btn btn-default" ng-click="dac.onClose()">Cancel</button>
<button type="button" wz-next class="btn btn-primary"
ng-disabled="deployFileForm.$invalid"
ng-click="dac.exitStep1()" >Next &#62;</button>
</div>


</wz-step>


<!-- Verify File Step -->
<wz-step title="Verify File">

<p><strong>Step 2 of 3: Verify File</strong></p>

<div class="hk-form-verify hk-form-read-only">
<div class="hk-form-buttons pull-right">
<div class="hk-rename-button">
<button class="btn btn-default" data-toggle="tooltip" data-placement="top"
ng-click="dac.deploymentData.editDeploymentFiles = !dac.deploymentData.editDeploymentFiles"
data-original-title="Rename">
<i class="fa fa-pencil"></i>
</button>
</div>
<div class="hk-discard-confirm-buttons">
<button class="btn btn-default" data-toggle="tooltip" data-placement="top" data-original-title="Discard">
<i class="fa fa-close"></i>
</button>
<button class="btn btn-default" data-toggle="tooltip" data-placement="top" data-original-title="Confirm"
ng-click="dac.deploymentData.editDeploymentFiles = !dac.deploymentData.editDeploymentFiles">
<i class="fa fa-check"></i>
</button>
</div>
</div>

<form class="form-horizontal">
<div class="editable-container">
<div class="form-group">
<label class="col-sm-3 control-label" for="hk-deploy-name">Name</label>

<div class="col-sm-7">
<span class="hk-input-text" ng-show="!dac.deploymentData.editDeploymentFiles">
{{dac.deploymentData.filePath}}</span>
<input type="text" class="form-control"
ng-show="dac.deploymentData.editDeploymentFiles"
id="hk-deploy-name"
value="{{dac.deploymentData.filePath}}">
</div>
</div>

<div class="form-group">
<label class="col-sm-3 control-label" for="hk-runtime-name">Runtime Name</label>

<div class="col-sm-7">
<span class="hk-input-text" ng-show="!dac.deploymentData.editDeploymentFiles">
{{dac.deploymentData.runtimeFileName}}</span>
<input type="text" class="form-control text"
ng-show="dac.deploymentData.editDeploymentFiles"
id="hk-runtime-name"
value="{{dac.deploymentData.runtimeFileName}}">
</div>
</div>
</div>
<!--<div class="checkbox">-->
<!--<label>-->
<!--<input type="checkbox" ng-model="dac.deploymentData.enableDuringDeployment"-->
<!--name="checkBoxDisable"> Do not enable, during deployment.-->
<!--<i class="fa fa-info-circle"-->
<!--data-toggle="tooltip"-->
<!--data-placement="top"-->
<!--data-original-title="Enabling activates the deployment.">-->
<!--</i>-->
<!--</label>-->
<!--</div>-->
</form>
</div>
<div class="pull-right">
<button type="button" wz-previous class="btn btn-default">&#60; Back</button>
<button type="button" wz-next class="btn btn-primary" ng-click="dac.exitStep2()">Next &#62;</button>
</div>
</wz-step>


<wz-step title="Upload and Deploy">

<div class="">
<p><strong>Step 3 of 3: Upload and Deploy</strong></p>

<div class="text-center hk-spinner-container" ng-show="dac.deploymentData.uploading">
<div class="spinner spinner-lg"></div>
</div>

<div class="alert alert-success" ng-show="!dac.deploymentData.uploading">
<span class="pficon pficon-ok"></span>
<strong>Success!</strong> The file was successfully uploaded and deployed.
</div>

<div class="alert alert-error" ng-show="!dac.deploymentData.uploading">
<span class="pficon pficon-error-circle-o-"></span>
<strong>Error!</strong> An error has occurred with the deployment.
</div>
</div>

<div class="pull-right">
<button type="button" class="btn btn-primary" wz-finish>OK</button>
</div>

</wz-step>
</wizard>

</div>
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ <h4 class="modal-title">JVM Alert Settings</h4>
</div>
</tab>
<tab heading="Non-Heap Usage">
<div id="hk-heap" class="hk-tab-content">
<div id="hk-non-heap" class="hk-tab-content">
<p>Configure conditions settings for Non-Heap usage alerts and notifications.</p>

<form class="form-horizontal">
Expand All @@ -81,13 +81,13 @@ <h4 class="modal-title">JVM Alert Settings</h4>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" for="usage-greater">Usage greater than</label>
<label class="col-sm-3 control-label" for="usage-greater2">Usage greater than</label>

<div class="col-sm-5">
<div class="input-group hk-input-small">
<input type="number" min="0" max="100" ng-model="jas.adm.nheap.conditionGtPercent"
class="form-control"
id="usage-greater" ng-disabled="!jas.adm.nheap.conditionGtEnabled">
id="usage-greater2" ng-disabled="!jas.adm.nheap.conditionGtEnabled">

<div class="input-group-addon">%</div>
</div>
Expand All @@ -99,13 +99,13 @@ <h4 class="modal-title">JVM Alert Settings</h4>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" for="usage-less">Usage less than</label>
<label class="col-sm-3 control-label" for="usage-less2">Usage less than</label>

<div class="col-sm-5">
<div class="input-group hk-input-small">
<input type="number" min="0" max="100" ng-model="jas.adm.nheap.conditionLtPercent"
class="form-control"
id="usage-less" ng-disabled="!jas.adm.nheap.conditionLtEnabled">
id="usage-less2" ng-disabled="!jas.adm.nheap.conditionLtEnabled">

<div class="input-group-addon">%</div>
</div>
Expand All @@ -128,7 +128,7 @@ <h4 class="modal-title">JVM Alert Settings</h4>
</div>
</tab>
<tab heading="Garbage Collection">
<div id="hk-heap" class="hk-tab-content">
<div id="hk-gc" class="hk-tab-content">
<p>Configure conditions settings for Garbage Collection alerts and notifications.</p>

<form class="form-horizontal">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h4 class="modal-title">Response Time Alert Settings</h4>
<fieldset>
<legend>Response Time</legend>
<div class="form-group">
<label class="col-sm-3 control-label" for="dw-duration">Time (maximum, {{mas.adm.thres.conditionThreshold}})</label>
<label class="col-sm-3 control-label" >Time (maximum, {{mas.adm.thres.conditionThreshold}})</label>
<div class="col-sm-5 inline-row">
<hk-time-input hk-duration="mas.adm.thres.conditionThreshold"
hk-disabled="!mas.adm.thres.conditionEnabled"
Expand Down

0 comments on commit ee54b47

Please sign in to comment.