feat(service-offering): show all service offerings even those which d… #1299
Conversation
…on't fir account resource limitation
| this.account = data.account; | ||
| } | ||
|
|
||
| public ngOnInit() { |
There was a problem hiding this comment.
Why you use a component hook to do this instead if constructor?
There was a problem hiding this comment.
Mostly we use ngOnInit for all the initialization/declaration and avoid stuff to work in the constructor. The constructor should only be used to initialize class members but shouldn't do actual "work".
| memory: new FormControl(this.offering.memory, Validators.required), | ||
| cpuNumber: new FormControl(this.offering.cpunumber, [Validators.required, LimitValidator(this.maxCpu)]), | ||
| cpuSpeed: new FormControl(this.offering.cpuspeed, [Validators.required]), | ||
| memory: new FormControl(this.offering.memory, [Validators.required, LimitValidator(this.maxMemory)]), |
There was a problem hiding this comment.
The code does not work without this check?
The comment // input text=number provide all other validation for current restrictions describe that all validation provided by input itself. I think it should be placed back. You add only validation for max value, but input provide both max and min. See #1082
| function LimitValidator(cpuNumberLimit: number): ValidatorFn { | ||
| return function (control: FormControl) { | ||
| return control.value > cpuNumberLimit | ||
| ? { cpuLimitExceeded: true } |
There was a problem hiding this comment.
This is the same as built-in validator Validators.max(max: number)
| @@ -40,7 +42,7 @@ <h3 class="mat-dialog-title"> | |||
| <button | |||
| mat-button | |||
| color="primary" | |||
| [disabled]="isSubmitButtonDisabled()" | |||
| [disabled]="isSubmitButtonDisabled() || resourcesLimitExceeded" | |||
There was a problem hiding this comment.
Move to correspond function
| [offeringList]="serviceOfferings" | ||
| [selectedOffering]="serviceOffering" | ||
| [showFields]="showFields" | ||
| [resourcesLimitExceeded]="resourcesLimitExceeded" |
There was a problem hiding this comment.
Why do you decide to show this error in service-offering-list but not here?
|
|
||
| if (offering.iscustomized) { | ||
| сpusExceeded = this.account.cpuavailable < this.serviceOffering['customOfferingRestrictions'].cpunumber.min; | ||
| memoryExceeded = this.account.memoryavailable < this.serviceOffering['customOfferingRestrictions'].memory.min; |
There was a problem hiding this comment.
Why you use square brackets to get customOfferingRestrictions field?
|
|
||
| return enoughCpus && enoughMemory; | ||
| }); | ||
| return availableInZone; |
There was a problem hiding this comment.
Why you do keep this function which only uses another function?
src/i18n/ru.json
Outdated
| @@ -118,6 +118,9 @@ | |||
| }, | |||
| "SNAPSHOT_POLICIES": { | |||
| "HOURLY_TURN_OFF": "Почасовое расписание отключено" | |||
| }, | |||
| "COMPUTE_OFFERING": { | |||
| "RESOURCE_LIMIT_EXCEEDED": "Вычислительное предложение не может быть выбрано, потому что больше, чем доступные для аккаунта ресурсы." | |||
There was a problem hiding this comment.
Can we improve this translation? To discuss.
# Conflicts: # src/app/service-offering/service-offering-dialog/service-offering-dialog.component.ts # src/app/service-offering/service-offering-list/service-offering-list.component.ts # src/app/vm/selectors/service-offering.selectors.ts # src/app/vm/vm-creation/service-offering/vm-creation-service-offering.container.ts
| @@ -9,3 +9,8 @@ h5 { | |||
| margin-top: 0; | |||
| } | |||
| } | |||
|
|
|||
| .error-message { | |||
| color: red; | |||
There was a problem hiding this comment.
Use color from mat-error
| import { Component, Inject } from '@angular/core'; | ||
| import { FormControl, FormGroup, Validators } from '@angular/forms' | ||
| import { Component, Inject, OnInit } from '@angular/core'; | ||
| import { FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms' |
| @@ -20,3 +20,8 @@ | |||
| flex-direction: column; | |||
| text-align: right; | |||
| } | |||
|
|
|||
| .error-message { | |||
| color: red; | |||
| if (this.serviceOffering.iscustomized && this.viewMode === ServiceOfferingType.custom) { | ||
| return true; | ||
| } | ||
|
|
| } from '../../../shared/models/config/custom-compute-offering-parameters.interface'; | ||
|
|
||
| describe('ComputeOfferingViewModelSelector', () => { | ||
| describe('isAvailableByResources', () => { |
There was a problem hiding this comment.
Do we need this describes?
| // 'offeringId': '36de12ed-17f1-441f-903f-ab274832c318', | ||
| // 'cpunumber': { | ||
| // 'min': 2, | ||
| // 'max': 8, |
| @@ -18,3 +18,8 @@ | |||
| text-align: left; | |||
| padding-top: 18px; | |||
| } | |||
|
|
|||
| .error-message { | |||
| color: red; | |||
| @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; | |||
| import { MatDialogRef } from '@angular/material'; | |||
| import { select, Store } from '@ngrx/store'; | |||
| import { combineLatest, Observable } from 'rxjs'; | |||
| import { first, map } from 'rxjs/operators'; | |||
| import { first, filter, map } from 'rxjs/operators'; | |||
| @@ -1 +1 @@ | |||
| export { getComputeOfferingViewModel } from './compute-offering-view-model.selector'; | |||
| export { getComputeOfferingForVmCreation } from './compute-offering-view-model.selector'; | |||
There was a problem hiding this comment.
Why you did not import the second selector?
| customComputeOfferingParameters, | ||
| defaultRestrictions, | ||
| defaultHardwareValues, | ||
| tags, vm): ComputeOfferingViewModel[] => { |
There was a problem hiding this comment.
Put each parameter on new line, or all parameters in one line
| : Number(account.memoryavailable) + memoryUsed; | ||
|
|
||
| const availableResources: Resources = { | ||
| cpuNumber: cpuNumber || cpuNumberUsed, |
There was a problem hiding this comment.
Add comment about fallback value
| defaultHardwareValues, | ||
| tags): ComputeOfferingViewModel[] => { | ||
| const availableResources: Resources = { | ||
| cpuNumber: account && account.cpuavailable || '0', |
There was a problem hiding this comment.
Add comment about fallback value
# Conflicts: # src/app/shared/models/account.model.ts # src/app/vm/vm-creation/vm-creation.component.html # src/app/vm/vm-creation/vm-creation.component.ts
…on't fir account resource limitation