fix(xo-lite): fixed search in pool networks table to be able to searc…

…h on name label
vatesfr · Feb 27, 2025 · d4fa152 · d4fa152
1 parent 8063f43
commit d4fa152
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 23 deletions.
diff --git a/@xen-orchestra/lite/src/components/pool/network/PoolHostInternalNetworksTable.vue b/@xen-orchestra/lite/src/components/pool/network/PoolHostInternalNetworksTable.vue
@@ -144,18 +144,8 @@ const { networks } = defineProps<{
 const { isReady, hasError } = useNetworkStore().subscribe()
 
 const { t } = useI18n()
-const searchQuery = ref('')
-const selectedNetworkId = useRouteQuery('id')
 
-const filteredNetworks = computed(() => {
-  const searchTerm = searchQuery.value.trim().toLocaleLowerCase()
-  if (!searchTerm) {
-    return networks
-  }
-  return networks.filter(network =>
-    Object.values(network).some(value => String(value).toLocaleLowerCase().includes(searchTerm))
-  )
-})
+const selectedNetworkId = useRouteQuery('id')
 
 const networkUuids = computed(() => networks.map(network => network.uuid))
 
@@ -167,6 +157,22 @@ const toggleSelect = () => {
 
 const getLockingMode = (lockingMode: string) => (lockingMode === 'disabled' ? t('disabled') : t('unlocked'))
 
+const searchQuery = ref('')
+
+const filteredNetworks = computed(() => {
+  const searchTerm = searchQuery.value.trim().toLocaleLowerCase()
+
+  if (!searchTerm) {
+    return networks
+  }
+
+  return networks.filter(network =>
+    [...Object.values(network), network.name_label].some(value =>
+      String(value).toLocaleLowerCase().includes(searchTerm)
+    )
+  )
+})
+
 const { visibleColumns, rows } = useTable('networks', filteredNetworks, {
   rowId: record => record.uuid,
   columns: define => [

diff --git a/@xen-orchestra/lite/src/components/pool/network/PoolNetworksTable.vue b/@xen-orchestra/lite/src/components/pool/network/PoolNetworksTable.vue
@@ -155,19 +155,8 @@ const { records: pifs } = usePifStore().subscribe()
 const { getPifCarrier } = usePifMetricsStore().subscribe()
 
 const { t } = useI18n()
-const searchQuery = ref('')
-const selectedNetworkId = useRouteQuery('id')
 
-const filteredNetworks = computed(() => {
-  const searchTerm = searchQuery.value.trim().toLocaleLowerCase()
-  if (!searchTerm) {
-    return networks
-  }
-
-  return networks.filter(network =>
-    Object.values(network).some(value => String(value).toLocaleLowerCase().includes(searchTerm))
-  )
-})
+const selectedNetworkId = useRouteQuery('id')
 
 const networkUuids = computed(() => networks.map(network => network.uuid))
 
@@ -179,6 +168,7 @@ const toggleSelect = () => {
 
 const getNetworkVlan = (network: XenApiNetwork) => {
   const networkPIFs = pifs.value.filter(pif => network.PIFs?.includes(pif.$ref))
+
   if (networkPIFs.length > 0) {
     return networkPIFs[0].VLAN !== -1 ? networkPIFs[0].VLAN.toString() : t('none')
   }
@@ -205,6 +195,22 @@ const getNetworkStatus = (network: XenApiNetwork) => {
 
 const getLockingMode = (lockingMode: string) => (lockingMode === 'disabled' ? t('disabled') : t('unlocked'))
 
+const searchQuery = ref('')
+
+const filteredNetworks = computed(() => {
+  const searchTerm = searchQuery.value.trim().toLocaleLowerCase()
+
+  if (!searchTerm) {
+    return networks
+  }
+
+  return networks.filter(network =>
+    [...Object.values(network), network.name_label].some(value =>
+      String(value).toLocaleLowerCase().includes(searchTerm)
+    )
+  )
+})
+
 const { visibleColumns, rows } = useTable('networks', filteredNetworks, {
   rowId: record => record.uuid,
   columns: define => [