Skip to content

Commit 4884f52

Browse files
shwstpprCopilot
andauthored
ui: allow provisioning backups during instance deploy (#11612)
* ui: allow assigning backup offring during instance deploy Add backup offering selection to Deploy VM wizard and assign selected backup offering to the VM after successful deployment. This enables users to choose a backup offering during VM creation, and the VM is automatically associated with the selected offering post-deployment. Signed-off-by: Abhishek Kumar <[email protected]> * changes for schedules Signed-off-by: Abhishek Kumar <[email protected]> * fix Signed-off-by: Abhishek Kumar <[email protected]> * fix Signed-off-by: Abhishek Kumar <[email protected]> * Update ui/public/locales/pt_BR.json * Update ui/src/views/compute/wizard/DeployInstanceBackupSelection.vue Co-authored-by: Copilot <[email protected]> * address review Signed-off-by: Abhishek Kumar <[email protected]> * fix * allow only one schdeule per interval type Signed-off-by: Abhishek Kumar <[email protected]> * show message same internaltype schedule * show backup step only when zone has offering --------- Signed-off-by: Abhishek Kumar <[email protected]> Co-authored-by: Copilot <[email protected]>
1 parent d9abc07 commit 4884f52

File tree

18 files changed

+384
-19
lines changed

18 files changed

+384
-19
lines changed

ui/public/locales/de_DE.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@
259259
"label.available": "Verfügbar",
260260
"label.back": "Zurück",
261261
"label.backup": "Backup",
262+
"label.backups": "Backup",
262263
"label.backup.attach.restore": "Backup-Volume wiederherstellen und anhängen",
263264
"label.backup.offering.assign": "VM zum Backup-Angebot zuordnen",
264265
"label.backup.offering.remove": "VM vom Backup-Angebot entfernen",

ui/public/locales/el_GR.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@
317317
"label.availableprocessors": "Διαθέσιμοι πυρήνες επεξεργαστή",
318318
"label.back": "Πίσω",
319319
"label.backup": "Αντίγραφα ασφαλείας",
320+
"label.backups": "Αντίγραφα ασφαλείας",
320321
"label.backup.attach.restore": "Επαναφορά και επισύναψη τόμου αντιγράφου ασφαλείας",
321322
"label.backup.offering.assign": "Αντιστοίχιση εικονικής μηχανής με προσφορά δημιουργίας αντιγράφων ασφαλείας",
322323
"label.backup.offering.remove": "Κατάργηση εικονικής μηχανής από την προσφορά δημιουργίας αντιγράφων ασφαλείας",

ui/public/locales/en.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@
252252
"label.add.acl.rule": "Add ACL rule",
253253
"label.add.acl": "Add ACL",
254254
"label.add.affinity.group": "Add new Affinity Group",
255+
"label.add.backup.schedule": "Add Backup Schedule",
255256
"label.add.baremetal.dhcp.device": "Add bare metal DHCP device",
256257
"label.add.bgp.peer": "Add BGP Peer",
257258
"label.add.bigswitchbcf.device": "Add BigSwitch BCF Controller",
@@ -442,14 +443,17 @@
442443
"label.availablevirtualmachinecount": "Available Instances",
443444
"label.back": "Back",
444445
"label.back.login": "Back to login",
445-
"label.backup": "Backups",
446+
"label.backup": "Backup",
447+
"label.backups": "Backups",
446448
"label.backup.attach.restore": "Restore and attach backup volume",
447449
"label.backup.configure.schedule": "Configure Backup Schedule",
448450
"label.backup.offering.assign": "Assign Instance to backup offering",
449451
"label.backup.offering.remove": "Remove Instance from backup offering",
450452
"label.backup.offerings": "Backup Offerings",
453+
"label.backup.offering.assign.failed": "Failed to assign Backup Offering",
451454
"label.backup.repository": "Backup Repository",
452455
"label.backup.restore": "Restore Instance backup",
456+
"label.backup.schedule.create.failed": "Failed to create Backup Schedule",
453457
"label.backuplimit": "Backup Limits",
454458
"label.backup.storage": "Backup Storage",
455459
"label.backupstoragelimit": "Backup Storage Limits (GiB)",
@@ -2194,6 +2198,7 @@
21942198
"label.select.all": "Select all",
21952199
"label.select.columns": "Select columns",
21962200
"label.select.a.zone": "Select a Zone",
2201+
"label.select.backup.offering": "Select Backup Offering",
21972202
"label.select.deployment.infrastructure": "Select deployment infrastructure",
21982203
"label.select.guest.os.type": "Please select the guest OS type",
21992204
"label.select.network": "Select Network",
@@ -3075,7 +3080,9 @@
30753080
"message.backup.attach.restore": "Please confirm that you want to restore and attach the volume from the backup?",
30763081
"message.backup.create": "Are you sure you want to create an Instance backup?",
30773082
"message.backup.offering.remove": "Are you sure you want to remove Instance from backup offering and delete the backup chain?",
3083+
"message.backup.provision.instance": "Select a backup offering to assign to the Instance. You can also add one or more backup schedules for different interval types to automate backups for this Instance. Assigning a backup offering and schedules helps protect your data by enabling automated and scheduled backups.",
30783084
"message.backup.restore": "Please confirm that you want to restore the Instance backup?",
3085+
"message.backup.update.existing.schedule": "Updating existing backup schedule for the same interval type",
30793086
"message.cancel.shutdown": "Please confirm that you would like to cancel the shutdown on this Management Server. It will resume accepting any new Async Jobs.",
30803087
"message.cancel.maintenance": "Please confirm that you would like to cancel the maintenance on this Management Server. It will resume accepting any new Async Jobs.",
30813088
"message.certificate.upload.processing": "Certificate upload in progress",

ui/public/locales/es.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@
222222
"label.available": "Disponible",
223223
"label.back": "Volver",
224224
"label.backup": "Respaldos",
225+
"label.backups": "Respaldos",
225226
"label.backup.attach.restore": "Restaurar y conectar un Volumen de Respaldo",
226227
"label.backup.offering.assign": "Asignar instancia a una oferta de respaldo",
227228
"label.backup.offering.remove": "remover instancia de una oferta de respaldo",

ui/public/locales/ja_JP.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,7 @@
485485
"label.available.public.ips": "使用できるパブリックIPアドレス",
486486
"label.back": "戻る",
487487
"label.backup": "バックアップ",
488+
"label.backups": "バックアップ",
488489
"label.backup.attach.restore": "復元とバックアップボリュームをアタッチ",
489490
"label.backup.offering.assign": "VMをバックアップオファリングに割り当て",
490491
"label.backup.offering.remove": "VMバックアップオファリングから削除",

ui/public/locales/ko_KR.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@
269269
"label.available": "\uc0ac\uc6a9 \uac00\ub2a5",
270270
"label.back": "\ub4a4\ub85c",
271271
"label.backup": "\ubc31\uc5c5",
272+
"label.backups": "\ubc31\uc5c5",
272273
"label.backup.attach.restore": "\ubc31\uc5c5 \ubcfc\ub968 \ubcf5\uc6d0 \ubc0f \uc5f0\uacb0",
273274
"label.backup.offering.assign": "\uac00\uc0c1\uba38\uc2e0\uc5d0 \ubc31\uc5c5 \uc624\ud37c\ub9c1 \ud560\ub2f9",
274275
"label.backup.offering.remove": "\uac00\uc0c1\uba38\uc2e0\uc5d0 \ubc31\uc5c5 \uc624\ud37c\ub9c1 \uc81c\uac70",

ui/public/locales/pt_BR.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,8 @@
292292
"label.availability": "Disponibilidade",
293293
"label.available": "Dispon\u00edvel",
294294
"label.back": "Voltar",
295-
"label.backup": "Backups",
295+
"label.backup": "Backup",
296+
"label.backups": "Backups",
296297
"label.backup.attach.restore": "Restaurar e anexar volume de backup",
297298
"label.backup.offering.assign": "Atribuir VM a oferta de backup",
298299
"label.backup.offering.remove": "Remover VM de oferta de backup",

ui/public/locales/te.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,7 @@
419419
"label.back": "వెనుకకు",
420420
"label.back.login": "తిరిగి లాగిన్‌కి",
421421
"label.backup": "బ్యాకప్‌లు",
422+
"label.backups": "బ్యాకప్‌లు",
422423
"label.backup.attach.restore": "బ్యాకప్ వాల్యూమ్‌ను పునరుద్ధరించండి మరియు అటాచ్ చేయండి",
423424
"label.backup.configure.schedule": "బ్యాకప్ షెడ్యూల్‌ను కాన్ఫిగర్ చేయండి",
424425
"label.backup.offering.assign": "బ్యాకప్ సమర్పణకు ఉదాహరణను కేటాయించండి",

ui/public/locales/zh_CN.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -561,6 +561,7 @@
561561

562562
"label.back": "\u540E\u9000",
563563
"label.backup": "\u5907\u4EFD",
564+
"label.backups": "\u5907\u4EFD",
564565
"label.backup.attach.restore": "\u6062\u590D\u5E76\u8FDE\u63A5\u5907\u4EFD\u5377",
565566
"label.backup.offering.assign": "\u5C06\u865A\u62DF\u673A\u5206\u914D\u7ED9\u5907\u4EFD\u4EA7\u54C1",
566567
"label.backup.offering.remove": "\u4ECE\u5907\u4EFD\u4EA7\u54C1\u4E2D\u5220\u9664\u865A\u62DF\u673A",

ui/src/components/widgets/InfiniteScrollSelect.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
</template>
7878
<a-select-option v-for="option in options" :key="option.id" :value="option[optionValueKey]">
7979
<span>
80-
<span v-if="showIcon">
80+
<span v-if="showIcon && option.showicon !== false">
8181
<resource-icon v-if="option.icon && option.icon.base64image" :image="option.icon.base64image" size="1x" style="margin-right: 5px"/>
8282
<render-icon v-else :icon="defaultIcon" style="margin-right: 5px" />
8383
</span>

0 commit comments

Comments
 (0)