Saving work

Author: dmcrider

src-tauri/src/main.rs

@@ -168,25 +168,29 @@ async fn generate_ai_commit_message(
 }
 
 #[tauri::command]
-async fn preview_alias(request: AliasRequest) -> Result<String, String> {
+async fn preview_alias(
+    alias_name: String,
+    commands: Vec<GitCommand>,
+    ai_commit: bool,
+    openai_api_key: Option<String>,
+) -> Result<String, String> {
     let mut command_parts = Vec::new();
 
-    for cmd in &request.commands {
+    for cmd in &commands {
         if cmd.enabled {
             match cmd.name.as_str() {
                 "add" => command_parts.push("git add .".to_string()),
                 "commit" => {
                     let message = cmd.parameters.get("message").unwrap_or(&"WIP".to_string()).clone();
-                    if request.ai_commit {
+                    if ai_commit {
                         command_parts.push("echo 'Getting AI-generated commit message...'".to_string());
                         command_parts.push("git commit -m \"$(echo 'AI message would be generated here')\"".to_string());
                     } else {
                         command_parts.push(format!("git commit -m \"{}\"", message));
                     }
                 },
                 "push" => {
-                    let branch = cmd.parameters.get("branch").unwrap_or(&"origin".to_string()).clone();
-                    command_parts.push(format!("git push {}", branch));
+                    command_parts.push("git push".to_string());
                 },
                 "checkout" => {
                     let branch = cmd.parameters.get("branch").unwrap_or(&"$1".to_string()).clone();
@@ -215,9 +219,14 @@ async fn preview_alias(request: AliasRequest) -> Result<String, String> {
 }
 
 #[tauri::command]
-async fn create_alias(request: AliasRequest) -> AliasResponse {
+async fn create_alias(
+    alias_name: String,
+    commands: Vec<GitCommand>,
+    ai_commit: bool,
+    openai_api_key: Option<String>,
+) -> AliasResponse {
     // First validate the alias name
-    let validation = validate_alias_name(request.alias_name.clone()).await;
+    let validation = validate_alias_name(alias_name.clone()).await;
     if !validation.valid {
         return AliasResponse {
             success: false,
@@ -227,7 +236,12 @@ async fn create_alias(request: AliasRequest) -> AliasResponse {
     }
 
     // Generate the alias command
-    let alias_command = match preview_alias(request.clone()).await {
+    let alias_command = match preview_alias(
+        alias_name.clone(),
+        commands.clone(),
+        ai_commit,
+        openai_api_key.clone(),
+    ).await {
         Ok(cmd) => cmd,
         Err(e) => {
             return AliasResponse {
@@ -243,7 +257,7 @@ async fn create_alias(request: AliasRequest) -> AliasResponse {
         .args(&[
             "config",
             "--global",
-            &format!("alias.{}", request.alias_name),
+            &format!("alias.{}", alias_name),
             &alias_command,
         ])
         .output();
@@ -256,7 +270,7 @@ async fn create_alias(request: AliasRequest) -> AliasResponse {
                     .args(&[
                         "config",
                         "--global",
-                        &format!("alias-tool.{}", request.alias_name),
+                        &format!("alias-tool.{}", alias_name),
                         "git-alias-generator",
                     ])
                     .output();
@@ -268,7 +282,7 @@ async fn create_alias(request: AliasRequest) -> AliasResponse {
 
                 AliasResponse {
                     success: true,
-                    message: format!("Alias '{}' created successfully!", request.alias_name),
+                    message: format!("Alias '{}' created successfully!", alias_name),
                     alias_command: Some(alias_command),
                 }
             } else {

src/App.tsx

@@ -50,7 +50,7 @@ const DEFAULT_COMMANDS: GitCommand[] = [
     name: "push",
     command: "git push",
     enabled: false,
-    parameters: { branch: "origin" },
+    parameters: {},
   },
   {
     name: "checkout",
@@ -75,7 +75,7 @@ const DEFAULT_COMMANDS: GitCommand[] = [
 const COMMAND_DESCRIPTIONS = {
   add: "Stage all changes in the current directory",
   commit: "Commit staged changes with a message",
-  push: "Push commits to remote repository", 
+  push: "Push commits to the current branch", 
   checkout: "Switch to a different branch",
   pull: "Pull latest changes from remote",
   cleanup: "Remove local branches that have been deleted on remote",
@@ -493,19 +493,6 @@ function App() {
                     </>
                   )}
 
-                  {command.name === "push" && (
-                    <div className="param-group">
-                      <label className="param-label">Remote & Branch</label>
-                      <input
-                        type="text"
-                        className="param-input"
-                        value={command.parameters.branch || ""}
-                        onChange={(e) => updateCommandParameter(index, "branch", e.target.value)}
-                        placeholder="origin (or origin main, origin develop, etc.)"
-                      />
-                    </div>
-                  )}
-                  
                   {command.name === "checkout" && (
                     <div className="param-group">
                       <label className="param-label">Branch Name</label>