feat(xo-6): simplify functions

vatesfr · Dec 11, 2024 · 077a198 · 077a198
1 parent d71c025
commit 077a198
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/@xen-orchestra/web/src/components/pif/PifPanel.vue b/@xen-orchestra/web/src/components/pif/PifPanel.vue
@@ -153,7 +153,7 @@
             {{ $t('ip-mode') }}
           </template>
           <template #value>
-            {{ props.pif.mode }}
+            {{ getPifData('mode') }}
           </template>
         </VtsCardRowKeyValue>
       </div>
@@ -245,14 +245,22 @@ const getNetworkData = (type: keyof XoNetwork) => {
       return network[type] ? 'on' : 'off'
     case 'tags':
       return network.tags.length ? network.tags : '-'
-    default:
-      return undefined
   }
 }
 
 const getPifData = (type: keyof XoPif) => {
-  const value = type === 'vlan' ? props.pif.vlan : props.pif[type]
-  return value === -1 || value === '' ? '-' : value
+  const value = props.pif[type]
+
+  switch (type) {
+    case 'vlan':
+      return value === -1 ? '-' : value
+    case 'netmask':
+    case 'dns':
+    case 'gateway':
+      return value === '' ? '-' : props.pif.netmask
+    case 'mode':
+      return value === 'None' ? '-' : value
+  }
 }
 </script>
 

diff --git a/@xen-orchestra/web/src/components/pif/PifTable.vue b/@xen-orchestra/web/src/components/pif/PifTable.vue
@@ -72,7 +72,7 @@
               </div>
               <div v-if="column.id === 'ip'" v-tooltip class="text-ellipsis">{{ row.value.ip }}</div>
               <div v-if="column.id === 'mac'" v-tooltip class="text-ellipsis">{{ row.value.mac }}</div>
-              <div v-if="column.id === 'mode'" v-tooltip class="text-ellipsis">{{ row.value.mode }}</div>
+              <div v-if="column.id === 'mode'" v-tooltip class="text-ellipsis">{{ getPifData(row.value, 'mode') }}</div>
               <div v-if="column.id === 'more'" v-tooltip>
                 <VtsIcon accent="info" :icon="faEllipsis" />
               </div>
@@ -141,10 +141,8 @@ const getNetworkName = (pif: XoPif) => {
   return network.name_label ? network.name_label : ''
 }
 
-const getPifData = (pif: XoPif, type: keyof XoPif) => {
-  const value = type === 'vlan' ? pif.vlan : pif[type]
-  return value === -1 || value === '' ? '' : value
-}
+const getPifData = (pif: XoPif, type: keyof XoPif) =>
+  (type === 'vlan' && pif[type] === -1) || (type === 'mode' && pif[type] === 'None') ? '' : pif[type]
 
 const searchQuery = ref('')