Address comments

Author: vishesh92

ui/src/components/view/DedicateDomain.vue

@@ -102,7 +102,6 @@ export default {
       this.selectedAccount = null
       this.$emit('domainChange', domainId)
       this.domainError = false
-      // InfiniteScrollSelect will auto-reload accounts when apiParams changes
     },
     handleChangeAccount (accountName) {
       this.selectedAccount = accountName

ui/src/components/widgets/InfiniteScrollSelect.vue

@@ -191,6 +191,23 @@ export default {
       }
       // When a valid value is selected, show all options
       return this.options
+    },
+    apiOptionsCount () {
+      if (this.defaultOption) {
+        const defaultOptionValue = this.defaultOption[this.optionValueKey]
+        return this.options.filter(option => option[this.optionValueKey] !== defaultOptionValue).length
+      }
+      return this.options.length
+    },
+    preselectedMatchValue () {
+      // Extract the first value from preselectedOptionValue if it's an array, otherwise return the value itself
+      if (!this.preselectedOptionValue) return null
+      return Array.isArray(this.preselectedOptionValue) ? this.preselectedOptionValue[0] : this.preselectedOptionValue
+    },
+    preselectedMatch () {
+      // Find the matching option for the preselected value
+      if (!this.preselectedMatchValue) return null
+      return this.options.find(entry => entry[this.optionValueKey] === this.preselectedMatchValue) || null
     }
   },
   watch: {
@@ -246,13 +263,10 @@ export default {
         this.resetPreselectedOptionValue()
         return
       }
-      const matchValue = Array.isArray(this.preselectedOptionValue) ? this.preselectedOptionValue[0] : this.preselectedOptionValue
-      const match = this.options.find(entry => entry[this.optionValueKey] === matchValue)
-      if (!match) {
+      if (!this.preselectedMatch) {
         this.successiveFetches++
         // Exclude defaultOption from count when comparing with totalCount
-        const apiOptionsCount = this.getApiOptionsCount()
-        if (apiOptionsCount < this.totalCount) {
+        if (this.apiOptionsCount < this.totalCount) {
           this.fetchItems()
         } else {
           this.resetPreselectedOptionValue()
@@ -274,14 +288,6 @@ export default {
       this.preselectedOptionValue = null
       this.successiveFetches = 0
     },
-    getApiOptionsCount () {
-      // Return count of options excluding the locally added defaultOption
-      if (this.defaultOption) {
-        const defaultOptionValue = this.defaultOption[this.optionValueKey]
-        return this.options.filter(option => option[this.optionValueKey] !== defaultOptionValue).length
-      }
-      return this.options.length
-    },
     autoSelectFirstOptionIfNeeded () {
       if (!this.selectFirstOption || this.hasAutoSelectedFirst) {
         return
@@ -331,8 +337,7 @@ export default {
     onScroll (e) {
       const nearBottom = e.target.scrollTop + e.target.clientHeight >= e.target.scrollHeight - 10
       // Exclude defaultOption from count when comparing with totalCount
-      const apiOptionsCount = this.getApiOptionsCount()
-      const hasMore = apiOptionsCount < this.totalCount
+      const hasMore = this.apiOptionsCount < this.totalCount
       if (nearBottom && hasMore && !this.loading) {
         this.fetchItems()
       }

ui/src/views/compute/wizard/OwnershipSelection.vue

@@ -132,24 +132,20 @@ export default {
     }
   },
   created () {
-    // Set initial domain selection
     const ownerDomainId = this.$store.getters.project?.domainid || this.$store.getters.userInfo.domainid
     if (ownerDomainId) {
       this.selectedDomain = ownerDomainId
     }
   },
   methods: {
     changeAccountType () {
-      // Reset account/project selection when switching types
       this.selectedAccount = null
       this.selectedProject = null
 
-      // Trigger initial selection based on type
       this.handleDomainChange(this.selectedDomain)
     },
     handleDomainChange (domainId) {
       this.selectedDomain = domainId
-      // Reset child selections
       this.selectedAccount = null
       this.selectedProject = null
 

ui/src/views/iam/AddUser.vue

@@ -249,7 +249,6 @@ export default {
     handleDomainChange (domainId) {
       this.form.domainid = domainId
       this.form.account = null
-      // InfiniteScrollSelect will auto-reload accounts when apiParams changes
     },
     fetchTimeZone (value) {
       this.timeZoneMap = []

ui/src/views/infra/UsageRecords.vue

@@ -564,7 +564,6 @@ export default {
     handleDomainChange (domainId) {
       this.form.domain = domainId
       this.form.account = null
-      // InfiniteScrollSelect will auto-reload accounts when apiParams changes
     },
     handleDomainOptionChange (option) {
       if (option && option.id) {

ui/src/views/storage/CreateTemplate.vue

@@ -314,7 +314,6 @@ export default {
       this.domainid = domainId
       this.form.account = null
       this.account = null
-      // InfiniteScrollSelect will auto-reload accounts when apiParams changes
     },
     handleAccountChange (accountName) {
       if (accountName) {

ui/src/views/storage/UploadLocalVolume.vue

@@ -262,7 +262,6 @@ export default {
       this.form.domainid = domainId
       this.domainId = domainId
       this.form.account = null
-      // InfiniteScrollSelect will auto-reload accounts when apiParams changes
     },
     handleAccountChange (accountName) {
       this.form.account = accountName

ui/src/views/storage/UploadVolume.vue

@@ -234,7 +234,6 @@ export default {
       this.form.domainid = domainId
       this.domainId = domainId
       this.form.account = null
-      // InfiniteScrollSelect will auto-reload accounts when apiParams changes
     },
     handleAccountChange (accountName) {
       this.form.account = accountName

ui/src/views/tools/CreateWebhook.vue

@@ -292,14 +292,11 @@ export default {
       }, 1)
     },
     handleScopeChange (e) {
-      // Reset domain and account when scope changes
       this.form.domainid = null
       this.form.account = null
     },
     handleDomainChanged (domainid) {
-      // Reset account when domain changes
       this.form.account = null
-      // InfiniteScrollSelect will auto-reload accounts when apiParams changes
     }
   }
 }