particle-os/debian-image-builder-frontend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WizardV2: Filesystem partitioning suffix

Browse source
This commit is contained in:
Ondrej Ezr 2024-04-08 22:01:00 +02:00 • committed by Klara Simickova
parent 9cddbdfa38
commit 3c3ca3537a
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Components/CreateImageWizardV2/steps/FileSystem/FileSystemConfiguration.tsx
View file

@ -179,12 +179,17 @@ type RowPropTypes = {
onDragStart?: (event: React.DragEvent<HTMLTableRowElement>) => void;
};
const normalizeSuffix = (rawSuffix: string) => {
const suffix = rawSuffix.replace(/^\/+/g, '')
return suffix.length > 0 ? '/' + suffix : ''
};
const getPrefix = (mountpoint: string) => {
return mountpoint.split('/')[1] ? '/' + mountpoint.split('/')[1] : '/';
};
const getSuffix = (mountpoint: string) => {
const prefix = getPrefix(mountpoint);
return mountpoint.substring(prefix.length);
return normalizeSuffix(mountpoint.substring(prefix.length));
};
export const Row = ({
@ -284,7 +289,7 @@ const MountpointPrefix = ({ partition }: MountpointPrefixPropTypes) => {
const onSelect = (event: React.MouseEvent, selection: string) => {
setIsOpen(false);
const mountpoint = selection + suffix;
const mountpoint = selection + (suffix.length > 0 ? '/' + suffix : '');
dispatch(
changePartitionMountpoint({ id: partition.id, mountpoint: mountpoint })
);
@ -319,8 +324,8 @@ const MountpointSuffix = ({ partition }: MountpointSuffixPropTypes) => {
<TextInput
value={suffix}
type="text"
onChange={(event: React.FormEvent, suffix) => {
const mountpoint = prefix + suffix;
onChange={(event: React.FormEvent, newValue) => {
const mountpoint = prefix + normalizeSuffix(newValue);
dispatch(
changePartitionMountpoint({
id: partition.id,