Skip to content

UI: allow memory setting in flex compute offering in GiB with unit selector (#14082) #14413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
saurabhkushwaha438 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

UI: allow memory setting in flex compute offering in GiB with unit selector (#14082) #14413

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 117 additions & 23 deletions ui/src/views/compute/wizard/ComputeSelection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,23 +57,40 @@
</a-col>
<a-col :md="colContraned" :lg="colContraned" v-if="isCustomized">
<a-form-item
:label="$t('label.memory.mb')"
:label="$t('label.memory')"
:validate-status="errors.memory.status"
:help="errors.memory.message">
<a-row :gutter="12">
<a-col :md="10" :lg="10" v-show="isConstrained && maxMemory && !isNaN(maxMemory)">
<a-col :md="14" :lg="14" v-show="isConstrained && maxMemory && !isNaN(maxMemory)">
<a-slider
:min="minMemory"
:max="maxMemory"
v-model:value="memoryInputValue"
:min="minMemoryInUnit"
:max="maxMemoryInUnit"
:step="memoryStep"
v-model:value="memoryDisplayValue"
@change="($event) => updateComputeMemory($event)"
/>
</a-col>
<a-col :md="4" :lg="4">
<a-input-number
v-model:value="memoryInputValue"
@change="($event) => updateComputeMemory($event)"
/>
<a-col :md="isConstrained ? 10 : 8" :lg="isConstrained ? 10 : 8">
<a-input-group compact style="display: flex">
<a-tooltip :title="memoryTooltipText" placement="topLeft" style="flex: 1; display: flex">
<a-input-number
style="width: 100%"
:min="isConstrained ? minMemoryInUnit : 0"
:max="isConstrained ? maxMemoryInUnit : undefined"
:step="memoryStep"
:precision="memoryUnit === 'GiB' ? 2 : 0"
v-model:value="memoryDisplayValue"
@change="($event) => updateComputeMemory($event)"
/>
</a-tooltip>
<a-select
v-model:value="memoryUnit"
style="width: 75px"
@change="handleUnitChange">
<a-select-option value="GiB">GiB</a-select-option>
<a-select-option value="MiB">MiB</a-select-option>
</a-select>
</a-input-group>
</a-col>
</a-row>
</a-form-item>
Expand Down Expand Up @@ -165,6 +182,8 @@ export default {
cpuNumberInputValue: 0,
cpuSpeedInputValue: 0,
memoryInputValue: 0,
memoryDisplayValue: 0,
memoryUnit: 'GiB',
errors: {
cpu: {
status: '',
Expand Down Expand Up @@ -192,6 +211,37 @@ export default {
}

return 8
},
minMemoryInUnit () {
if (!this.minMemory) return 0
if (this.memoryUnit === 'GiB') {
return Math.ceil(this.minMemory / 256) * 0.25
}
return this.minMemory
},
maxMemoryInUnit () {
if (!this.maxMemory) return 0
if (this.memoryUnit === 'GiB') {
return Math.max(this.minMemoryInUnit, Math.floor(this.maxMemory / 256) * 0.25)
}
return this.maxMemory
},
memoryStep () {
if (this.memoryUnit === 'GiB') {
return 0.25
}
return 1
},
memoryTooltipText () {
if (!this.memoryInputValue) return ''
const exactGiB = this.memoryInputValue / 1024
if (this.memoryUnit === 'GiB') {
if (this.memoryDisplayValue === exactGiB) {
return `${this.memoryDisplayValue} GiB = ${this.memoryInputValue} MiB`
}
return `Exact: ${exactGiB} GiB (${this.memoryInputValue} MiB)`
}
return `${this.memoryInputValue} MiB = ${exactGiB} GiB`
}
},
watch: {
Expand All @@ -209,13 +259,24 @@ export default {
methods: {
fillValue () {
this.cpuNumberInputValue = this.initialCpuValue > 0 ? this.initialCpuValue : this.minCpu
this.memoryInputValue = this.initialMemoryValue > 0 ? this.initialMemoryValue : this.minMemory
const rawMemory = (this.preFillContent && this.preFillContent.memory)
? this.preFillContent.memory
: (this.initialMemoryValue > 0 ? this.initialMemoryValue : this.minMemory)

// MiB is the authoritative internal state
this.memoryInputValue = rawMemory

// Default to GiB if rawMemory is a multiple of 256 MiB (exact 0.25 GiB increment)
const isQuarterGiB = rawMemory >= 256 && (rawMemory % 256 === 0)
this.memoryUnit = isQuarterGiB ? 'GiB' : 'MiB'
this.memoryDisplayValue = isQuarterGiB ? (rawMemory / 1024) : rawMemory

this.cpuSpeedInputValue = this.cpuSpeed

if (!this.preFillContent) {
this.updateComputeCpuNumber(this.cpuNumberInputValue)
this.updateComputeCpuSpeed(this.cpuSpeedInputValue)
this.updateComputeMemory(this.memoryInputValue)
this.$emit('update-compute-memory', this.memoryInputDecorator, this.memoryInputValue)
return
}
if (this.preFillContent.cpunumber) {
Expand All @@ -224,12 +285,25 @@ export default {
if (this.preFillContent.cpuspeed) {
this.cpuSpeedInputValue = this.preFillContent.cpuspeed
}
if (this.preFillContent.memory) {
this.memoryInputValue = this.preFillContent.memory
}

this.updateComputeCpuNumber(this.preFillContent.cpunumber || this.cpuNumberInputValue)
this.updateComputeCpuSpeed(this.preFillContent.cpuspeed || this.cpuSpeedInputValue)
this.updateComputeMemory(this.preFillContent.memory || this.memoryInputValue)
// Emit exact prefilled MiB without any conversion on load
this.$emit('update-compute-memory', this.memoryInputDecorator, this.memoryInputValue)
},
handleUnitChange (newUnit) {
if (newUnit === 'MiB') {
this.memoryDisplayValue = this.memoryInputValue
} else {
this.memoryDisplayValue = Math.round(this.memoryInputValue / 256) * 0.25
}
if (this.isConstrained) {
if (this.memoryDisplayValue < this.minMemoryInUnit) {
this.memoryDisplayValue = this.minMemoryInUnit
} else if (this.memoryDisplayValue > this.maxMemoryInUnit) {
this.memoryDisplayValue = this.maxMemoryInUnit
}
}
},
updateComputeCpuNumber (value) {
if (!value) this.cpuNumberInputValue = 0
Expand All @@ -241,12 +315,31 @@ export default {
updateComputeCpuSpeed (value) {
this.$emit('update-compute-cpuspeed', this.cpuSpeedInputDecorator, value)
},
updateComputeMemory (value) {
if (!value) this.memoryInputValue = 0
if (!this.validateInput('memory', value)) {
updateComputeMemory (displayValue) {
if (displayValue === null || displayValue === undefined) {
this.memoryDisplayValue = 0
displayValue = 0

@Damans227 Damans227 Oct 30, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@saurabhkushwaha438 can we keep the required error when the box is cleared? on an offering with no limits this now sends 0 instead.

} else {
this.memoryDisplayValue = displayValue
}
if (!this.validateInput('memory', displayValue)) {
return
}
this.$emit('update-compute-memory', this.memoryInputDecorator, value)
let memoryInMiB
if (this.memoryUnit === 'GiB') {
if (this.isConstrained && displayValue === this.minMemoryInUnit) {
memoryInMiB = this.minMemory
} else if (this.isConstrained && displayValue === this.maxMemoryInUnit) {
memoryInMiB = this.maxMemory
} else {
memoryInMiB = Math.round(displayValue * 1024)
}
} else {
memoryInMiB = Math.round(displayValue)
}

this.memoryInputValue = memoryInMiB
this.$emit('update-compute-memory', this.memoryInputDecorator, memoryInMiB)
},
validateInput (input, value) {
this.errors[input].status = ''
Expand All @@ -271,8 +364,8 @@ export default {
max = this.maxCpu
break
case 'memory':
min = this.minMemory
max = this.maxMemory
min = this.minMemoryInUnit
max = this.maxMemoryInUnit
break
}

Expand All @@ -285,7 +378,8 @@ export default {
return true
},
checkValidRange (value, min, max) {
if (value < min || value > max) {
const epsilon = 0.001
if (value < (min - epsilon) || value > (max + epsilon)) {
return false
}

Expand Down
Loading