Skip to content

Commit c6ac41c

Browse files
committed
Merge branch '2856-minor-version-upgrade-does-not-show-the-latest-versions-available-for-postgres-12' into 'main'
fix(ui): wrong validation on available postgres versions for minor version upgrade sgdbops Closes #2856 See merge request ongresinc/stackgres!1640
2 parents eb38435 + a5fcdce commit c6ac41c

1 file changed

Lines changed: 13 additions & 2 deletions

File tree

stackgres-k8s/src/admin-ui/src/components/forms/CreateSGDbOps.vue

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,13 @@
340340
<fieldset class="minorVersionUpgrade" v-else-if="op == 'minorVersionUpgrade'">
341341
<template v-if="sgCluster.length">
342342
<template v-for="cluster in allClusters" v-if="sgCluster == cluster.name">
343-
<template v-if="(typeof (postgresVersionsList[cluster.data.spec.postgres.version.substring(0,2)].find(v => v > cluster.data.spec.postgres.version)) != 'undefined')">
343+
<template v-if="
344+
typeof
345+
postgresVersionsList[cluster.data.spec.postgres.version.split('.')[0]]
346+
.find(v =>
347+
parseInt(v.split('.')[1]) > parseInt(cluster.data.spec.postgres.version.split('.')[1])
348+
) != 'undefined'
349+
">
344350
<div class="header open">
345351
<h3>Minor Version Upgrade Details</h3>
346352
</div>
@@ -359,7 +365,12 @@
359365
<label for="spec.minorVersionUpgrade.postgresVersion">Target Postgres Version <span class="req">*</span></label>
360366
<select v-model="minorVersionUpgrade.postgresVersion" required data-field="spec.minorVersionUpgrade.postgresVersion">
361367
<option disabled value="">Choose version...</option>
362-
<option v-for="version in postgresVersionsList[cluster.data.spec.postgres.version.substring(0,2)]" v-if="version > cluster.data.spec.postgres.version">{{ version }}</option>
368+
<option
369+
v-for="version in postgresVersionsList[cluster.data.spec.postgres.version.split('.')[0]]"
370+
v-if="parseInt(version.split('.')[1]) > parseInt(cluster.data.spec.postgres.version.split('.')[1])"
371+
>
372+
{{ version }}
373+
</option>
363374
</select>
364375
<span class="helpTooltip" :data-tooltip="getTooltip('sgdbops.spec.minorVersionUpgrade.postgresVersion')"></span>
365376
</div>

0 commit comments

Comments
 (0)