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/19 07:54:17 UTC
[incubator-dlab] branch feature/projects updated: [DLAB-805]:
clenup shapes Default Options settings
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 62e2b23 [DLAB-805]: clenup shapes Default Options settings
62e2b23 is described below
commit 62e2b23d8e5151e950f1ed14c69b74a5ab1972f5
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Jun 19 10:54:02 2019 +0300
[DLAB-805]: clenup shapes Default Options settings
---
.../computational-resource-create-dialog.component.html | 2 +-
.../computational-resource-create-dialog.component.ts | 13 ++++---------
2 files changed, 5 insertions(+), 10 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 dccd14e..db45e21 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
@@ -181,7 +181,7 @@
</div>
<div class="checkbox-group control-group m-top-15" *ngIf="PROVIDER === 'aws'"
- [hidden]="!selectedImage.templates.length || !isAvailableSpots()">
+ [hidden]="!selectedImage.templates.length">
<label class="spot-label label">
<input #spotInstancesCheck type="checkbox" (change)="selectSpotInstances($event)" />
<span>Spot instance</span>
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts
index 4797a53..7a96dc8 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts
@@ -146,23 +146,18 @@ export class ComputationalResourceCreateDialogComponent implements OnInit {
public selectSpotInstances($event?): void {
if ($event ? $event.target.checked : this.spotInstancesSelect.nativeElement['checked']) {
const filtered = this.filterAvailableSpots();
-
- // this.slave_shapes_list.setDefaultOptions(filtered, this.shapePlaceholder(filtered, 'description'),
- // 'slave_shape', 'description', 'json');
- // this.shapes.slave_shape = this.shapePlaceholder(filtered, 'type');
-
this.spotInstance = this.shapePlaceholder(filtered, 'spot');
this.resourceForm.controls['instance_price'].setValue(50);
} else {
- // this.slave_shapes_list.setDefaultOptions(this.model.selectedImage.shapes.resourcesShapeTypes,
- // this.shapePlaceholder(this.model.selectedImage.shapes.resourcesShapeTypes, 'description'), 'slave_shape', 'description', 'json');
- // this.shapes.slave_shape = this.shapePlaceholder(this.model.selectedImage.shapes.resourcesShapeTypes, 'type');
-
this.spotInstance = false;
this.resourceForm.controls['instance_price'].setValue(0);
}
}
+ public selectTemplate($event) {
+ if (DICTIONARY.cloud_provider === 'aws') this.spotInstancesSelect.nativeElement['checked'];
+ }
+
public selectPreemptibleNodes($event) {
if ($event.target.checked)
this.resourceForm.controls['preemptible_instance_number'].setValue(this.minPreemptibleInstanceNumber);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org