Skip to content

Commit

Permalink
fix(gce): autohealer config in server group dialogue (#3521)
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielpeach
danielpeach committed Apr 14, 2017
1 parent 6e8281c commit ed41f9c
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 82 deletions.
32 changes: 17 additions & 15 deletions ...ipts/modules/google/serverGroup/configure/wizard/autoHealingPolicy/autoHealingPolicy.html
View file
@@ -1,16 +1,18 @@
<div class="form-group">
<div class="col-md-3 sm-label-right">
<b>Enable AutoHealing</b>
<ng-form name="autoHealingPolicySubForm">
<div class="form-group">
<div class="col-md-3 sm-label-right">
<b>Enable Autohealing</b>
</div>
<div class="col-md-6 checkbox">
<label>
<input type="checkbox" ng-model="command.enableAutoHealing"/>
</label>
</div>
</div>
<div class="col-md-6 checkbox">
<label>
<input type="checkbox" ng-model="command.enableAutoHealing"/>
</label>
</div>
</div>
<gce-auto-healing-policy-selector ng-if="command.enableAutoHealing"
on-health-check-refresh="ctrl.onHealthCheckRefresh()"
set-auto-healing-policy="ctrl.setAutoHealingPolicy(autoHealingPolicy)"
http-health-checks="command.backingData.filtered.httpHealthChecks"
enabled="command.enableAutoHealing"
auto-healing-policy="command.autoHealingPolicy"></gce-auto-healing-policy-selector>
<gce-auto-healing-policy-selector ng-if="command.enableAutoHealing"
on-health-check-refresh="ctrl.onHealthCheckRefresh()"
set-auto-healing-policy="ctrl.setAutoHealingPolicy(autoHealingPolicy)"
http-health-checks="command.backingData.filtered.httpHealthChecks"
enabled="command.enableAutoHealing"
auto-healing-policy="command.autoHealingPolicy"></gce-auto-healing-policy-selector>
</ng-form>
128 changes: 63 additions & 65 deletions ...e/serverGroup/configure/wizard/autoHealingPolicy/autoHealingPolicySelector.component.html
View file
@@ -1,72 +1,70 @@
<ng-form name="autoHealingPolicySubForm">
<div class="form-group">
<div class="col-md-{{::$ctrl.labelColumns || 3}} sm-label-right">
<b>HTTP Health Check</b>
</div>
<div class="col-md-6">
<ui-select ng-model="$ctrl.autoHealingPolicy.healthCheck" class="form-control input-sm" required>
<ui-select-match placeholder="Select...">{{$select.selected}}</ui-select-match>
<ui-select-choices repeat="httpHealthCheck in $ctrl.httpHealthChecks | filter: $select.search">
<span ng-bind-html="httpHealthCheck | highlight: $select.search"></span>
</ui-select-choices>
</ui-select>
</div>
<div class="form-group">
<div class="col-md-{{::$ctrl.labelColumns || 3}} sm-label-right">
<b>HTTP Health Check</b>
</div>
<div class="form-group">
<div class="col-md-{{::$ctrl.labelColumns || 3}} sm-label-right">
<b>Initial Delay</b>
</div>
<div class="col-md-6">
<div class="input-group">
<input type="number"
class="form-control input-sm"
ng-model="$ctrl.autoHealingPolicy.initialDelaySec"
min="0"
max="2147483647"
required/>
<span class="input-group-addon">seconds</span>
</div>
</div>
<div class="col-md-6">
<ui-select ng-model="$ctrl.autoHealingPolicy.healthCheck" class="form-control input-sm" required>
<ui-select-match placeholder="Select...">{{$select.selected}}</ui-select-match>
<ui-select-choices repeat="httpHealthCheck in $ctrl.httpHealthChecks | filter: $select.search">
<span ng-bind-html="httpHealthCheck | highlight: $select.search"></span>
</ui-select-choices>
</ui-select>
</div>
<div class="form-group" ng-switch on="$ctrl.viewState.maxUnavailableMetric">
<div class="col-md-{{::$ctrl.labelColumns || 3}} sm-label-right">
<b>Max Unavailable <help-field key="gce.serverGroup.maxUnavailable"></help-field></b>
</div>
<div class="col-md-3" ng-switch-default>
<input type="number" style="width: 130px;"
readonly
class="form-control input-sm"/>
</div>
<div class="col-md-3" ng-switch-when="percent">
<div class="input-group" style="width: 130px;">
<input class="form-control input-sm"
ng-model="$ctrl.autoHealingPolicy.maxUnavailable.percent"
required
type="number" min="0" max="100"/>
<span class="input-group-addon">%</span>
</div>
</div>
<div class="form-group">
<div class="col-md-{{::$ctrl.labelColumns || 3}} sm-label-right">
<b>Initial Delay</b>
</div>
<div class="col-md-6">
<div class="input-group">
<input type="number"
class="form-control input-sm"
ng-model="$ctrl.autoHealingPolicy.initialDelaySec"
min="0"
max="2147483647"
required/>
<span class="input-group-addon">seconds</span>
</div>
<div class="col-md-3" ng-switch-when="fixed">
<input class="form-control input-sm" style="width: 130px;"
</div>
</div>
<div class="form-group" ng-switch on="$ctrl.viewState.maxUnavailableMetric">
<div class="col-md-{{::$ctrl.labelColumns || 3}} sm-label-right">
<b>Max Unavailable <help-field key="gce.serverGroup.maxUnavailable"></help-field></b>
</div>
<div class="col-md-3" ng-switch-default>
<input type="number" style="width: 130px;"
readonly
class="form-control input-sm"/>
</div>
<div class="col-md-3" ng-switch-when="percent">
<div class="input-group" style="width: 130px;">
<input class="form-control input-sm"
ng-model="$ctrl.autoHealingPolicy.maxUnavailable.percent"
required
ng-model="$ctrl.autoHealingPolicy.maxUnavailable.fixed"
type="number" min="0" max="2147483647"/>
</div>
<div class="col-md-3">
<select ng-model="$ctrl.viewState.maxUnavailableMetric"
ng-change="$ctrl.manageMaxUnavailableMetric($ctrl.viewState.maxUnavailableMetric)"
ng-options="metric for metric in ['percent', 'fixed']"
class="form-control input-sm">
<option value="">-- select metric --</option>
</select>
type="number" min="0" max="100"/>
<span class="input-group-addon">%</span>
</div>
</div>
<div class="form-group small" style="margin-top: 20px">
<div class="col-md-7 col-md-offset-{{::$ctrl.labelColumns || 3}}">
<gce-cache-refresh cache-key="healthChecks"
cache-key-alias="HTTP health checks"
on-refresh="$ctrl.onHealthCheckRefresh()">
</gce-cache-refresh>
</div>
<div class="col-md-3" ng-switch-when="fixed">
<input class="form-control input-sm" style="width: 130px;"
required
ng-model="$ctrl.autoHealingPolicy.maxUnavailable.fixed"
type="number" min="0" max="2147483647"/>
</div>
<div class="col-md-3">
<select ng-model="$ctrl.viewState.maxUnavailableMetric"
ng-change="$ctrl.manageMaxUnavailableMetric($ctrl.viewState.maxUnavailableMetric)"
ng-options="metric for metric in ['percent', 'fixed']"
class="form-control input-sm">
<option value="">-- select metric --</option>
</select>
</div>
</div>
<div class="form-group small" style="margin-top: 20px">
<div class="col-md-7 col-md-offset-{{::$ctrl.labelColumns || 3}}">
<gce-cache-refresh cache-key="healthChecks"
cache-key-alias="HTTP health checks"
on-refresh="$ctrl.onHealthCheckRefresh()">
</gce-cache-refresh>
</div>
</ng-form>
</div>
2 changes: 1 addition & 1 deletion ...gle/serverGroup/configure/wizard/autoHealingPolicy/autoHealingPolicySelector.component.ts
View file
Expand Up @@ -24,7 +24,7 @@ class GceAutoHealingPolicySelector implements ng.IComponentController {
}

public $onDestroy(): void {
this.setAutoHealingPolicy({autoHealingPolicy: {}});
this.setAutoHealingPolicy({autoHealingPolicy: null});
}

public manageMaxUnavailableMetric(selectedMetric: string): void {
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/modules/google/serverGroup/configure/wizard/serverGroupWizard.html
View file
Expand Up @@ -22,7 +22,7 @@ <h3 us-spinner="{radius:30, width:8, length: 16}"></h3>
<v2-wizard-page key="capacity" label="Capacity" mark-complete-on-view="false">
<ng-include src="pages.capacity"></ng-include>
</v2-wizard-page>
<v2-wizard-page key="autohealing-policy" label="AutoHealing Policy" mark-complete-on-view="false">
<v2-wizard-page key="autohealing-policy" label="Autohealing Policy" mark-complete-on-view="false">
<ng-include src="pages.autoHealingPolicy"></ng-include>
</v2-wizard-page>
<v2-wizard-page key="zones" label="Zones" mark-complete-on-view="false" done="true">
Expand Down

0 comments on commit ed41f9c

Please sign in to comment.