You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/06/13 16:05:57 UTC
[incubator-dlab] branch feature/projects updated: [DLAB-805]: error
handling fixes
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/feature/projects by this push:
new 271b24e [DLAB-805]: error handling fixes
271b24e is described below
commit 271b24ec7c4d90b95059d628b2dcfde77c521e94
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Thu Jun 13 19:05:46 2019 +0300
[DLAB-805]: error handling fixes
---
.../computational-resource-create-dialog.component.html | 14 +++++++-------
.../computational-resource-create-dialog.component.scss | 8 ++++----
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
index a879139..265688f 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
@@ -81,8 +81,8 @@
<input [class.danger_field]="computationalResourceExist || !resourceForm?.controls['cluster_alias_name'].valid
&& resourceForm?.controls['cluster_alias_name'].dirty && resourceForm?.controls['cluster_alias_name'].hasError('duplication')"
type="text" class="form-control" placeholder="Enter cluster alias" formControlName="cluster_alias_name" />
- <span class="danger_color" *ngIf="resourceForm?.controls['cluster_alias_name'].hasError('duplication')">This cluster name already exists.</span>
- <span class="danger_color" *ngIf="!resourceForm?.controls.cluster_alias_name.valid
+ <span class="error" *ngIf="resourceForm?.controls['cluster_alias_name'].hasError('duplication')">This cluster name already exists.</span>
+ <span class="error" *ngIf="!resourceForm?.controls.cluster_alias_name.valid
&& resourceForm?.controls['cluster_alias_name'].dirty
&& !resourceForm?.controls['cluster_alias_name'].hasError('duplication')">
Cluster name <span *ngIf="DICTIONARY.cloud_provider !== 'aws'">cannot be longer than 10 characters and</span> can only contain letters, numbers, hyphens and '_' but can not end with special characters
@@ -97,7 +97,7 @@
<div class="control">
<input type="number" class="form-control" min="{{minInstanceNumber}}" max="{{maxInstanceNumber}}"
formControlName="instance_number" (keypress)="CheckUtils.isNumberKey($event)" />
- <span class="danger_color" *ngIf="!resourceForm?.controls.instance_number.valid">
+ <span class="error" *ngIf="!resourceForm?.controls.instance_number.valid">
<span>Only integer values greater than or equal to {{ minInstanceNumber }} and less than {{ maxInstanceNumber }} are allowed</span>
</span>
</div>
@@ -171,7 +171,7 @@
(keypress)="CheckUtils.isNumberKey($event)"
(keydown.arrowup)="preemptibleCounter($event, 'increment')"
(keydown.arrowdown)="preemptibleCounter($event, 'decrement')" />
- <span class="danger_color" *ngIf="!resourceForm?.controls.preemptible_instance_number.valid">
+ <span class="error" *ngIf="!resourceForm?.controls.preemptible_instance_number.valid">
<span *ngIf="minPreemptibleInstanceNumber !== maxPreemptibleInstanceNumber; else equal">
Only integer values greater than or equal to {{ minPreemptibleInstanceNumber }} and less than {{ maxPreemptibleInstanceNumber }} are allowed
</span>
@@ -189,7 +189,7 @@
</label>
<div class="control spot-details" [ngClass]="{ show: spotInstancesSelect?.nativeElement['checked'] || false }" *ngIf="spotInstancesSelect?.nativeElement['checked'] || false">
<input type="number" class="form-control" step="5" min="{{minSpotPrice}}" max="{{maxSpotPrice}}" formControlName="instance_price" (keypress)="CheckUtils.isNumberKey($event)">
- <span class="danger_color" *ngIf="!resourceForm?.controls.instance_price.valid">
+ <span class="error" *ngIf="!resourceForm?.controls.instance_price.valid">
Only integer values greater than or equal to {{minSpotPrice}} and less than {{maxSpotPrice}} are allowed
</span>
</div>
@@ -197,7 +197,7 @@
</div>
- <div class="checkbox-group" [hidden]="PROVIDER === 'gcp' && selectedImage?.image === 'docker.dlab-dataengine-service'"
+ <div class="checkbox-group m-top-20" [hidden]="PROVIDER === 'gcp' && selectedImage?.image === 'docker.dlab-dataengine-service'"
*ngIf="notebook_instance?.image !== 'docker.dlab-zeppelin'">
<label>
<input #configurationNode type="checkbox" (change)="selectConfiguration()"/> Cluster configurations
@@ -211,7 +211,7 @@
<div class="checkbox-group">
<div class="config-details" [ngClass]="{ show: configuration?.nativeElement['checked'] || false }">
<textarea formControlName="configuration_parameters" placeholder="Cluster configuration template, JSON" data-gramm_editor="false"></textarea>
- <span class="danger_color" *ngIf="!resourceForm?.controls.configuration_parameters.valid && resourceForm?.controls['configuration_parameters'].dirty">Configuration parameters is not in a valid format</span>
+ <span class="error" *ngIf="!resourceForm?.controls.configuration_parameters.valid && resourceForm?.controls['configuration_parameters'].dirty">Configuration parameters is not in a valid format</span>
</div>
</div>
<div *ngIf="notebook_instance?.image === 'docker.dlab-zeppelin'">
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.scss
index 9ccc51f..4ca29d0 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.scss
@@ -32,7 +32,7 @@
}
}
span {
- &.danger_color {
+ &.error {
position: absolute;
padding-left: 5px;
right: 0;
@@ -86,7 +86,7 @@
}
.spot-details, .preemptible-details {
position: relative;
- .danger_color {
+ .error {
bottom: -5px;
}
@@ -118,7 +118,7 @@
cursor: pointer;
}
span {
- &.danger_color {
+ &.error {
position: absolute;
bottom: -20px;
left: 0;
@@ -135,7 +135,7 @@
padding-bottom: 10px;
}
span {
- &.danger_color {
+ &.error {
position: absolute;
bottom: -15px;
right: 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org