refactor: display bit version of OS (#1101)

mainsail-crew · Sep 30, 2022 · 37c9fa8 · 37c9fa8
1 parent 6a40e60
commit 37c9fa8
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/src/components/panels/Machine/SystemPanelHost.vue b/src/components/panels/Machine/SystemPanelHost.vue
@@ -9,16 +9,12 @@
         <v-row class="py-0 pr-4">
             <v-col class="pl-6">
                 <strong style="cursor: pointer" @click="hostDetailsDialog = true">Host</strong>
-                <template v-if="hostStats.cpuDesc">
-                    <v-tooltip top>
-                        <template #activator="{ on, attrs }">
-                            <small v-if="hostStats.cpuName" class="ml-2" v-bind="attrs" v-on="on">
-                                ({{ hostStats.cpuName }})
-                            </small>
-                        </template>
-                        <span>{{ hostStats.cpuDesc }}</span>
-                    </v-tooltip>
-                </template>
+                <v-tooltip top>
+                    <template #activator="{ on, attrs }">
+                        <small v-if="hostStats.cpuName" class="ml-2" v-bind="attrs" v-on="on">({{ cpuName }})</small>
+                    </template>
+                    <span>{{ cpuDesc }}</span>
+                </v-tooltip>
                 <br />
                 <div class="text-body-2">
                     <div v-if="hostStats.version">
@@ -261,5 +257,21 @@ export default class SystemPanelHost extends Mixins(BaseMixin) {
 
         return null
     }
+
+    get cpuDesc() {
+        let output = this.hostStats.cpuDesc
+
+        return output
+    }
+
+    get cpuName() {
+        let output = this.hostStats.cpuName
+
+        if (this.hostStats.bits) {
+            output += `, ${this.hostStats.bits}`
+        }
+
+        return output
+    }
 }
 </script>
diff --git a/src/store/server/getters.ts b/src/store/server/getters.ts
@@ -44,6 +44,7 @@ export const getters: GetterTree<ServerState, any> = {
         interface HostStats {
             cpuName: string | null
             cpuDesc: string | null
+            bits: string | null
             version: string | null
             pythonVersion: string | null
             os: string | null
@@ -119,6 +120,7 @@ export const getters: GetterTree<ServerState, any> = {
             output = {
                 cpuName: state.system_info?.cpu_info?.processor ?? null,
                 cpuDesc: state.system_info?.cpu_info?.cpu_desc ?? null,
+                bits: state.system_info?.cpu_info?.bits ?? null,
                 version,
                 pythonVersion,
                 os: state.system_info?.distribution?.name ?? null,