webui: fix logic for when to re-create the partitioning

Now partitioning is marked for re-creation when device selection
changes and when the user re-scans the device tree.

The latter invalidates the partitioning indirectly, by re-setting the
selected devices.

This commit also simplifies the partitioning object update in state,
as a clean state update was needed to make the above feature work as
expected.

ui/webui/src/actions/storage-actions.js

@@ -85,12 +85,12 @@ export const getDiskSelectionAction = () => {
     };
 };
 
-export const getPartitioningDataAction = ({ requests, partitioning, updateOnly }) => {
+export const getPartitioningDataAction = ({ requests, partitioning }) => {
     return async (dispatch) => {
         const props = { path: partitioning };
         const convertRequests = reqs => reqs.map(request => Object.entries(request).reduce((acc, [key, value]) => ({ ...acc, [key]: value.v }), {}));
 
-        if (!updateOnly) {
+        if (!requests) {
             props.method = await getPartitioningMethod({ partitioning });
             if (props.method === "MANUAL") {
                 const reqs = await gatherRequests({ partitioning });

ui/webui/src/apis/storage.js

@@ -488,7 +488,7 @@ export const startEventMonitorStorage = ({ dispatch }) => {
                 if (args[0] === "org.fedoraproject.Anaconda.Modules.Storage.DiskSelection") {
                     dispatch(getDiskSelectionAction());
                 } else if (args[0] === "org.fedoraproject.Anaconda.Modules.Storage.Partitioning.Manual" && Object.hasOwn(args[1], "Requests")) {
-                    dispatch(getPartitioningDataAction({ requests: args[1].Requests.v, partitioning: path, updateOnly: true }));
+                    dispatch(getPartitioningDataAction({ requests: args[1].Requests.v, partitioning: path }));
                 } else if (args[0] === "org.fedoraproject.Anaconda.Modules.Storage" && Object.hasOwn(args[1], "CreatedPartitioning")) {
                     const last = args[1].CreatedPartitioning.v.length - 1;
                     dispatch(getPartitioningDataAction({ partitioning: args[1].CreatedPartitioning.v[last] }));

ui/webui/src/components/AnacondaWizard.jsx

@@ -15,7 +15,7 @@
  * along with This program; If not, see <http://www.gnu.org/licenses/>.
  */
 import cockpit from "cockpit";
-import React, { useState, useMemo } from "react";
+import React, { useEffect, useState, useMemo } from "react";
 
 import {
     ActionList,
@@ -56,6 +56,20 @@ export const AnacondaWizard = ({ dispatch, isBootIso, osRelease, storageData, lo
     const [isInProgress, setIsInProgress] = useState(false);
     const [storageEncryption, setStorageEncryption] = useState(getStorageEncryptionState());
     const [storageScenarioId, setStorageScenarioId] = useState(window.sessionStorage.getItem("storage-scenario-id") || getDefaultScenario().id);
+    const [reusePartitioning, setReusePartitioning] = useState(false);
+
+    const availableDevices = useMemo(() => {
+        return Object.keys(storageData.devices);
+    }, [storageData.devices]);
+
+    useEffect(() => {
+        /*
+         * When disk selection changes or the user re-scans the devices we need to re-create the partitioning.
+         * For Automatic partitioning we do it each time we go to review page,
+         * but for custom mount assignment we try to reuse the partitioning when possible.
+         */
+        setReusePartitioning(false);
+    }, [availableDevices]);
 
     const language = useMemo(() => {
         for (const l of Object.keys(localizationData.languages)) {
@@ -86,7 +100,7 @@ export const AnacondaWizard = ({ dispatch, isBootIso, osRelease, storageData, lo
             label: _("Disk configuration"),
             steps: [{
                 component: MountPointMapping,
-                data: { deviceData: storageData.devices, diskSelection: storageData.diskSelection, partitioningData: storageData.partitioning, dispatch },
+                data: { deviceData: storageData.devices, diskSelection: storageData.diskSelection, partitioningData: storageData.partitioning, dispatch, reusePartitioning, setReusePartitioning },
                 id: "mount-point-mapping",
                 label: _("Manual disk configuration"),
                 isHidden: storageScenarioId !== "mount-point-mapping"

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

@@ -41,7 +41,6 @@ import { ModalError } from "cockpit-components-inline-notification.jsx";
 import { getDevicesAction } from "../../actions/storage-actions.js";
 
 import {
-    createPartitioning,
     unlockDevice,
 } from "../../apis/storage.js";
 
@@ -111,9 +110,6 @@ const UnlockDialog = ({ lockedLUKSDevices, onClose, dispatch }) => {
                     dispatch(getDevicesAction());
 
                     if (res.every(r => r.value[0])) {
-                        // Also refresh the partitioning data which will now show the children
-                        // of the unlocked device.
-                        createPartitioning({ method: "MANUAL" });
                         onClose();
                     } else {
                         dialogErrorSet(_("Incorrect passphrase"));

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

@@ -453,18 +453,11 @@ const MountPointMappingContent = ({ deviceData, partitioningData, dispatch, idPr
     }
 };
 
-export const MountPointMapping = ({ deviceData, diskSelection, partitioningData, dispatch, idPrefix, setIsFormValid, onAddErrorNotification, stepNotification }) => {
-    const [creatingPartitioning, setCreatingPartitioning] = useState(true);
-
-    // If device selection changed since the last partitioning request redo the partitioning
-    const selectedDevices = diskSelection.selectedDisks;
-    const partitioningDevices = partitioningData?.requests?.map(r => r["device-spec"]) || [];
-    const canReusePartitioning = selectedDevices.length === partitioningDevices.length && selectedDevices.every(d => partitioningDevices.includes(d));
+export const MountPointMapping = ({ deviceData, diskSelection, partitioningData, dispatch, idPrefix, setIsFormValid, onAddErrorNotification, reusePartitioning, setReusePartitioning, stepNotification }) => {
+    const [usedPartitioning, setUsedPartitioning] = useState(partitioningData?.path);
 
     useEffect(() => {
-        if (canReusePartitioning) {
-            setCreatingPartitioning(false);
-        } else {
+        if (!reusePartitioning || partitioningData?.method !== "MANUAL") {
             /* Reset the bootloader drive before we schedule partitions
              * The bootloader drive is automatically set during the partitioning, so
              * make sure we always reset the previous value before we run another one,
@@ -473,11 +466,14 @@ export const MountPointMapping = ({ deviceData, diskSelection, partitioningData,
              */
             setBootloaderDrive({ drive: "" })
                     .then(() => createPartitioning({ method: "MANUAL" }))
-                    .then(() => setCreatingPartitioning(false));
+                    .then(path => {
+                        setUsedPartitioning(path[0]);
+                        setReusePartitioning(true);
+                    });
         }
-    }, [canReusePartitioning]);
+    }, [reusePartitioning, setReusePartitioning, partitioningData?.method, partitioningData?.path]);
 
-    if (creatingPartitioning || !partitioningData?.path || (partitioningData?.requests?.length || 0) < 1) {
+    if (!reusePartitioning || usedPartitioning !== partitioningData.path) {
         return <EmptyStatePanel loading />;
     }
 

ui/webui/src/reducer.js

@@ -73,7 +73,7 @@ export const storageReducer = (state = storageInitialState, action) => {
     } else if (action.type === "GET_DISK_SELECTION") {
         return { ...state, diskSelection: action.payload.diskSelection };
     } else if (action.type === "GET_PARTITIONING_DATA") {
-        return { ...state, partitioning: action.payload.partitioningData };
+        return { ...state, partitioning: { ...state.partitioning, ...action.payload.partitioningData } };
     } else {
         return state;
     }

ui/webui/test/check-storage

@@ -485,13 +485,30 @@ class TestStorageMountPoints(anacondalib.VirtInstallMachineCase):
         i.next()
 
         # verify review screen
-        disk = "vda"
-        r.check_disk(disk, "16.1 GB vda (0x1af4)")
+        r.check_disk(dev, "16.1 GB vda (0x1af4)")
 
-        r.check_disk_row(disk, 1, "vda1, 1.05 MB: biosboot")
-        r.check_disk_row(disk, 2, "vda2, 1.07 GB: format as ext4, /boot")
-        r.check_disk_row(disk, 3, "btrfstest, 10.7 GB: format as btrfs, /")
-        r.check_disk_row(disk, 4, "vda4, 4.29 GB: mount, /home")
+        r.check_disk_row(dev, 1, "vda1, 1.05 MB: biosboot")
+        r.check_disk_row(dev, 2, "vda2, 1.07 GB: format as ext4, /boot")
+        r.check_disk_row(dev, 3, "btrfstest, 10.7 GB: format as btrfs, /")
+        r.check_disk_row(dev, 4, "vda4, 4.29 GB: mount, /home")
+
+        applied_partitioning = s.dbus_get_applied_partitioning()
+
+        # When adding a new partition a new partitioning should be created
+        i.back(previous_page=i.steps.CUSTOM_MOUNT_POINT)
+        i.back()
+
+        m.execute(f"sgdisk --new=0:0:0 {disk}")
+        s.rescan_disks()
+        self.select_mountpoint(i, s, [(dev, True)])
+        self.check_row_device(1, "Select a device")
+        self.check_row_device(2, "Select a device")
+        self.select_row_device(1, f"{dev}2")
+        self.select_row_device(2, f"btrfs")
+
+        i.next()
+        new_applied_partitioning = s.dbus_get_applied_partitioning()
+        self.assertNotEqual(new_applied_partitioning, applied_partitioning)
 
     @nondestructive
     def testNoRootMountPoint(self):

ui/webui/test/helpers/installer.py

@@ -102,16 +102,18 @@ def check_next_disabled(self, disabled=True):
         self.browser.wait_visible(f"#installation-next-btn:not([aria-disabled={value}]")
 
     @log_step(snapshot_before=True)
-    def back(self, should_fail=False):
+    def back(self, should_fail=False, previous_page=""):
         current_page = self.get_current_page()
 
         self.browser.click("button:contains(Back)")
 
         if should_fail:
             self.wait_current_page(current_page)
         else:
-            prev = [k for k, v in self.steps._steps_jump.items() if current_page in v][0]
-            self.wait_current_page(prev)
+            if not previous_page:
+                previous_page = [k for k, v in self.steps._steps_jump.items() if current_page in v][0]
+
+            self.wait_current_page(previous_page)
 
     @log_step()
     def open(self, step="installation-language"):