mirror of https://github.com/portainer/portainer
fix(ui): minor ui issues EE-4004 (#7512)
Prabhat Khera
GitHub
parent
bce4d02dd2
commit
735b2063ea
|
|
@ -196,7 +196,7 @@
|
||||||
|
|
||||||
<div class="form-group !mx-0 !pl-0 col-sm-3 clear-both" ng-if="$ctrl.serviceType === $ctrl.KubernetesApplicationPublishingTypes.CLUSTER_IP && $ctrl.ingressType">
|
<div class="form-group !mx-0 !pl-0 col-sm-3 clear-both" ng-if="$ctrl.serviceType === $ctrl.KubernetesApplicationPublishingTypes.CLUSTER_IP && $ctrl.ingressType">
|
||||||
<div class="input-group input-group-sm">
|
<div class="input-group input-group-sm">
|
||||||
<span class="input-group-addon">Route</span>
|
<span class="input-group-addon required">Route</span>
|
||||||
<input
|
<input
|
||||||
class="form-control"
|
class="form-control"
|
||||||
name="ingress_route_{{ $index }}"
|
name="ingress_route_{{ $index }}"
|
||||||
|
|
|
||||||
|
|
@ -145,7 +145,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group" ng-show="kubernetesApplicationCreationForm.application_name.$invalid || ctrl.state.alreadyExists">
|
<div class="form-group" ng-show="kubernetesApplicationCreationForm.application_name.$invalid || ctrl.state.alreadyExists">
|
||||||
<div class="small">
|
<div class="small">
|
||||||
<div class="col-sm-3 col-lg-2"></div>
|
<div class="col-sm-3 col-lg-2"> </div>
|
||||||
<div class="col-sm-8" ng-messages="kubernetesApplicationCreationForm.application_name.$error">
|
<div class="col-sm-8" ng-messages="kubernetesApplicationCreationForm.application_name.$error">
|
||||||
<p class="text-muted vertical-center" ng-message="required"
|
<p class="text-muted vertical-center" ng-message="required"
|
||||||
><pr-icon class="vertical-center" icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This field is required.</p
|
><pr-icon class="vertical-center" icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This field is required.</p
|
||||||
|
|
@ -156,10 +156,12 @@
|
||||||
alphanumeric character (e.g. 'my-name', or 'abc-123').
|
alphanumeric character (e.g. 'my-name', or 'abc-123').
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<p class="text-muted vertical-center" ng-if="ctrl.state.alreadyExists">
|
<div class="col-sm-8" ng-if="ctrl.state.alreadyExists">
|
||||||
<pr-icon class="vertical-center" icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon>
|
<p class="text-muted vertical-center">
|
||||||
An application with the same name already exists inside the selected namespace.
|
<pr-icon class="vertical-center" icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon>
|
||||||
</p>
|
An application with the same name already exists inside the selected namespace.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- #endregion -->
|
<!-- #endregion -->
|
||||||
|
|
@ -1059,90 +1061,96 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-inline" ng-if="ctrl.formValues.DeploymentType !== ctrl.ApplicationDeploymentTypes.GLOBAL && ctrl.formValues.AutoScaler.IsUsed">
|
<div class="form-inline" ng-if="ctrl.formValues.DeploymentType !== ctrl.ApplicationDeploymentTypes.GLOBAL && ctrl.formValues.AutoScaler.IsUsed">
|
||||||
<table class="table" style="margin-bottom: 0px">
|
<div class="row">
|
||||||
<tbody>
|
<div class="col-sm-4 pl-0">
|
||||||
<tr class="small">
|
<label class="control-label text-left pb-2" for="auto_scaler_min">Minimum instances</label>
|
||||||
<td style="width: 33%; border: none; padding: 2px 0 2px 0">Minimum instances</td>
|
<div class="input-group input-group-sm" style="width: 100%">
|
||||||
<td style="width: 33%; border: none; padding: 2px 0 2px 0">Maximum instances</td>
|
<input
|
||||||
<td style="width: 33%; border: none; padding: 2px 0 2px 0">
|
type="number"
|
||||||
Target CPU usage (<b>%</b>)
|
class="form-control"
|
||||||
<portainer-tooltip message="'The autoscaler will ensure enough instances are running to maintain an average CPU usage across all instances.'">
|
name="auto_scaler_min"
|
||||||
</portainer-tooltip>
|
min="0"
|
||||||
</td>
|
ng-max="ctrl.formValues.AutoScaler.MaxReplicas"
|
||||||
</tr>
|
ng-model="ctrl.formValues.AutoScaler.MinReplicas"
|
||||||
<tr>
|
data-cy="k8sAppCreate-autoScaleMin"
|
||||||
<td style="padding: 8px 5px 5px 0; border: none">
|
required
|
||||||
<div class="input-group input-group-sm" style="width: 100%">
|
/>
|
||||||
<input
|
</div>
|
||||||
type="number"
|
<span ng-show="kubernetesApplicationCreationForm['auto_scaler_min'].$invalid">
|
||||||
class="form-control"
|
<div class="small text-muted" style="margin-top: 5px">
|
||||||
name="auto_scaler_min"
|
<ng-messages for="kubernetesApplicationCreationForm['auto_scaler_min'].$error">
|
||||||
min="0"
|
<p ng-message="required" class="vertical-center">
|
||||||
ng-max="ctrl.formValues.AutoScaler.MaxReplicas"
|
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Minimum instances is required.
|
||||||
ng-model="ctrl.formValues.AutoScaler.MinReplicas"
|
</p>
|
||||||
data-cy="k8sAppCreate-autoScaleMin"
|
<p ng-message="min" class="vertical-center">
|
||||||
required
|
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Minimum instances must be greater than 0.
|
||||||
/>
|
</p>
|
||||||
</div>
|
<p ng-message="max" class="vertical-center">
|
||||||
<div class="input-group input-group-sm" ng-show="kubernetesApplicationCreationForm['auto_scaler_min'].$invalid">
|
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Minimum instances must be smaller than maximum instances.
|
||||||
<div class="small text-warning" style="margin-top: 5px">
|
</p>
|
||||||
<ng-messages for="kubernetesApplicationCreationForm['auto_scaler_min'].$error">
|
</ng-messages>
|
||||||
<p ng-message="required"><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Minimum instances is required.</p>
|
</div>
|
||||||
<p ng-message="min"><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Minimum instances must be greater than 0.</p>
|
</span>
|
||||||
<p ng-message="max"
|
</div>
|
||||||
><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Minimum instances must be smaller than maximum instances.</p
|
<div class="col-sm-4 pl-0">
|
||||||
>
|
<label class="control-label text-left pb-2" for="auto_scaler_max">Maximum instances</label>
|
||||||
</ng-messages>
|
<div class="input-group input-group-sm" style="width: 100%">
|
||||||
</div>
|
<input
|
||||||
</div>
|
type="number"
|
||||||
</td>
|
class="form-control"
|
||||||
<td style="padding: 8px 5px 5px 0; border: none">
|
name="auto_scaler_max"
|
||||||
<div class="input-group input-group-sm" style="width: 100%">
|
ng-min="ctrl.formValues.AutoScaler.MinReplicas"
|
||||||
<input
|
ng-model="ctrl.formValues.AutoScaler.MaxReplicas"
|
||||||
type="number"
|
/>
|
||||||
class="form-control"
|
</div>
|
||||||
name="auto_scaler_max"
|
<span ng-show="kubernetesApplicationCreationForm['auto_scaler_max'].$invalid || ctrl.autoScalerOverflow()">
|
||||||
ng-min="ctrl.formValues.AutoScaler.MinReplicas"
|
<div class="small text-muted" style="margin-top: 5px">
|
||||||
ng-model="ctrl.formValues.AutoScaler.MaxReplicas"
|
<ng-messages for="kubernetesApplicationCreationForm['auto_scaler_max'].$error">
|
||||||
/>
|
<p ng-message="required" class="vertical-center">
|
||||||
</div>
|
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Maximum instances is required.
|
||||||
<div class="input-group input-group-sm" ng-show="kubernetesApplicationCreationForm['auto_scaler_max'].$invalid || ctrl.autoScalerOverflow()">
|
</p>
|
||||||
<div class="small text-warning" style="margin-top: 5px">
|
<p ng-message="min" class="vertical-center">
|
||||||
<ng-messages for="kubernetesApplicationCreationForm['auto_scaler_max'].$error">
|
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Maximum instances must be greater than minimum instances.
|
||||||
<p ng-message="required"><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Maximum instances is required.</p>
|
</p>
|
||||||
<p ng-message="min"
|
</ng-messages>
|
||||||
><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Maximum instances must be greater than minimum instances.</p
|
</div>
|
||||||
>
|
</span>
|
||||||
</ng-messages>
|
</div>
|
||||||
</div>
|
<div class="col-sm-4 pl-0">
|
||||||
</div>
|
<label class="control-label text-left pb-2" for="auto_scaler_cpu">
|
||||||
</td>
|
Target CPU usage (<b>%</b>)
|
||||||
<td style="padding: 8px 5px 5px 0; border: none">
|
<portainer-tooltip message="'The autoscaler will ensure enough instances are running to maintain an average CPU usage across all instances.'">
|
||||||
<div class="input-group input-group-sm" style="width: 100%">
|
</portainer-tooltip>
|
||||||
<input
|
</label>
|
||||||
type="number"
|
<div class="input-group input-group-sm" style="width: 100%">
|
||||||
class="form-control"
|
<input
|
||||||
name="auto_scaler_cpu"
|
type="number"
|
||||||
ng-model="ctrl.formValues.AutoScaler.TargetCPUUtilization"
|
class="form-control"
|
||||||
min="1"
|
name="auto_scaler_cpu"
|
||||||
max="100"
|
ng-model="ctrl.formValues.AutoScaler.TargetCPUUtilization"
|
||||||
required
|
min="1"
|
||||||
data-cy="k8sAppCreate-targetCPUInput"
|
max="100"
|
||||||
/>
|
required
|
||||||
</div>
|
data-cy="k8sAppCreate-targetCPUInput"
|
||||||
<div class="input-group input-group-sm" ng-show="kubernetesApplicationCreationForm['auto_scaler_cpu'].$invalid">
|
/>
|
||||||
<div class="small text-warning" style="margin-top: 5px">
|
</div>
|
||||||
<ng-messages for="kubernetesApplicationCreationForm['auto_scaler_cpu'].$error">
|
<span ng-show="kubernetesApplicationCreationForm['auto_scaler_cpu'].$invalid">
|
||||||
<p ng-message="required"><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Target CPU usage is required.</p>
|
<div class="small text-muted" style="margin-top: 5px">
|
||||||
<p ng-message="min"><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Target CPU usage must be greater than 0.</p>
|
<ng-messages for="kubernetesApplicationCreationForm['auto_scaler_cpu'].$error">
|
||||||
<p ng-message="max"><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Target CPU usage must be smaller than 100.</p>
|
<p ng-message="required" class="vertical-center">
|
||||||
</ng-messages>
|
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Target CPU usage is required.
|
||||||
</div>
|
</p>
|
||||||
</div>
|
<p ng-message="min" class="vertical-center">
|
||||||
</td>
|
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Target CPU usage must be greater than 0.
|
||||||
</tr>
|
</p>
|
||||||
</tbody>
|
<p ng-message="max" class="vertical-center">
|
||||||
</table>
|
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Target CPU usage must be smaller than 100.
|
||||||
|
</p>
|
||||||
|
</ng-messages>
|
||||||
|
</div>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="form-group" ng-if="ctrl.autoScalerOverflow()" style="margin-bottom: 10px">
|
<div class="form-group" ng-if="ctrl.autoScalerOverflow()" style="margin-bottom: 10px">
|
||||||
<div class="col-sm-12 small text-danger">
|
<div class="col-sm-12 small text-danger">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue