Merge pull request #5078 from KKoukiou/webui-rescan-no-unselect

webui: When re-scanning don't reset disk selection

ui/webui/src/components/storage/InstallationMethod.jsx

@@ -60,17 +60,17 @@ const N_ = cockpit.noop;
 /**
  * Select default disks for the partitioning.
  *
- * If there are some disks already selected, do nothing.
+ * If there are some usable disks already selected, show these.
  * In the automatic installation, select all disks. In
  * the interactive installation, select a disk if there
  * is only one available.
  * @return: the list of selected disks
  */
 const selectDefaultDisks = ({ ignoredDisks, selectedDisks, usableDisks }) => {
- if (selectedDisks.length) {
- // Do nothing if there are some disks selected
+ if (selectedDisks.length && selectedDisks.some(disk => usableDisks.includes(disk))) {
+ // Filter the selection by checking the usable disks if there are some disks selected
  console.log("Selecting disks selected in backend:", selectedDisks.join(","));
- return selectedDisks;
+ return selectedDisks.filter(disk => usableDisks.includes(disk));
  } else {
  const availableDisks = usableDisks.filter(disk => !ignoredDisks.includes(disk));
  console.log("Selecting one or less disks by default:", availableDisks.join(","));
@@ -307,7 +307,6 @@ const InstallationDestination = ({ deviceData, diskSelection, dispatch, idPrefix
  if (refUsableDisks.current !== undefined) {
  return;
  }
- refUsableDisks.current = diskSelection.usableDisks;
 
  const defaultDisks = selectDefaultDisks({
  ignoredDisks: diskSelection.ignoredDisks,
@@ -343,7 +342,7 @@ const InstallationDestination = ({ deviceData, diskSelection, dispatch, idPrefix
  icon={<SyncAltIcon />}
  onClick={() => {
  setIsRescanningDisks(true);
- setSelectedDisks({ drives: [] });
+ refUsableDisks.current = undefined;
  scanDevicesWithTask()
  .then(res => {
  return runStorageTask({
@@ -374,7 +373,7 @@ const InstallationDestination = ({ deviceData, diskSelection, dispatch, idPrefix
  />
  );
 
- const equalDisks = refUsableDisks.current && containEqualDisks(refUsableDisks.current, diskSelection.usableDisks);
+ const equalDisks = !refUsableDisks.current || containEqualDisks(refUsableDisks.current, diskSelection.usableDisks);
  const headingLevel = isBootIso ? "h2" : "h3";
 
  return (

ui/webui/test/check-storage

@@ -62,7 +62,7 @@ class TestStorage(anacondalib.VirtInstallMachineCase, StorageHelpers):
  s.rescan_disks()
 
  # Check that the disk selection persists when moving next and back
- s.select_disk("vda", True)
+ s.check_disk_selected("vda", True)
  i.next()
  i.back()
  s.check_disk_selected("vda", True)
@@ -287,24 +287,26 @@ class TestStorageExtraDisks(anacondalib.VirtInstallMachineCase, StorageHelpers):
  s.check_single_disk_destination("vda")
 
  s.rescan_disks()
+
  s.check_disk_visible("vda")
  s.check_disk_visible(dev)
 
  s.wait_no_disks_detected_not_present()
 
- s.check_disk_selected("vda", False)
+ s.check_disk_selected("vda", True)
  s.check_disk_selected(dev, False)
 
  s.rescan_disks()
- s.wait_no_disks_detected()
+
+ s.check_disk_selected("vda", True)
+ s.check_disk_selected(dev, False)
+
+ s.select_disk(dev)
 
  # Check that disk selection is kept on Next and Back
- disks = ["vda"]
- for disk in disks:
- s.select_disk(disk)
  i.next()
  i.back()
- for disk in disks:
+ for disk in ["vda", dev]:
  s.check_disk_selected(disk)
 
 class TestUtils():
@@ -324,7 +326,7 @@ class TestUtils():
  b.wait(lambda : self.disks_loaded(s, disks))
 
  for disk in disks:
- current_selection = s.get_disk_selected(disk)
+ current_selection = s.get_disk_selected(disk[0])
  if current_selection != disk[1]:
  s.select_disk(disk[0], disk[1], len(disks) == 1)
 
@@ -556,6 +558,7 @@ class TestStorageMountPoints(anacondalib.VirtInstallMachineCase, TestUtils):
  # Select first only vdb disk and verify that the partitioning request is correct
  i.open()
  i.next()
+
  s.rescan_disks()
 
  self.select_mountpoint(b, i, s, [(dev1, False), (dev2, True)])

ui/webui/test/helpers/storage.py

@@ -80,7 +80,11 @@ def check_disk_selected(self, disk, selected=True):
  self.browser.wait_not_present(f"#{id_prefix}-selector-form li.pf-v5-c-chip-group__list-item:contains({disk})")
 
  def get_disk_selected(self, disk):
- return self.browser.is_present(f"#{id_prefix}-selector-form li.pf-v5-c-chip-group__list-item:contains({disk})")
+ return (
+ self.browser.is_present(f"#{id_prefix}-selector-form li.pf-v5-c-chip-group__list-item:contains({disk})") or
+ (self.browser.is_present(f"#{id_prefix}-target-disk") and
+ disk in self.browser.text(f"#{id_prefix}-target-disk"))
+ )
 
  @log_step()
  def wait_no_disks(self):
@@ -169,6 +173,7 @@ def dbus_set_initialization_mode(self, value):
  @log_step(snapshots=True)
  def rescan_disks(self):
  self.browser.click(f"#{self._step}-rescan-disks")
+ self.browser.wait_not_present(f"#{self._step}-rescan-disks.pf-m-disabled")
 
  @log_step(snapshot_before=True)
  def check_disk_visible(self, disk, visible=True):
@@ -281,7 +286,6 @@ def add_basic_partitioning(self, target="vda", size="1GiB"):
  # Add a partition for "Use free space" scenario to be present
  self.machine.execute(f"sgdisk --new=0:0:+{size} /dev/{target}")
  self.rescan_disks()
- self.select_disk(target, True, True)
 
  # partitions_params expected structure: [("size", "file system" {, "other mkfs.fs flags"})]
  def partition_disk(self, disk, partitions_params):