webui: mount point assignment support

Support a new storage configuration method where a user first has to
manually partition and create file systems using the tools on the
installation image.
When selecting the custom mount point option the user can now select
which partition to map to mount point either from a well known list of
Mount points or a manually created one.

Co-authored-by: Katerina Koukiou <kkoukiou@redhat.com>

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

@@ -18,12 +18,14 @@
 import cockpit from "cockpit";
 
 import {
+ gatherRequests,
  getAllDiskSelection,
  getDeviceData,
  getDevices,
  getDiskFreeSpace,
  getDiskTotalSpace,
  getFormatData,
+ getPartitioningMethod,
  getUsableDisks,
 } from "../apis/storage.js";
 
@@ -82,3 +84,20 @@ export const getDiskSelectionAction = () => {
  });
  };
 };
+
+export const getPartitioningDataAction = ({ requests, partitioning, updateOnly }) => {
+ return async function fetchUserThunk (dispatch) {
+ const reqs = updateOnly ? [requests] : await gatherRequests({ partitioning });
+ const method = updateOnly ? null : await getPartitioningMethod({ partitioning });
+ const props = { path: partitioning };
+
+ if (!updateOnly) {
+ props.method = method;
+ }
+
+ return dispatch({
+ type: "GET_PARTITIONING_DATA",
+ payload: { ...props, requests: reqs?.[0].map(request => Object.entries(request).reduce((acc, [key, value]) => ({ ...acc, [key]: value.v }), {})) }
+ });
+ };
+};

ui/webui/src/apis/storage.js

@@ -16,7 +16,10 @@
  */
 import cockpit from "cockpit";
 
-import { getDiskSelectionAction } from "../actions/storage-actions.js";
+import {
+ getDiskSelectionAction,
+ getPartitioningDataAction
+} from "../actions/storage-actions.js";
 
 export class StorageClient {
  constructor (address) {
@@ -62,6 +65,22 @@ export const createPartitioning = ({ method }) => {
  );
 };
 
+/**
+ * @param {string} method A partitioning method
+ *
+ * @returns {Promise} Resolves the DBus path to the partitioning
+ */
+export const findPartitioning = ({ partitioning, method }) => {
+ if (partitioning?.method !== method) {
+ return createPartitioning({ method });
+ } else {
+ return new Promise((resolve) => {
+ // Return as list to mimmick createPartitioning
+ resolve([partitioning[partitioning.length - 1]]);
+ });
+ }
+};
+
 /**
  * @returns {Promise} Resolves all properties of DiskSelection interface
  */
@@ -222,6 +241,26 @@ export const getPartitioningRequest = ({ partitioning }) => {
  );
 };
 
+/**
+ * @param {string} partitioning DBus path to a partitioning
+ *
+ * @returns {Promise} The partitioning method
+ */
+export const getPartitioningMethod = ({ partitioning }) => {
+ return (
+ new StorageClient().client.call(
+ partitioning,
+ "org.freedesktop.DBus.Properties",
+ "Get",
+ [
+ "org.fedoraproject.Anaconda.Modules.Storage.Partitioning",
+ "PartitioningMethod",
+ ]
+ )
+ .then(res => res[0].v)
+ );
+};
+
 /**
  * @returns {Promise} The applied partitioning
  */
@@ -401,6 +440,37 @@ export const setSelectedDisks = ({ drives }) => {
  );
 };
 
+/*
+ * @param {string} partitioning DBus path to a partitioning
+ * @param {Array.<Object>} requests An array of request objects
+ */
+export const setManualPartitioningRequests = ({ partitioning, requests }) => {
+ return new StorageClient().client.call(
+ partitioning,
+ "org.freedesktop.DBus.Properties",
+ "Set",
+ [
+ "org.fedoraproject.Anaconda.Modules.Storage.Partitioning.Manual",
+ "Requests",
+ cockpit.variant("aa{sv}", requests)
+ ]
+ );
+};
+
+/**
+ * @param {string} partitioning DBus path to a partitioning
+ *
+ * @returns {Promise} The gathered requests for manual partitioning
+ */
+export const gatherRequests = ({ partitioning }) => {
+ return new StorageClient().client.call(
+ partitioning,
+ "org.fedoraproject.Anaconda.Modules.Storage.Partitioning.Manual",
+ "GatherRequests",
+ []
+ );
+};
+
 export const startEventMonitorStorage = ({ dispatch }) => {
  return new StorageClient().client.subscribe(
  { },
@@ -409,10 +479,31 @@ export const startEventMonitorStorage = ({ dispatch }) => {
  case "PropertiesChanged":
  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 }));
+ } else if (args[0] === "org.fedoraproject.Anaconda.Modules.Storage" && Object.hasOwn(args[1], "CreatedPartitioning")) {
+ dispatch(getPartitioningDataAction({ partitioning: args[1].CreatedPartitioning.v[args[1].CreatedPartitioning.v.length - 1] }));
  }
  break;
  default:
  console.debug(`Unhandled signal on ${path}: ${iface}.${signal}`);
  }
  });
 };
+
+export const initDataStorage = ({ dispatch }) => {
+ return new StorageClient().client.call(
+ "/org/fedoraproject/Anaconda/Modules/Storage",
+ "org.freedesktop.DBus.Properties",
+ "Get",
+ [
+ "org.fedoraproject.Anaconda.Modules.Storage",
+ "CreatedPartitioning",
+ ]
+ )
+ .then(([res]) => {
+ if (res.v.length !== 0) {
+ return Promise.all(res.v.map(path => dispatch(getPartitioningDataAction({ partitioning: path }))));
+ }
+ });
+};

ui/webui/src/components/AnacondaWizard.jsx

@@ -34,6 +34,7 @@ import {
 
 import { InstallationDestination, applyDefaultStorage } from "./storage/InstallationDestination.jsx";
 import { StorageConfiguration, getScenario, getDefaultScenario } from "./storage/StorageConfiguration.jsx";
+import { CustomMountPoint, applyMountPointStorage } from "./storage/CustomMountPoint.jsx";
 import { DiskEncryption, StorageEncryptionState } from "./storage/DiskEncryption.jsx";
 import { InstallationLanguage } from "./localization/InstallationLanguage.jsx";
 import { InstallationProgress } from "./installation/InstallationProgress.jsx";
@@ -53,6 +54,8 @@ export const AnacondaWizard = ({ dispatch, storageData, localizationData, onAddE
  const [storageEncryption, setStorageEncryption] = useState(new StorageEncryptionState());
  const [showPassphraseScreen, setShowPassphraseScreen] = useState(false);
  const [storageScenarioId, setStorageScenarioId] = useState(window.sessionStorage.getItem("storage-scenario-id") || getDefaultScenario().id);
+ const currentPartitioningIndex = storageData.partitioning.length - 1;
+ console.info({ storageData });
 
  // On live media rebooting the system will actually shut it off
  const isBootIso = conf["Installation System"].type === "BOOT_ISO";
@@ -75,18 +78,26 @@ export const AnacondaWizard = ({ dispatch, storageData, localizationData, onAddE
  label: _("Storage devices")
  }, {
  component: StorageConfiguration,
- data: { selectedDisks: storageData.diskSelection.selectedDisks },
+ data: { deviceData: storageData.devices, diskSelection: storageData.diskSelection },
  id: "storage-configuration",
  label: _("Storage configuration")
+ }, {
+ component: CustomMountPoint,
+ data: { deviceData: storageData.devices, partitioningData: currentPartitioningIndex !== -1 ? storageData.partitioning[currentPartitioningIndex] : null, dispatch },
+ id: "custom-mountpoint",
+ label: _("Custom mount point"),
+ isHidden: storageScenarioId !== "custom-mount-point"
+
  }, {
  component: DiskEncryption,
  id: "disk-encryption",
- label: _("Disk encryption")
+ label: _("Disk encryption"),
+ isHidden: storageScenarioId === "custom-mount-point"
  }]
  },
  {
  component: ReviewConfiguration,
- data: { deviceData: storageData.devices, diskSelection: storageData.diskSelection },
+ data: { deviceData: storageData.devices, diskSelection: storageData.diskSelection, requests: currentPartitioningIndex !== -1 ? storageData.partitioning[currentPartitioningIndex].requests : null },
  id: "installation-review",
  label: _("Review and install"),
  },
@@ -101,7 +112,9 @@ export const AnacondaWizard = ({ dispatch, storageData, localizationData, onAddE
  for (const step of steps) {
  if (step.steps) {
  for (const childStep of step.steps) {
- stepIds.push(childStep.id);
+ if (childStep?.isHidden !== true) {
+ stepIds.push(childStep.id);
+ }
  }
  } else {
  stepIds.push(step.id);
@@ -126,7 +139,7 @@ export const AnacondaWizard = ({ dispatch, storageData, localizationData, onAddE
  };
 
  const createSteps = (stepsOrder) => {
- const steps = stepsOrder.map((s, idx) => {
+ const steps = stepsOrder.filter(s => !s.isHidden).map(s => {
  let step = ({
  id: s.id,
  name: s.label,
@@ -181,6 +194,7 @@ export const AnacondaWizard = ({ dispatch, storageData, localizationData, onAddE
  id="installation-wizard"
  footer={<Footer
  isFormValid={isFormValid}
+ partitioning={storageData.partitioning?.[currentPartitioningIndex]}
  setIsFormValid={setIsFormValid}
  setStepNotification={setStepNotification}
  isInProgress={isInProgress}
@@ -209,6 +223,7 @@ const Footer = ({
  setIsFormValid,
  setStepNotification,
  isInProgress,
+ partitioning,
  setIsInProgress,
  storageEncryption,
  showPassphraseScreen,
@@ -249,6 +264,25 @@ const Footer = ({
  });
  } else if (activeStep.id === "installation-review") {
  setNextWaitsConfirmation(true);
+ } else if (activeStep.id === "custom-mountpoint") {
+ setIsInProgress(true);
+
+ applyMountPointStorage({
+ partitioning,
+ onFail: ex => {
+ console.error(ex);
+ setIsInProgress(false);
+ setStepNotification({ step: activeStep.id, ...ex });
+ },
+ onSuccess: () => {
+ onNext();
+
+ // Reset the state after the onNext call. Otherwise,
+ // React will try to render the current step again.
+ setIsInProgress(false);
+ setStepNotification();
+ },
+ });
  } else {
  onNext();
  }

ui/webui/src/components/app.jsx

@@ -32,7 +32,7 @@ import { HelpDrawer } from "./HelpDrawer.jsx";
 
 import { BossClient } from "../apis/boss.js";
 import { LocalizationClient } from "../apis/localization.js";
-import { StorageClient, startEventMonitorStorage } from "../apis/storage.js";
+import { StorageClient, initDataStorage, startEventMonitorStorage } from "../apis/storage.js";
 import { PayloadsClient } from "../apis/payloads";
 
 import { readBuildstamp, getIsFinal } from "../helpers/betanag.js";
@@ -62,6 +62,7 @@ export const Application = () => {
 
  setAddress(address);
 
+ initDataStorage({ dispatch });
  startEventMonitorStorage({ dispatch });
  });