feat: rendering request headers onscreen

wllfaria · Jun 5, 2024 · dbfa1a3 · dbfa1a3
1 parent 552f062
commit dbfa1a3
Show file tree

Hide file tree

Showing 88 changed files with 265 additions and 54 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
diff --git a/.github/workflows/general.yml b/.github/workflows/general.yml
diff --git a/.gitignore b/.gitignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
diff --git a/Justfile b/Justfile
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/TODO.md b/TODO.md
diff --git a/cliff.toml b/cliff.toml
diff --git a/extra/error-request.gif b/extra/error-request.gif
diff --git a/extra/new-request.gif b/extra/new-request.gif
diff --git a/extra/preview.gif b/extra/preview.gif
diff --git a/extra/tapes/create_request.tape b/extra/tapes/create_request.tape
@@ -0,0 +1,47 @@
+Output extra/new-request.gif
+Hide
+    Set Shell zsh
+
+    Set Theme { "name": "Kanagawa", "cursor": "#DCD7BA", "selection": "#2A2A37", "background": "#181616", "foreground": "#DCD7BA", "black": "#1F1F28", "blue": "#658594", "cyan": "#9CABCA", "green": "#76946A", "magenta": "#957FB8", "red": "#E82424", "white": "#DCD7BA", "yellow": "#FF9E3B", "brightBlack": "#2A2A37", "brightBlue": "#7FB4CA", "brightCyan": "#A3D4D5", "brightGreen": "#98BB6C", "brightMagenta": "#D27E99", "brightRed": "#FF5D62", "brightWhite": "#DCD7BA", "brightYellow": "#E6C384" }
+
+    Set FontSize 12
+    Set Width 1200
+    Set Height 600
+
+    Set Padding 0
+    Set FontFamily "JetBrains Mono"
+
+    Set WindowBar Colorful
+    Set WindowBarSize 50
+
+    # Set Theme "Rose Pine"
+    Type "cargo run -q -- --dry-run"
+    Enter
+    # enter the editor
+    Sleep 3s
+    Enter
+    Sleep 3s
+Show
+Sleep 2s
+# select sidebar
+Enter
+Sleep 200ms
+# enter form
+Type "n"
+Sleep 1s
+Type@100ms "My awesome request"
+Sleep 1s
+Tab
+Sleep 100ms
+Tab
+Sleep 100ms
+Tab
+Sleep 100ms
+Enter
+Sleep 1s
+Tab
+Sleep 100ms
+Tab
+Sleep 100ms
+Enter
+Sleep 3s
diff --git a/extra/tapes/error_request.tape b/extra/tapes/error_request.tape
@@ -0,0 +1,97 @@
+Output extra/error-request.gif
+Hide
+    Set Shell zsh
+
+    Set Theme { "name": "Kanagawa", "cursor": "#DCD7BA", "selection": "#2A2A37", "background": "#181616", "foreground": "#DCD7BA", "black": "#1F1F28", "blue": "#658594", "cyan": "#9CABCA", "green": "#76946A", "magenta": "#957FB8", "red": "#E82424", "white": "#DCD7BA", "yellow": "#FF9E3B", "brightBlack": "#2A2A37", "brightBlue": "#7FB4CA", "brightCyan": "#A3D4D5", "brightGreen": "#98BB6C", "brightMagenta": "#D27E99", "brightRed": "#FF5D62", "brightWhite": "#DCD7BA", "brightYellow": "#E6C384" }
+
+    Set FontSize 12
+    Set Width 1200
+    Set Height 600
+
+    Set Padding 0
+    Set FontFamily "JetBrains Mono"
+
+    Set WindowBar Colorful
+    Set WindowBarSize 50
+
+    Type "cargo run -q -- --dry-run"
+    Enter
+    # enter the editor
+    Sleep 3s
+    Enter
+    Sleep 3s
+Show
+Sleep 2s
+# go to editor tab
+Tab
+Sleep 200ms
+Tab
+Sleep 1s
+# Enter the editor
+Enter
+# Edit the message to true
+Type@100ms "jj$i"
+Sleep 300ms
+Backspace
+Sleep 100ms
+Backspace
+Sleep 100ms
+Backspace
+Sleep 100ms
+Backspace
+Sleep 100ms
+Backspace
+Sleep 100ms
+Type@100ms "true"
+Escape
+Sleep 100ms
+Escape
+# go to the headers
+Sleep 1s
+Tab
+Sleep 200ms
+# go to request uri
+Tab
+Sleep 200ms
+Tab
+Sleep 1s
+# focus and send a request
+Enter
+Sleep 0.5s
+Sleep 100ms
+Backspace
+Sleep 100ms
+Backspace
+Sleep 100ms
+Backspace
+Sleep 100ms
+Backspace
+Sleep 100ms
+Backspace
+Sleep 100ms
+Backspace
+Sleep 100ms
+Backspace
+Sleep 100ms
+Backspace
+Sleep 100ms
+Backspace
+Sleep 100ms
+Backspace
+Sleep 100ms
+Backspace
+Sleep 1s
+Enter
+Sleep 0.5s
+Escape
+# go to the response
+Tab
+Sleep 200ms
+Tab
+Sleep 200ms
+Enter
+Sleep 1s
+Tab
+Sleep 1s
+Tab
+Sleep 3s
diff --git a/extra/tapes/preview.tape b/extra/tapes/preview.tape
@@ -14,57 +14,63 @@ Hide
     Set WindowBar Colorful
     Set WindowBarSize 50
 
-    Type "cargo run -q"
+    Type "cargo run -q -- --dry-run"
     Enter
+    # enter the editor
     Sleep 3s
     Enter
-    Sleep 1s
-    Tab
-    Tab
-    Tab
     Sleep 3s
 Show
-Sleep 1s
-Enter
-Sleep 500ms
-Type@200ms "jj"
-Enter
-Sleep 3s
+Sleep 2s
+# go to editor tab
 Tab
-Sleep 1s
-Enter
-Tab
-Sleep 0.5s
+Sleep 200ms
 Tab
-Sleep 0.5s
-Enter
 Sleep 1s
-Type@100ms "jjjjjjjjjj"
+# Enter the editor
+Enter
+# Edit the message to true
+Type@100ms "jj$i"
+Sleep 300ms
+Backspace
+Sleep 100ms
+Backspace
+Sleep 100ms
+Backspace
+Sleep 100ms
+Backspace
+Sleep 100ms
+Backspace
+Sleep 100ms
+Type@100ms "true"
+Escape
+Sleep 100ms
+Escape
+# go to the headers
 Sleep 1s
 Tab
-Sleep 1s
+Sleep 200ms
+# go to request uri
+Tab
+Sleep 200ms
 Tab
 Sleep 1s
-Type@100ms "jjjjjjjjjj"
-Sleep 1s
-Escape
+# focus and send a request
+Enter
+Sleep 0.5s
+Type@100ms "-headers"
 Sleep 1s
-Tab
+Enter
 Sleep 0.5s
+Escape
+# go to the response
 Tab
-Sleep 0.5s
+Sleep 200ms
 Tab
-Sleep 0.5s
+Sleep 200ms
 Enter
-Type@100ms "jjjj"
-Sleep 1s
-Type@100ms "wwwww"
-Sleep 1s
-Type "D"
 Sleep 1s
-Type "i"
+Tab
 Sleep 1s
-Type@100ms 'hac@is_awesome.com",'
-Sleep 0.2s
-Escape
+Tab
 Sleep 3s
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
diff --git a/hac-cli/Cargo.toml b/hac-cli/Cargo.toml
diff --git a/hac-cli/src/lib.rs b/hac-cli/src/lib.rs
diff --git a/hac-client/Cargo.toml b/hac-client/Cargo.toml
diff --git a/hac-client/benches/collection_viewer_bench.rs b/hac-client/benches/collection_viewer_bench.rs
diff --git a/hac-client/src/app.rs b/hac-client/src/app.rs
diff --git a/hac-client/src/ascii.rs b/hac-client/src/ascii.rs
diff --git a/hac-client/src/event_pool.rs b/hac-client/src/event_pool.rs
diff --git a/hac-client/src/lib.rs b/hac-client/src/lib.rs
diff --git a/hac-client/src/main.rs b/hac-client/src/main.rs
diff --git a/hac-client/src/pages.rs b/hac-client/src/pages.rs
diff --git a/hac-client/src/pages/collection_dashboard/collection_dashboard.rs b/hac-client/src/pages/collection_dashboard/collection_dashboard.rs
diff --git a/hac-client/src/pages/collection_dashboard/collection_list.rs b/hac-client/src/pages/collection_dashboard/collection_list.rs
diff --git a/hac-client/src/pages/collection_dashboard/mod.rs b/hac-client/src/pages/collection_dashboard/mod.rs
diff --git a/hac-client/src/pages/collection_dashboard/new_collection_form.rs b/hac-client/src/pages/collection_dashboard/new_collection_form.rs
diff --git a/hac-client/src/pages/collection_viewer/collection_store.rs b/hac-client/src/pages/collection_viewer/collection_store.rs
@@ -41,7 +41,7 @@ impl CollectionStore {
         let selected_request = collection.requests.as_ref().and_then(|requests| {
             requests.read().unwrap().first().and_then(|req| {
                 if let RequestKind::Single(req) = req {
-                    Some(Arc::clone(req))
+                    Some(req.clone())
                 } else {
                     None
                 }
@@ -323,6 +323,7 @@ mod tests {
             id: "root".to_string(),
             method: RequestMethod::Get,
             name: "Root1".to_string(),
+            headers: None,
             uri: "/root1".to_string(),
             body_type: None,
             body: None,
@@ -335,6 +336,7 @@ mod tests {
             method: RequestMethod::Post,
             name: "Child1".to_string(),
             uri: "/nested1/child1".to_string(),
+            headers: None,
             body_type: None,
             body: None,
         })))
@@ -345,6 +347,7 @@ mod tests {
             id: "child_two".to_string(),
             method: RequestMethod::Put,
             name: "Child2".to_string(),
+            headers: None,
             uri: "/nested1/child2".to_string(),
             body_type: None,
             body: None,
@@ -356,6 +359,7 @@ mod tests {
             id: "not_used".to_string(),
             method: RequestMethod::Put,
             name: "NotUsed".to_string(),
+            headers: None,
             uri: "/not/used".to_string(),
             body_type: None,
             body: None,
@@ -378,6 +382,7 @@ mod tests {
         RequestKind::Single(Arc::new(RwLock::new(Request {
             id: "root_two".to_string(),
             method: RequestMethod::Delete,
+            headers: None,
             name: "Root2".to_string(),
             uri: "/root2".to_string(),
             body_type: None,

diff --git a/hac-client/src/pages/collection_viewer/collection_viewer.rs b/hac-client/src/pages/collection_viewer/collection_viewer.rs
@@ -551,19 +551,17 @@ impl<'cv> CollectionViewer<'cv> {
 
         let mut store_mut = self.collection_store.borrow_mut();
         if let RequestKind::Single(ref req) = new_request {
-            self.collection_store
-                .borrow_mut()
-                .dispatch(CollectionStoreAction::SetSelectedRequest(Some(req.clone())));
+            store_mut.dispatch(CollectionStoreAction::SetSelectedRequest(Some(req.clone())));
             store_mut.dispatch(CollectionStoreAction::SetHoveredRequest(Some(
                 new_request.get_id(),
             )));
-            self.sidebar.rebuild_tree_view();
         }
 
         store_mut.dispatch(CollectionStoreAction::InsertRequest(new_request));
         // dropping the borrow so we can sync the changes
         drop(store_mut);
 
+        self.sidebar.rebuild_tree_view();
         self.create_req_form_state = CreateReqFormState::default();
         self.curr_overlay = Overlays::None;
 

diff --git a/hac-client/src/pages/collection_viewer/mod.rs b/hac-client/src/pages/collection_viewer/mod.rs
diff --git a/hac-client/src/pages/collection_viewer/request_editor.rs b/hac-client/src/pages/collection_viewer/request_editor.rs
diff --git a/hac-client/src/pages/collection_viewer/request_editor/auth_editor.rs b/hac-client/src/pages/collection_viewer/request_editor/auth_editor.rs
diff --git a/hac-client/src/pages/collection_viewer/request_editor/body_editor.rs b/hac-client/src/pages/collection_viewer/request_editor/body_editor.rs