Merge pull request #72 from KKoukiou/cockpit-storage

storage: Add new integration layer between anaconda and cockpit storage
rhinstaller · Feb 16, 2024 · ddd1dff · ddd1dff
2 parents 739140d + 33dfc8e
commit ddd1dff
Show file tree

Hide file tree

Showing 12 changed files with 768 additions and 89 deletions.
diff --git a/packaging/anaconda-webui.spec.in b/packaging/anaconda-webui.spec.in
@@ -13,7 +13,7 @@ BuildRequires:  gettext
 
 %global anacondacorever 40.20
 %global cockpitver 275
-%global cockpitstorver 310
+%global cockpitstorver 311
 
 Requires: cockpit-storaged >= %{cockpitstorver}
 Requires: cockpit-bridge >= %{cockpitver}

diff --git a/src/components/AnacondaWizard.jsx b/src/components/AnacondaWizard.jsx
@@ -65,6 +65,13 @@ export const AnacondaWizard = ({ dispatch, storageData, localizationData, runtim
     const osRelease = useContext(OsReleaseContext);
     const isBootIso = useContext(SystemTypeContext) === "BOOT_ISO";
     const selectedDisks = storageData.diskSelection.selectedDisks;
+    const [scenarioPartitioningMapping, setScenarioPartitioningMapping] = useState({});
+
+    useEffect(() => {
+        if (storageScenarioId && storageData.partitioning.path) {
+            setScenarioPartitioningMapping({ [storageScenarioId]: storageData.partitioning.path });
+        }
+    }, [storageData.partitioning.path, storageScenarioId]);
 
     const availableDevices = useMemo(() => {
         return Object.keys(storageData.devices);
@@ -108,6 +115,8 @@ export const AnacondaWizard = ({ dispatch, storageData, localizationData, runtim
                 deviceNames: storageData.deviceNames,
                 diskSelection: storageData.diskSelection,
                 dispatch,
+                partitioning: storageData.partitioning.path,
+                scenarioPartitioningMapping,
                 storageScenarioId,
                 setStorageScenarioId: (scenarioId) => {
                     window.sessionStorage.setItem("storage-scenario-id", scenarioId);
@@ -275,6 +284,7 @@ export const AnacondaWizard = ({ dispatch, storageData, localizationData, runtim
               deviceData={storageData.devices}
               dispatch={dispatch}
               onCritFail={onCritFail}
+              scenarioPartitioningMapping={scenarioPartitioningMapping}
               selectedDisks={selectedDisks}
               setShowStorage={setShowStorage}
               setStorageScenarioId={setStorageScenarioId}

diff --git a/src/components/review/ReviewConfiguration.jsx b/src/components/review/ReviewConfiguration.jsx
@@ -177,7 +177,14 @@ export const ReviewConfiguration = ({ deviceData, diskSelection, language, local
                     <DescriptionListDescription id={idPrefix + "-target-storage"}>
                         <Stack hasGutter>
                             {diskSelection.selectedDisks.map(disk => {
-                                return <DeviceRow key={disk} deviceData={deviceData} disk={disk} requests={storageScenarioId === "mount-point-mapping" ? requests : null} />;
+                                return (
+                                    <DeviceRow
+                                      key={disk}
+                                      deviceData={deviceData}
+                                      disk={disk}
+                                      requests={["mount-point-mapping", "use-configured-storage"].includes(storageScenarioId) ? requests : null}
+                                    />
+                                );
                             })}
                         </Stack>
                     </DescriptionListDescription>