Updated how folders are created and can be created in current selected folder or use a droplist to select target for new folder
This commit is contained in:
1 parent
db6f03c3b2
commit
c963558fff
1 file changed
+162
-15
+162
-15
@@ -732,6 +732,44 @@ impl std::fmt::Display for FolderChoice {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn root_folder_choice() -> FolderChoice {
|
||||||
|
FolderChoice {
|
||||||
|
index: ROOT_FOLDER_INDEX,
|
||||||
|
name: "Root".to_owned(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Name and destination of a folder being created.
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
struct FolderDraft {
|
||||||
|
name: String,
|
||||||
|
parent: FolderChoice,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl FolderDraft {
|
||||||
|
fn new(parent: FolderChoice) -> Self {
|
||||||
|
Self {
|
||||||
|
name: String::new(),
|
||||||
|
parent,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Every folder, plus the root, for choosing where a new folder goes.
|
||||||
|
fn folder_dialog_choices(folders: &[ProfileFolder]) -> Vec<FolderChoice> {
|
||||||
|
std::iter::once(root_folder_choice())
|
||||||
|
.chain(
|
||||||
|
folders
|
||||||
|
.iter()
|
||||||
|
.enumerate()
|
||||||
|
.map(|(index, folder)| FolderChoice {
|
||||||
|
index,
|
||||||
|
name: folder.path.clone(),
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
/// Which profile field a path picker is filling.
|
/// Which profile field a path picker is filling.
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
enum PickerTarget {
|
enum PickerTarget {
|
||||||
@@ -1381,7 +1419,7 @@ struct Moorly {
|
|||||||
confirm_purge_trash: bool,
|
confirm_purge_trash: bool,
|
||||||
hovered_folder: Option<usize>,
|
hovered_folder: Option<usize>,
|
||||||
add_menu_open: bool,
|
add_menu_open: bool,
|
||||||
folder_dialog: Option<String>,
|
folder_dialog: Option<FolderDraft>,
|
||||||
folder_rename: Option<(usize, String)>,
|
folder_rename: Option<(usize, String)>,
|
||||||
folder_menu: Option<(usize, Point)>,
|
folder_menu: Option<(usize, Point)>,
|
||||||
profile_dialog: Option<ProfileDraft>,
|
profile_dialog: Option<ProfileDraft>,
|
||||||
@@ -3702,6 +3740,7 @@ enum Message {
|
|||||||
CancelProfile,
|
CancelProfile,
|
||||||
OpenFolderDialog,
|
OpenFolderDialog,
|
||||||
FolderNameChanged(String),
|
FolderNameChanged(String),
|
||||||
|
FolderParentSelected(FolderChoice),
|
||||||
ConfirmFolder,
|
ConfirmFolder,
|
||||||
CancelFolder,
|
CancelFolder,
|
||||||
OpenFolderMenu(window::Id, usize),
|
OpenFolderMenu(window::Id, usize),
|
||||||
@@ -4643,26 +4682,56 @@ fn update(state: &mut Moorly, message: Message) -> Task<Message> {
|
|||||||
Message::CancelProfile => state.profile_dialog = None,
|
Message::CancelProfile => state.profile_dialog = None,
|
||||||
Message::OpenFolderDialog => {
|
Message::OpenFolderDialog => {
|
||||||
state.add_menu_open = false;
|
state.add_menu_open = false;
|
||||||
state.folder_dialog = Some(String::new());
|
let parent_index = match state.selected {
|
||||||
|
Some(Selection::Folder(index)) => Some(index),
|
||||||
|
Some(Selection::Profile { folder, .. }) => Some(folder),
|
||||||
|
None => None,
|
||||||
|
};
|
||||||
|
let parent = parent_index
|
||||||
|
.and_then(|index| {
|
||||||
|
state.profile_folders.get(index).map(|folder| FolderChoice {
|
||||||
|
index,
|
||||||
|
name: folder.path.clone(),
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.unwrap_or_else(root_folder_choice);
|
||||||
|
state.folder_dialog = Some(FolderDraft::new(parent));
|
||||||
return operation::focus(FOLDER_NAME_INPUT);
|
return operation::focus(FOLDER_NAME_INPUT);
|
||||||
}
|
}
|
||||||
Message::FolderNameChanged(value) => {
|
Message::FolderNameChanged(value) => {
|
||||||
if let Some(draft) = state.folder_dialog.as_mut() {
|
if let Some(draft) = state.folder_dialog.as_mut() {
|
||||||
*draft = value;
|
draft.name = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Message::FolderParentSelected(parent) => {
|
||||||
|
if let Some(draft) = state.folder_dialog.as_mut() {
|
||||||
|
draft.parent = parent;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Message::ConfirmFolder => {
|
Message::ConfirmFolder => {
|
||||||
let Some(name) = state
|
let Some(draft) = state.folder_dialog.clone() else {
|
||||||
.folder_dialog
|
|
||||||
.as_deref()
|
|
||||||
.map(str::trim)
|
|
||||||
.filter(|name| !name.is_empty())
|
|
||||||
.map(str::to_owned)
|
|
||||||
else {
|
|
||||||
return Task::none();
|
return Task::none();
|
||||||
};
|
};
|
||||||
|
let name = draft.name.trim();
|
||||||
|
|
||||||
let path = normalize_folder_path(&name);
|
if name.is_empty() {
|
||||||
|
return Task::none();
|
||||||
|
}
|
||||||
|
|
||||||
|
let parent_path = if draft.parent.index == ROOT_FOLDER_INDEX {
|
||||||
|
""
|
||||||
|
} else {
|
||||||
|
state
|
||||||
|
.profile_folders
|
||||||
|
.get(draft.parent.index)
|
||||||
|
.map(|folder| folder.path.as_str())
|
||||||
|
.unwrap_or("")
|
||||||
|
};
|
||||||
|
let path = normalize_folder_path(&if parent_path.is_empty() {
|
||||||
|
name.to_owned()
|
||||||
|
} else {
|
||||||
|
format!("{parent_path}/{name}")
|
||||||
|
});
|
||||||
let index = ensure_folder(&mut state.profile_folders, &path);
|
let index = ensure_folder(&mut state.profile_folders, &path);
|
||||||
state.checked.clear();
|
state.checked.clear();
|
||||||
state.selected = Some(Selection::Folder(index));
|
state.selected = Some(Selection::Folder(index));
|
||||||
@@ -6310,16 +6379,29 @@ fn profiles_panel(state: &Moorly, window: window::Id, show_add: bool) -> Element
|
|||||||
}
|
}
|
||||||
|
|
||||||
if let Some(draft) = &state.folder_dialog {
|
if let Some(draft) = &state.folder_dialog {
|
||||||
|
let choices = folder_dialog_choices(&state.profile_folders);
|
||||||
|
let selected = choices
|
||||||
|
.iter()
|
||||||
|
.find(|choice| choice.index == draft.parent.index)
|
||||||
|
.cloned()
|
||||||
|
.unwrap_or_else(|| draft.parent.clone());
|
||||||
|
|
||||||
let dialog = container(
|
let dialog = container(
|
||||||
column![
|
column![
|
||||||
text("New folder").size(14),
|
text("New folder").size(14),
|
||||||
text_input("Folder name", draft)
|
text_input("Folder name", &draft.name)
|
||||||
.id(FOLDER_NAME_INPUT)
|
.id(FOLDER_NAME_INPUT)
|
||||||
.on_input(Message::FolderNameChanged)
|
.on_input(Message::FolderNameChanged)
|
||||||
.on_submit(Message::ConfirmFolder)
|
.on_submit(Message::ConfirmFolder)
|
||||||
.padding(6)
|
.padding(6)
|
||||||
.style(theme::filter_field)
|
.style(theme::filter_field)
|
||||||
.width(Length::Fill),
|
.width(Length::Fill),
|
||||||
|
column![
|
||||||
|
text("Parent folder").size(12),
|
||||||
|
pick_list(choices, Some(selected), Message::FolderParentSelected)
|
||||||
|
.width(Length::Fill),
|
||||||
|
]
|
||||||
|
.spacing(4),
|
||||||
text("Use / to nest folders, e.g. Work/Production").size(11),
|
text("Use / to nest folders, e.g. Work/Production").size(11),
|
||||||
row![
|
row![
|
||||||
space::horizontal(),
|
space::horizontal(),
|
||||||
@@ -6328,7 +6410,7 @@ fn profiles_panel(state: &Moorly, window: window::Id, show_add: bool) -> Element
|
|||||||
.style(theme::danger_option),
|
.style(theme::danger_option),
|
||||||
button("Add")
|
button("Add")
|
||||||
.on_press_maybe(
|
.on_press_maybe(
|
||||||
(!draft.trim().is_empty()).then_some(Message::ConfirmFolder)
|
(!draft.name.trim().is_empty()).then_some(Message::ConfirmFolder)
|
||||||
)
|
)
|
||||||
.style(theme::positive_option),
|
.style(theme::positive_option),
|
||||||
]
|
]
|
||||||
@@ -7145,7 +7227,7 @@ fn profile_folder_row<'a>(
|
|||||||
.align_y(Alignment::Center)
|
.align_y(Alignment::Center)
|
||||||
.width(Length::Fill);
|
.width(Length::Fill);
|
||||||
|
|
||||||
if is_selected || hovered == Some(index) {
|
if show_checks && (is_selected || hovered == Some(index)) {
|
||||||
heading_content = heading_content.push(
|
heading_content = heading_content.push(
|
||||||
button(text("⋮").size(14))
|
button(text("⋮").size(14))
|
||||||
.on_press(Message::Ignore)
|
.on_press(Message::Ignore)
|
||||||
@@ -9215,7 +9297,17 @@ mod tests {
|
|||||||
assert!(state.add_menu_open);
|
assert!(state.add_menu_open);
|
||||||
|
|
||||||
let _ = update(&mut state, Message::OpenFolderDialog);
|
let _ = update(&mut state, Message::OpenFolderDialog);
|
||||||
assert_eq!(state.folder_dialog.as_deref(), Some(""));
|
assert_eq!(
|
||||||
|
state
|
||||||
|
.folder_dialog
|
||||||
|
.as_ref()
|
||||||
|
.map(|draft| draft.name.as_str()),
|
||||||
|
Some("")
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
state.folder_dialog.as_ref().map(|draft| draft.parent.index),
|
||||||
|
Some(super::ROOT_FOLDER_INDEX)
|
||||||
|
);
|
||||||
assert!(!state.add_menu_open);
|
assert!(!state.add_menu_open);
|
||||||
|
|
||||||
let _ = update(&mut state, Message::FolderNameChanged("Work".to_owned()));
|
let _ = update(&mut state, Message::FolderNameChanged("Work".to_owned()));
|
||||||
@@ -9479,6 +9571,61 @@ mod tests {
|
|||||||
assert_eq!(state.selected, Some(super::Selection::Folder(1)));
|
assert_eq!(state.selected, Some(super::Selection::Folder(1)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn new_folder_defaults_to_the_selected_folder() {
|
||||||
|
let mut state = state();
|
||||||
|
let _ = update(&mut state, Message::OpenFolderDialog);
|
||||||
|
let _ = update(&mut state, Message::FolderNameChanged("Work".to_owned()));
|
||||||
|
let _ = update(&mut state, Message::ConfirmFolder);
|
||||||
|
|
||||||
|
let _ = update(&mut state, Message::OpenFolderDialog);
|
||||||
|
let parent = state.folder_dialog.as_ref().unwrap().parent.clone();
|
||||||
|
assert_eq!(parent.name, "Work");
|
||||||
|
|
||||||
|
let _ = update(
|
||||||
|
&mut state,
|
||||||
|
Message::FolderNameChanged("Production".to_owned()),
|
||||||
|
);
|
||||||
|
let _ = update(&mut state, Message::ConfirmFolder);
|
||||||
|
assert!(
|
||||||
|
state
|
||||||
|
.profile_folders
|
||||||
|
.iter()
|
||||||
|
.any(|folder| folder.path == "Work/Production")
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn new_folder_defaults_to_the_selected_profiles_folder() {
|
||||||
|
let mut state = state();
|
||||||
|
let index = super::ensure_folder(&mut state.profile_folders, "Work");
|
||||||
|
state.profile_folders[index]
|
||||||
|
.profiles
|
||||||
|
.push(profile("Server"));
|
||||||
|
state.selected = Some(super::Selection::Profile {
|
||||||
|
folder: index,
|
||||||
|
profile: 0,
|
||||||
|
});
|
||||||
|
|
||||||
|
let _ = update(&mut state, Message::OpenFolderDialog);
|
||||||
|
let parent = state.folder_dialog.as_ref().unwrap().parent.clone();
|
||||||
|
assert_eq!(parent.name, "Work");
|
||||||
|
|
||||||
|
// The drop-down can still override the default destination.
|
||||||
|
let _ = update(
|
||||||
|
&mut state,
|
||||||
|
Message::FolderParentSelected(super::root_folder_choice()),
|
||||||
|
);
|
||||||
|
let _ = update(&mut state, Message::FolderNameChanged("Top".to_owned()));
|
||||||
|
let _ = update(&mut state, Message::ConfirmFolder);
|
||||||
|
assert!(
|
||||||
|
state
|
||||||
|
.profile_folders
|
||||||
|
.iter()
|
||||||
|
.any(|folder| folder.path == "Top")
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn checkboxes_toggle_and_clear() {
|
fn checkboxes_toggle_and_clear() {
|
||||||
let mut state = state();
|
let mut state = state();
|
||||||
|
|||||||
Reference in new issue
Block a user