Remove send_request keybinding

CHANGELOG.md

@@ -6,6 +6,9 @@
 
 - All variants of the `Chain.source` field are now maps
   - This is to support the next request auto-execution feature, as well as future proofing for additional chain configuration
+- Remove `send_request` keybinding
+  - The `submit` keybinding is now used to send requests from all panes (except the profile pane)
+  - This is only a breaking change if you have `send_request` remapped in your config file
 
 Follow this mapping to update:
 

docs/src/api/configuration/input_bindings.md

@@ -53,7 +53,6 @@ input_bindings:
 | `end`                 | `end`                       |
 | `submit`              | `enter`                     |
 | `cancel`              | `esc`                       |
-| `send_request`        | `f2`                        |
 | `search`              | `/`                         |
 | `reload_collection`   | `f5`                        |
 | `fullscreen`          | `f`                         |

src/tui/input.rs

@@ -120,7 +120,6 @@ impl Default for InputEngine {
                 Action::OpenActions => KeyCode::Char('x').into(),
                 Action::OpenHelp => KeyCode::Char('?').into(),
                 Action::Fullscreen => KeyCode::Char('f').into(),
-                Action::SendRequest => KeyCode::F(2).into(),
                 Action::ReloadCollection => KeyCode::F(5).into(),
                 Action::Search => KeyCode::Char('/').into(),
                 Action::PreviousPane => KeyCode::BackTab.into(),
@@ -195,13 +194,11 @@ pub enum Action {
     Home,
     End,
 
-    /// Do a thing. E.g. select an item in a list
+    /// Do a thing, e.g. submit a modal. Alternatively, send a request
+    #[display("Send Request/Submit")]
     Submit,
     /// Close the current modal/dialog/etc.
     Cancel,
-    /// Send the active request from *any* context
-    #[display("Send Request")]
-    SendRequest,
     /// Start a search/filter operation
     #[display("Search/Filter")]
     Search,

src/tui/view/component/primary.rs

@@ -333,7 +333,7 @@ impl EventHandler for PrimaryView {
                 Action::NextPane if self.fullscreen_mode.is_none() => {
                     self.selected_pane.next(context);
                 }
-                Action::SendRequest => {
+                Action::Submit => {
                     // Send a request from anywhere
                     context.queue_event(Event::HttpSendRequest);
                 }

src/tui/view/component/profile_list.rs

@@ -6,7 +6,7 @@ use crate::{
         view::{
             common::{list::List, Pane},
             draw::{Draw, Generate},
-            event::{Event, EventHandler, UpdateContext},
+            event::{Event, EventHandler, Update, UpdateContext},
             state::{
                 persistence::{Persistable, Persistent, PersistentKey},
                 select::{Dynamic, SelectState},
@@ -53,6 +53,19 @@ impl ProfileListPane {
 }
 
 impl EventHandler for ProfileListPane {
+    fn update(&mut self, _context: &mut UpdateContext, event: Event) -> Update {
+        match event {
+            // Sending requests from the profile pane is unintuitive, so eat
+            // submission events here
+            Event::Input {
+                action: Some(Action::Submit),
+                ..
+            } => Update::Consumed,
+
+            _ => Update::Propagate(event),
+        }
+    }
+
     fn children(&mut self) -> Vec<Component<&mut dyn EventHandler>> {
         vec![self.profiles.as_child()]
     }

src/tui/view/component/recipe_list.rs

@@ -35,19 +35,10 @@ impl RecipeListPane {
             context.queue_event(Event::HttpLoadRequest);
         }
 
-        // Trigger a request on submit
-        fn on_submit(context: &mut UpdateContext, _: &mut Recipe) {
-            // Parent has to be responsible for actually sending the request
-            // because it also needs access to the profile list state
-            context.queue_event(Event::HttpSendRequest);
-        }
-
         Self {
             recipes: Persistent::new(
                 PersistentKey::RecipeId,
-                SelectState::new(recipes)
-                    .on_select(on_select)
-                    .on_submit(on_submit),
+                SelectState::new(recipes).on_select(on_select),
             )
             .into(),
         }