Update dependency eslint-plugin-react-hooks to ^5.2.0

virtweb_backend/src/libvirt_lib_structures/domain.rs

@@ -26,7 +26,6 @@ pub struct OSXML {
     pub firmware: String,
     pub r#type: OSTypeXML,
     pub loader: Option<OSLoaderXML>,
-    pub smbios: Option<OSSMBiosXML>,
 }
 
 /// OS Type information
@@ -49,14 +48,6 @@ pub struct OSLoaderXML {
     pub secure: String,
 }
 
-/// SMBIOS System information
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(rename = "smbios")]
-pub struct OSSMBiosXML {
-    #[serde(rename = "@mode")]
-    pub mode: String,
-}
-
 /// Hypervisor features
 #[derive(serde::Serialize, serde::Deserialize, Clone, Default, Debug)]
 #[serde(rename = "features")]
@@ -314,29 +305,6 @@ pub struct DomainCPUXML {
     pub topology: Option<DomainCPUTopology>,
 }
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(rename = "entry")]
-pub struct OEMStringEntryXML {
-    #[serde(rename = "$text", default)]
-    pub content: String,
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(rename = "oemStrings")]
-pub struct OEMStringsXML {
-    #[serde(rename = "entry")]
-    pub entries: Vec<OEMStringEntryXML>,
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(rename = "sysinfo")]
-pub struct SysInfoXML {
-    #[serde(rename = "@type")]
-    pub r#type: String,
-    #[serde(rename = "oemStrings")]
-    pub oem_strings: Option<OEMStringsXML>,
-}
-
 /// Domain information, see https://libvirt.org/formatdomain.html
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 #[serde(rename = "domain")]
@@ -367,10 +335,6 @@ pub struct DomainXML {
     /// CPU information
     pub cpu: DomainCPUXML,
 
-    /// SMBios strings
-    pub sysinfo: Option<SysInfoXML>,
-
-    /// Behavior when guest state change
     pub on_poweroff: String,
     pub on_reboot: String,
     pub on_crash: String,

virtweb_backend/src/libvirt_rest_structures/vm.rs

@@ -77,14 +77,12 @@ pub struct VMInfo {
     pub vnc_access: bool,
     /// Attach ISO file(s)
     pub iso_files: Vec<String>,
-    /// File Storage - https://access.redhat.com/documentation/fr-fr/red_hat_enterprise_linux/6/html/virtualization_administration_guide/sect-virtualization-virtualized_block_devices-adding_storage_devices_to_guests#sect-Virtualization-Adding_storage_devices_to_guests-Adding_file_based_storage_to_a_guest
+    /// Storage - https://access.redhat.com/documentation/fr-fr/red_hat_enterprise_linux/6/html/virtualization_administration_guide/sect-virtualization-virtualized_block_devices-adding_storage_devices_to_guests#sect-Virtualization-Adding_storage_devices_to_guests-Adding_file_based_storage_to_a_guest
-    pub file_disks: Vec<FileDisk>,
+    pub disks: Vec<FileDisk>,
     /// Network cards
     pub networks: Vec<Network>,
     /// Add a TPM v2.0 module
     pub tpm_module: bool,
-    /// Strings injected as OEM Strings in SMBios configuration
-    pub oem_strings: Vec<String>,
 }
 
 impl VMInfo {
@@ -249,21 +247,15 @@ impl VMInfo {
         }
 
         // Check disks name for duplicates
-        for disk in &self.file_disks {
+        for disk in &self.disks {
-            if self
+            if self.disks.iter().filter(|d| d.name == disk.name).count() > 1 {
-                .file_disks
-                .iter()
-                .filter(|d| d.name == disk.name)
-                .count()
-                > 1
-            {
                 return Err(StructureExtraction("Two different disks have the same name!").into());
             }
         }
 
         // Apply disks configuration. Starting from now, the function should ideally never fail due to
         // bad user input
-        for disk in &self.file_disks {
+        for disk in &self.disks {
             disk.check_config()?;
             disk.apply_config(uuid)?;
 
@@ -331,9 +323,6 @@ impl VMInfo {
                         BootType::UEFISecureBoot => "yes".to_string(),
                     },
                 }),
-                smbios: Some(OSSMBiosXML {
-                    mode: "sysinfo".to_string(),
-                }),
             },
 
             features: FeaturesXML { acpi: ACPIXML {} },
@@ -390,17 +379,6 @@ impl VMInfo {
                 }),
             },
 
-            sysinfo: Some(SysInfoXML {
-                r#type: "smbios".to_string(),
-                oem_strings: Some(OEMStringsXML {
-                    entries: self
-                        .oem_strings
-                        .iter()
-                        .map(|s| OEMStringEntryXML { content: s.clone() })
-                        .collect(),
-                }),
-            }),
-
             on_poweroff: "destroy".to_string(),
             on_reboot: "restart".to_string(),
             on_crash: "destroy".to_string(),
@@ -450,7 +428,7 @@ impl VMInfo {
                 .map(|d| d.source.file.rsplit_once('/').unwrap().1.to_string())
                 .collect(),
 
-            file_disks: domain
+            disks: domain
                 .devices
                 .disks
                 .iter()
@@ -492,12 +470,6 @@ impl VMInfo {
                 .collect::<Result<Vec<_>, _>>()?,
 
             tpm_module: domain.devices.tpm.is_some(),
-
-            oem_strings: domain
-                .sysinfo
-                .and_then(|s| s.oem_strings)
-                .map(|s| s.entries.iter().map(|o| o.content.to_string()).collect())
-                .unwrap_or_default(),
         })
     }
 }

virtweb_frontend/src/api/VMApi.ts

@@ -17,11 +17,12 @@ export type VMState =
   | "PowerManagementSuspended"
   | "Other";
 
-export type VMFileDisk = BaseFileVMDisk & (RawVMDisk | QCow2Disk);
+export type DiskAllocType = "Sparse" | "Fixed";
 
-export interface BaseFileVMDisk {
+export interface VMDisk {
   size: number;
   name: string;
+  alloc_type: DiskAllocType;
   delete: boolean;
 
   // application attribute
@@ -29,17 +30,6 @@ export interface BaseFileVMDisk {
   deleteType?: "keepfile" | "deletefile";
 }
 
-export type DiskAllocType = "Sparse" | "Fixed";
-
-interface RawVMDisk {
-  format: "Raw";
-  alloc_type: DiskAllocType;
-}
-
-interface QCow2Disk {
-  format: "QCow2";
-}
-
 export interface VMNetInterfaceFilterParams {
   name: string;
   value: string;
@@ -80,10 +70,9 @@ interface VMInfoInterface {
   number_vcpu: number;
   vnc_access: boolean;
   iso_files: string[];
-  file_disks: VMFileDisk[];
+  disks: VMDisk[];
   networks: VMNetInterface[];
   tpm_module: boolean;
-  oem_strings: string[];
 }
 
 export class VMInfo implements VMInfoInterface {
@@ -99,10 +88,9 @@ export class VMInfo implements VMInfoInterface {
   memory: number;
   vnc_access: boolean;
   iso_files: string[];
-  file_disks: VMFileDisk[];
+  disks: VMDisk[];
   networks: VMNetInterface[];
   tpm_module: boolean;
-  oem_strings: string[];
 
   constructor(int: VMInfoInterface) {
     this.name = int.name;
@@ -117,10 +105,9 @@ export class VMInfo implements VMInfoInterface {
     this.memory = int.memory;
     this.vnc_access = int.vnc_access;
     this.iso_files = int.iso_files;
-    this.file_disks = int.file_disks;
+    this.disks = int.disks;
     this.networks = int.networks;
     this.tpm_module = int.tpm_module;
-    this.oem_strings = int.oem_strings;
   }
 
   static NewEmpty(): VMInfo {
@@ -132,10 +119,9 @@ export class VMInfo implements VMInfoInterface {
       number_vcpu: 1,
       vnc_access: true,
       iso_files: [],
-      file_disks: [],
+      disks: [],
       networks: [],
       tpm_module: true,
-      oem_strings: [],
     });
   }
 
@@ -208,8 +194,8 @@ export class VMApi {
    */
   static async UpdateSingle(vm: VMInfo): Promise<VMInfo> {
     // Process disks list, looking for removal
-    vm.file_disks = vm.file_disks.filter((d) => d.deleteType !== "keepfile");
+    vm.disks = vm.disks.filter((d) => d.deleteType !== "keepfile");
-    vm.file_disks.forEach((d) => {
+    vm.disks.forEach((d) => {
       if (d.deleteType === "deletefile") d.delete = true;
     });
 

virtweb_frontend/src/widgets/forms/OEMStringFormWidget.tsx

@@ -1,89 +0,0 @@
-/* eslint-disable react-x/no-array-index-key */
-import AddIcon from "@mui/icons-material/Add";
-import ClearIcon from "@mui/icons-material/Clear";
-import {
-  Alert,
-  IconButton,
-  InputAdornment,
-  TextField,
-  Tooltip,
-} from "@mui/material";
-import { VMInfo } from "../../api/VMApi";
-import { useConfirm } from "../../hooks/providers/ConfirmDialogProvider";
-import { EditSection } from "./EditSection";
-
-export function OEMStringFormWidget(p: {
-  vm: VMInfo;
-  editable: boolean;
-  onChange?: () => void;
-}): React.ReactElement {
-  const confirm = useConfirm();
-
-  const handleDeleteOEMString = async (num: number) => {
-    if (!(await confirm("Do you really want to delete this entry?"))) return;
-    p.vm.oem_strings.splice(num, 1);
-    p.onChange?.();
-  };
-
-  return (
-    <EditSection
-      title="SMBIOS OEM Strings"
-      actions={
-        p.editable ? (
-          <Tooltip title="Add a new string entry">
-            <IconButton
-              onClick={() => {
-                p.vm.oem_strings.push("");
-                p.onChange?.();
-              }}
-            >
-              <AddIcon />
-            </IconButton>
-          </Tooltip>
-        ) : (
-          <></>
-        )
-      }
-    >
-      <Alert severity="info">
-        You can use the{" "}
-        <a
-          href="https://www.nongnu.org/dmidecode/"
-          target="_blank"
-          rel="noreferrer noopener"
-          style={{ color: "inherit" }}
-        >
-          <i>dmidecode</i>
-        </a>{" "}
-        tool on Linux to extract these strings on the guest.
-      </Alert>
-
-      {p.vm.oem_strings.map((s, num) => (
-        <TextField
-          key={num}
-          fullWidth
-          disabled={!p.editable}
-          value={s}
-          onChange={(e) => {
-            p.vm.oem_strings[num] = e.target.value;
-            p.onChange?.();
-          }}
-          style={{ marginTop: "5px" }}
-          slotProps={{
-            input: {
-              endAdornment: p.editable ? (
-                <InputAdornment position="end">
-                  <Tooltip title="Remove entry">
-                    <IconButton onClick={() => handleDeleteOEMString(num)}>
-                      <ClearIcon />
-                    </IconButton>
-                  </Tooltip>
-                </InputAdornment>
-              ) : undefined,
-            },
-          }}
-        />
-      ))}
-    </EditSection>
-  );
-}

virtweb_frontend/src/widgets/forms/VMDisksList.tsx

@@ -14,7 +14,7 @@ import {
 } from "@mui/material";
 import { filesize } from "filesize";
 import { ServerApi } from "../../api/ServerApi";
-import { VMFileDisk, VMInfo } from "../../api/VMApi";
+import { VMDisk, VMInfo } from "../../api/VMApi";
 import { useConfirm } from "../../hooks/providers/ConfirmDialogProvider";
 import { SelectInput } from "./SelectInput";
 import { TextInput } from "./TextInput";
@@ -25,11 +25,11 @@ export function VMDisksList(p: {
   editable: boolean;
 }): React.ReactElement {
   const addNewDisk = () => {
-    p.vm.file_disks.push({
+    p.vm.disks.push({
-      format: "QCow2",
+      alloc_type: "Sparse",
       size: 10000,
       delete: false,
-      name: `disk${p.vm.file_disks.length}`,
+      name: `disk${p.vm.disks.length}`,
       new: true,
     });
     p.onChange?.();
@@ -38,7 +38,7 @@ export function VMDisksList(p: {
   return (
     <>
       {/* disks list */}
-      {p.vm.file_disks.map((d, num) => (
+      {p.vm.disks.map((d, num) => (
         <DiskInfo
           // eslint-disable-next-line react-x/no-array-index-key
           key={num}
@@ -46,7 +46,7 @@ export function VMDisksList(p: {
           disk={d}
           onChange={p.onChange}
           removeFromList={() => {
-            p.vm.file_disks.splice(num, 1);
+            p.vm.disks.splice(num, 1);
             p.onChange?.();
           }}
         />
@@ -59,7 +59,7 @@ export function VMDisksList(p: {
 
 function DiskInfo(p: {
   editable: boolean;
-  disk: VMFileDisk;
+  disk: VMDisk;
   onChange?: () => void;
   removeFromList: () => void;
 }): React.ReactElement {
@@ -126,30 +126,25 @@ function DiskInfo(p: {
             </>
           }
           secondary={`${filesize(p.disk.size * 1000 * 1000)} - ${
-            p.disk.format
+            p.disk.alloc_type
-          }${p.disk.format == "Raw" ? " - " + p.disk.alloc_type : ""}`}
+          }`}
         />
       </ListItem>
     );
 
   return (
     <Paper elevation={3} style={{ margin: "10px", padding: "10px" }}>
-      <div style={{ display: "flex", justifyContent: "space-between" }}>
+      <TextInput
-        <TextInput
+        editable={true}
-          editable={true}
+        label="Disk name"
-          label="Disk name"
+        size={ServerApi.Config.constraints.disk_name_size}
-          size={ServerApi.Config.constraints.disk_name_size}
+        checkValue={(v) => /^[a-zA-Z0-9]+$/.test(v)}
-          checkValue={(v) => /^[a-zA-Z0-9]+$/.test(v)}
+        value={p.disk.name}
-          value={p.disk.name}
+        onValueChange={(v) => {
-          onValueChange={(v) => {
+          p.disk.name = v ?? "";
-            p.disk.name = v ?? "";
+          p.onChange?.();
-            p.onChange?.();
+        }}
-          }}
+      />
-        />
-        <IconButton onClick={p.removeFromList}>
-          <DeleteIcon />
-        </IconButton>
-      </div>
 
       <TextInput
         editable={true}
@@ -163,21 +158,7 @@ function DiskInfo(p: {
         type="number"
       />
 
-      <SelectInput
+      <div style={{ display: "flex", justifyContent: "space-between" }}>
-        editable={true}
-        label="Disk format"
-        options={[
-          { label: "Raw file", value: "Raw" },
-          { label: "QCow2", value: "QCow2" },
-        ]}
-        value={p.disk.format}
-        onValueChange={(v) => {
-          p.disk.format = v as any;
-          p.onChange?.();
-        }}
-      />
-
-      {p.disk.format === "Raw" && (
         <SelectInput
           editable={true}
           label="File allocation type"
@@ -187,11 +168,15 @@ function DiskInfo(p: {
           ]}
           value={p.disk.alloc_type}
           onValueChange={(v) => {
-            if (p.disk.format === "Raw") p.disk.alloc_type = v as any;
+            p.disk.alloc_type = v as any;
             p.onChange?.();
           }}
         />
-      )}
+
+        <IconButton onClick={p.removeFromList}>
+          <DeleteIcon />
+        </IconButton>
+      </div>
     </Paper>
   );
 }

virtweb_frontend/src/widgets/vms/VMDetails.tsx

@@ -19,7 +19,6 @@ import { TabsWidget } from "../TabsWidget";
 import { XMLAsyncWidget } from "../XMLWidget";
 import { CheckboxInput } from "../forms/CheckboxInput";
 import { EditSection } from "../forms/EditSection";
-import { OEMStringFormWidget } from "../forms/OEMStringFormWidget";
 import { ResAutostartInput } from "../forms/ResAutostartInput";
 import { SelectInput } from "../forms/SelectInput";
 import { TextInput } from "../forms/TextInput";
@@ -79,7 +78,6 @@ enum VMTab {
   General = 0,
   Storage,
   Network,
-  Advanced,
   XML,
   Danger,
 }
@@ -104,8 +102,6 @@ function VMDetailsInner(p: DetailsInnerProps): React.ReactElement {
           { label: "General", value: VMTab.General, visible: true },
           { label: "Storage", value: VMTab.Storage, visible: true },
           { label: "Network", value: VMTab.Network, visible: true },
-          { label: "Avanced", value: VMTab.Advanced, visible: true },
-
           {
             label: "XML",
             value: VMTab.XML,
@@ -123,7 +119,6 @@ function VMDetailsInner(p: DetailsInnerProps): React.ReactElement {
       {currTab === VMTab.General && <VMDetailsTabGeneral {...p} />}
       {currTab === VMTab.Storage && <VMDetailsTabStorage {...p} />}
       {currTab === VMTab.Network && <VMDetailsTabNetwork {...p} />}
-      {currTab === VMTab.Advanced && <VMDetailsTabAdvanced {...p} />}
       {currTab === VMTab.XML && <VMDetailsTabXML {...p} />}
       {currTab === VMTab.Danger && <VMDetailsTabDanger {...p} />}
     </>
@@ -339,8 +334,8 @@ function VMDetailsTabGeneral(p: DetailsInnerProps): React.ReactElement {
 function VMDetailsTabStorage(p: DetailsInnerProps): React.ReactElement {
   return (
     <Grid container spacing={2}>
-      {(p.editable || p.vm.file_disks.length > 0) && (
+      {(p.editable || p.vm.disks.length > 0) && (
-        <EditSection title="File disks storage">
+        <EditSection title="Disks storage">
           <VMDisksList {...p} />
         </EditSection>
       )}
@@ -366,15 +361,6 @@ function VMDetailsTabNetwork(p: DetailsInnerProps): React.ReactElement {
   return <VMNetworksList {...p} />;
 }
 
-function VMDetailsTabAdvanced(p: DetailsInnerProps): React.ReactElement {
-  return (
-    <Grid container spacing={2}>
-      {/* OEM strings */}
-      <OEMStringFormWidget {...p} />
-    </Grid>
-  );
-}
-
 function VMDetailsTabXML(p: DetailsInnerProps): React.ReactElement {
   return (
     <XMLAsyncWidget