From 3303fb797dc1b83d158061efac666eb25094e027 Mon Sep 17 00:00:00 2001
From: utchoang <hoangnm@unitech.vn>
Date: Mon, 27 Jun 2022 11:04:25 +0700
Subject: [PATCH 1/3] fixes resize volume message

---
 ui/public/locales/en.json             | 1 +
 ui/src/views/storage/ResizeVolume.vue | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index b96b9bc1c19f..11abce2668b1 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -3348,6 +3348,7 @@
 "message.reset.vpn.connection": "Please confirm that you want to reset VPN connection.",
 "message.linstor.resourcegroup.description": "Linstor resource group to use for primary storage.",
 "message.resize.volume.failed": "Failed to resize volume.",
+"message.resize.volumne.processing": "Volume resize is in progress",
 "message.resource.not.found": "Resource not found.",
 "message.restart.mgmt.server": "Please restart your management server(s) for your new settings to take effect.",
 "message.restart.mgmt.usage.server": "Please restart your management server(s) and usage server(s) for your new settings to take effect.",
diff --git a/ui/src/views/storage/ResizeVolume.vue b/ui/src/views/storage/ResizeVolume.vue
index 4d10fd819cfe..1cb1cc79b001 100644
--- a/ui/src/views/storage/ResizeVolume.vue
+++ b/ui/src/views/storage/ResizeVolume.vue
@@ -72,7 +72,8 @@ export default {
     return {
       offerings: [],
       customDiskOffering: false,
-      loading: false
+      loading: false,
+      customDiskOfferingIops: false
     }
   },
   created () {
@@ -98,6 +99,7 @@ export default {
         this.offerings = json.listdiskofferingsresponse.diskoffering || []
         this.form.diskofferingid = this.offerings[0].id || ''
         this.customDiskOffering = this.offerings[0].iscustomized || false
+        this.customDiskOfferingIops = this.offerings[0].iscustomizediops || false
       }).finally(() => {
         this.loading = false
       })
@@ -112,7 +114,7 @@ export default {
         api('resizeVolume', values).then(response => {
           this.$pollJob({
             jobId: response.resizevolumeresponse.jobid,
-            title: this.$t('message.success.resize.volume'),
+            title: this.$t('label.action.resize.volume'),
             description: values.name,
             successMessage: this.$t('message.success.resize.volume'),
             successMethod: () => {},
@@ -120,7 +122,7 @@ export default {
             errorMethod: () => {
               this.closeModal()
             },
-            loadingMessage: `Volume resize is in progress`,
+            loadingMessage: this.$t('message.resize.volumne.processing'),
             catchMessage: this.$t('error.fetching.async.job.result'),
             catchMethod: () => {
               this.loading = false

From b14085f3246244a2ffe6291c84eb29f3fd8b9b81 Mon Sep 17 00:00:00 2001
From: Hoang Nguyen <hoangnm@unitech.vn>
Date: Mon, 27 Jun 2022 13:07:23 +0700
Subject: [PATCH 2/3] Update ui/public/locales/en.json

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
---
 ui/public/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index 11abce2668b1..9bb0df89bb20 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -3348,7 +3348,7 @@
 "message.reset.vpn.connection": "Please confirm that you want to reset VPN connection.",
 "message.linstor.resourcegroup.description": "Linstor resource group to use for primary storage.",
 "message.resize.volume.failed": "Failed to resize volume.",
-"message.resize.volumne.processing": "Volume resize is in progress",
+"message.resize.volume.processing": "Volume resize is in progress",
 "message.resource.not.found": "Resource not found.",
 "message.restart.mgmt.server": "Please restart your management server(s) for your new settings to take effect.",
 "message.restart.mgmt.usage.server": "Please restart your management server(s) and usage server(s) for your new settings to take effect.",

From 492389bf14766f7e8effbff3c3d6cbd339e095e3 Mon Sep 17 00:00:00 2001
From: Hoang Nguyen <hoangnm@unitech.vn>
Date: Mon, 27 Jun 2022 13:22:24 +0700
Subject: [PATCH 3/3] Update ui/src/views/storage/ResizeVolume.vue

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
---
 ui/src/views/storage/ResizeVolume.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/views/storage/ResizeVolume.vue b/ui/src/views/storage/ResizeVolume.vue
index 1cb1cc79b001..38a7ea5cb23b 100644
--- a/ui/src/views/storage/ResizeVolume.vue
+++ b/ui/src/views/storage/ResizeVolume.vue
@@ -122,7 +122,7 @@ export default {
             errorMethod: () => {
               this.closeModal()
             },
-            loadingMessage: this.$t('message.resize.volumne.processing'),
+            loadingMessage: this.$t('message.resize.volume.processing'),
             catchMessage: this.$t('error.fetching.async.job.result'),
             catchMethod: () => {
               this.loading = false