This is an automated email from the ASF dual-hosted git repository. ytykhun pushed a commit to branch DATALAB-2426 in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit c66463ed60392a2eb1e87d6cee0b1cc947cfeebf Author: Yurii Tykhun <[email protected]> AuthorDate: Tue Jun 8 10:47:12 2021 +0300 [DATALAB-2426] fixed bug with Dataproc creation --- ...utational-resource-create-dialog.component.html | 27 +++++++++++++--------- .../computational-resource-create.model.ts | 8 +++---- 2 files changed, 20 insertions(+), 15 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 5a6b7aa..948bc89 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 @@ -171,12 +171,13 @@ <mat-select formControlName="master_GPU_type" disableOptionCentering placeholder="Select master GPU type" [disabled]="!resourceForm.controls['shape_master'].value"> - <mat-option *ngFor="let type of selectedImage.gpu_types" - [value]="type.Gpu_type" (click)="setCount('master', type.Gpu_type)"> - <strong class="highlight icon-label">{{ type.Size }}</strong> {{ type.Gpu_type }} + <mat-option *ngFor="let type of selectedImage.computationGPU" + [value]="type" (click)="setCount('master', type)"> + {{ type }} + </mat-option> + <mat-option *ngIf="!selectedImage.computationGPU?.length" class="multiple-select ml-10" disabled> + Master GPU types list is empty </mat-option> - <mat-option *ngIf="!clusterTypes.length" class="multiple-select ml-10" disabled>Master GPU types list - is empty</mat-option> </mat-select> <button class="caret"> <i class="material-icons">keyboard_arrow_down</i> @@ -194,12 +195,12 @@ [matTooltipDisabled]="!!resourceForm.controls['master_GPU_type'].value" > <mat-form-field> - <mat-label>Select master GPU type</mat-label> + <mat-label>Select master GPU count</mat-label> <mat-select formControlName="master_GPU_count" disableOptionCentering [disabled]="!resourceForm.controls['master_GPU_type'].value"> <mat-option *ngFor="let type of masterGPUcount" [value]="type"> {{ type }} </mat-option> - <mat-option *ngIf="!masterGPUcount?.length" class="multiple-select ml-10" disabled>Slave GPU types list is empty</mat-option> + <mat-option *ngIf="!masterGPUcount?.length" class="multiple-select ml-10" disabled>Master GPU counts list is empty</mat-option> </mat-select> <button class="caret"> <i class="material-icons">keyboard_arrow_down</i> @@ -223,10 +224,12 @@ <mat-form-field> <mat-label>Select slave GPU type</mat-label> <mat-select formControlName="slave_GPU_type" disableOptionCentering [disabled]="!resourceForm.controls['shape_slave'].value"> - <mat-option *ngFor="let type of selectedImage.gpu_types" [value]="type.Gpu_type" (click)="setCount('slave', type.Gpu_type)"> - <strong class="highlight icon-label">{{ type.Size }}</strong> {{ type.Gpu_type }} + <mat-option *ngFor="let type of selectedImage.computationGPU" [value]="type" (click)="setCount('slave', type)"> + {{ type }} + </mat-option> + <mat-option *ngIf="!selectedImage.computationGPU?.length" class="multiple-select ml-10" disabled> + Slave GPU types list is empty </mat-option> - <mat-option *ngIf="!selectedImage.gpu_types?.length" class="multiple-select ml-10" disabled>Slave GPU types list is empty</mat-option> </mat-select> <button class="caret"> <i class="material-icons">keyboard_arrow_down</i> @@ -251,7 +254,9 @@ <mat-option *ngFor="let type of slaveGPUcount" [value]="type"> {{ type }} </mat-option> - <mat-option *ngIf="!slaveGPUcount?.length" class="multiple-select ml-10" disabled>Slave GPU types list is empty</mat-option> + <mat-option *ngIf="!slaveGPUcount?.length" class="multiple-select ml-10" disabled> + Slave GPU counts list is empty + </mat-option> </mat-select> <button class="caret"> <i class="material-icons">keyboard_arrow_down</i> diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create.model.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create.model.ts index 93eff8d..9d9a613 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create.model.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create.model.ts @@ -62,10 +62,10 @@ export class ComputationalResourceModel { config: config, project: env.project, custom_tag: parameters.custom_tag, - masterGPUType: gpu ? parameters.master_GPU_type : null, - slaveGPUType: gpu ? parameters.slave_GPU_type : null, - masterGPUCount: gpu ? parameters.master_GPU_count : null, - slaveGPUCount: gpu ? parameters.slave_GPU_count : null, + master_gpu_type: gpu ? parameters.master_GPU_type : null, + slave_gpu_type: gpu ? parameters.slave_GPU_type : null, + master_gpu_count: gpu ? parameters.master_GPU_count : null, + slave_gpu_count: gpu ? parameters.slave_GPU_count : null, gpu_enabled: gpu }, provider); } else { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
