From df7dcc170a694e912e7fbc1d26cd023c185369d2 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Tue, 19 May 2026 09:55:00 +0900
Subject: [PATCH 1/3] =?UTF-8?q?commvault=EC=9D=98=20=EA=B2=BD=EC=9A=B0=20?=
 =?UTF-8?q?=EB=B0=B1=EC=97=85=20=EC=98=A4=ED=8D=BC=EB=A7=81=20=EB=B3=B5?=
 =?UTF-8?q?=EC=A0=9C=20=EC=98=88=EC=99=B8=EC=B2=98=EB=A6=AC=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/config/section/offering.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/src/config/section/offering.js b/ui/src/config/section/offering.js
index 10fff1c4d7cf..0ff17146e8e2 100644
--- a/ui/src/config/section/offering.js
+++ b/ui/src/config/section/offering.js
@@ -407,6 +407,7 @@ export default {
         docHelp: 'adminguide/virtual_machines.html#importing-backup-offerings',
         dataView: true,
         popup: true,
+        show: (record) => { return record.provider !== 'commvault' },
         component: shallowRef(defineAsyncComponent(() => import('@/views/offering/CloneBackupOffering.vue')))
       }, {
         api: 'deleteBackupOffering',

From a4124a1f4cc0fb9464630d046d4da10b0737cd30 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Tue, 19 May 2026 14:46:14 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=EB=A9=80=ED=8B=B0=20=EB=B0=B1=EC=97=85=20?=
 =?UTF-8?q?=ED=94=8C=EB=9F=AC=EA=B7=B8=EC=9D=B8=20=EC=A7=80=EC=9B=90?=
 =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/views/offering/CloneBackupOffering.vue | 74 +++++++++++++++----
 1 file changed, 59 insertions(+), 15 deletions(-)

diff --git a/ui/src/views/offering/CloneBackupOffering.vue b/ui/src/views/offering/CloneBackupOffering.vue
index c489286ce6c2..ac679d5fa738 100644
--- a/ui/src/views/offering/CloneBackupOffering.vue
+++ b/ui/src/views/offering/CloneBackupOffering.vue
@@ -39,7 +39,7 @@
         :model="form"
         :rules="rules"
         @finish="handleSubmit"
-       >
+      >
         <a-form-item name="name" ref="name">
           <template #label>
             <tooltip-label :title="$t('label.name')" :tooltip="apiParams.name.description"/>
@@ -90,7 +90,7 @@
             :filterOption="(input, option) => {
               return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
             }" >
-            <a-select-option v-for="opt in externals.opts" :key="opt.id" :label="opt.name">
+            <a-select-option v-for="opt in externals.opts" :key="opt.id" :value="opt.externalid" :label="opt.name">
               {{ opt.name }}
             </a-select-option>
           </a-select>
@@ -166,6 +166,10 @@ export default {
         loading: false,
         opts: []
       },
+      providers: {
+        loading: false,
+        opts: []
+      },
       externals: {
         loading: false,
         opts: []
@@ -173,7 +177,8 @@ export default {
       domains: {
         loading: false,
         opts: []
-      }
+      },
+      selectedZoneId: null
     }
   },
   beforeCreate () {
@@ -191,7 +196,8 @@ export default {
       })
       this.rules = reactive({
         name: [{ required: true, message: this.$t('message.error.required.input') }],
-        description: [{ required: true, message: this.$t('message.error.required.input') }]
+        description: [{ required: true, message: this.$t('message.error.required.input') }],
+        externalid: [{ required: true, message: this.$t('message.error.select') }]
       })
     },
     fetchData () {
@@ -228,14 +234,52 @@ export default {
         this.domains.loading = false
       })
     },
-    fetchExternal (zoneId) {
+    fetchProvider (zoneId) {
       if (!zoneId) {
+        this.providers.opts = []
         this.externals.opts = []
+        this.form.externalid = null
         return
       }
+      this.providers.loading = true
+      getAPI('listBackupProvidersForZone', { zoneid: zoneId }).then(json => {
+        this.providers.opts = json.listbackupprovidersforzoneresponse.providers || []
+        const sourceProvider = this.resource?.provider
+        const provider = this.providers.opts.find(provider => {
+          return provider.name?.toLowerCase() === sourceProvider?.toLowerCase()
+        })
+        if (!provider) {
+          this.externals.opts = []
+          this.form.externalid = null
+          return
+        }
+        this.fetchExternal(zoneId, provider.name)
+      }).catch(error => {
+        this.$notifyError(error)
+      }).finally(() => {
+        this.providers.loading = false
+      })
+    },
+    fetchExternal (zoneId, providerName) {
+      if (!zoneId || !providerName) {
+        this.externals.opts = []
+        this.form.externalid = null
+        return
+      }
+
       this.externals.loading = true
-      getAPI('listBackupProviderOfferings', { zoneid: zoneId }).then(json => {
-        this.externals.opts = json.listbackupproviderofferingsresponse.backupoffering || []
+      getAPI('listBackupProviderOfferings', { zoneid: zoneId, provider: providerName }).then(json => {
+        const externalOfferings = json.listbackupproviderofferingsresponse.backupoffering || []
+        const sourceExternalId = this.resource?.externalid
+        this.externals.opts = externalOfferings.filter(opt => {
+          return String(opt.externalid) !== String(sourceExternalId)
+        })
+        const hasSelectedExternal = this.externals.opts.some(opt => {
+          return String(opt.externalid) === String(this.form.externalid)
+        })
+        if (!hasSelectedExternal) {
+          this.form.externalid = null
+        }
       }).catch(error => {
         this.$notifyError(error)
       }).finally(() => {
@@ -279,15 +323,10 @@ export default {
         const zone = this.zones.opts.find(z => z.id === r.zoneid)
         if (zone) {
           this.form.zoneid = zone.name
-          this.fetchExternal(zone.id)
+          this.selectedZoneId = zone.id
+          this.fetchProvider(zone.id)
         }
       }
-
-      if (r.externalid) {
-        this.$nextTick(() => {
-          this.form.externalid = r.externalid
-        })
-      }
     },
     handleSubmit (e) {
       if (e) {
@@ -378,13 +417,18 @@ export default {
     },
     onChangeZone (value) {
       if (!value) {
+        this.selectedZoneId = null
+        this.providers.opts = []
         this.externals.opts = []
         this.form.externalid = null
         return
       }
       const zone = this.zones.opts.find(z => z.name === value)
       if (zone) {
-        this.fetchExternal(zone.id)
+        this.selectedZoneId = zone.id
+        this.form.externalid = null
+        this.externals.opts = []
+        this.fetchProvider(zone.id)
       }
     },
     onChangeIsPublic (value) {

From d3c79f31d41c1e5026aa849ac53737210d64f752 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Tue, 19 May 2026 15:08:34 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=EB=A9=94=EC=84=B8=EC=A7=80=20=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/views/offering/CloneBackupOffering.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/src/views/offering/CloneBackupOffering.vue b/ui/src/views/offering/CloneBackupOffering.vue
index ac679d5fa738..6531d07ebaa0 100644
--- a/ui/src/views/offering/CloneBackupOffering.vue
+++ b/ui/src/views/offering/CloneBackupOffering.vue
@@ -381,8 +381,7 @@ export default {
         }
 
         this.loading = true
-        const title = this.$t('message.success.clone.backup.offering')
-
+        const title = this.$t('label.clone.backup.offering')
         postAPI('cloneBackupOffering', params).then(json => {
           const jobId = json.clonebackupofferingresponse?.jobid
           if (jobId) {