From 730abe60be6b6cecc3d3946dea5724b07ec99a00 Mon Sep 17 00:00:00 2001
From: Michael Kelley <michael.a.kelley@gmail.com>
Date: Sat, 17 Feb 2024 22:00:47 -0800
Subject: [PATCH] Fix Azure DevOps PR preview command

- Check for visualstudio domains as well
---
 PSFzf.Git.ps1 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/PSFzf.Git.ps1 b/PSFzf.Git.ps1
index 63a0bb0..6845745 100644
--- a/PSFzf.Git.ps1
+++ b/PSFzf.Git.ps1
@@ -292,7 +292,7 @@ function Invoke-PsFzfGitPullRequests() {
         $previewCmd = 'gh pr view {1} && gh pr diff {1}'
     }
     # Azure DevOps
-    elseif ($remoteUrl -match 'dev.azure.com') {
+    elseif ($remoteUrl -match 'dev.azure.com|visualstudio.com') {
         $script:azCmdInfo = Get-Command az -ErrorAction Ignore
         if ($null -ne $script:azCmdInfo) {
             $listAllPrsCmdJson = Invoke-Expression 'az repos pr list --status "active" --query "[].{title: title, number: pullRequestId, creator: createdBy.uniqueName}"'
@@ -309,7 +309,9 @@ function Invoke-PsFzfGitPullRequests() {
             return
         }
         $webCmd = 'az repos pr show --id {1} --open --output none'
-        $previewCmd = 'az repos pr show --id {1} --query "{Created:creationDate, Closed:closedDate, Creator:createdBy.displayName, PR:codeReviewId, Title:title, Repo:repository.name, Reviewers:join('', '',reviewers[].displayName), Source:sourceRefName, Target:targetRefName}" --output yamlc'
+        # currently errors on query. Need to fix instead of output everything
+        #$previewCmd = 'az repos pr show --id {1} --query "{Created:creationDate, Closed:closedDate, Creator:createdBy.displayName, PR:codeReviewId, Title:title, Repo:repository.name, Reviewers:join('', '',reviewers[].displayName), Source:sourceRefName, Target:targetRefName}" --output yamlc'
+        $previewCmd = 'az repos pr show --id {1} --output yamlc'
     }
 
     $fzfArguments = Get-GitFzfArguments
@@ -327,7 +329,7 @@ function Invoke-PsFzfGitPullRequests() {
         $objs | out-string -Stream  | Where-Object { -not [string]::IsNullOrWhiteSpace($_) } | `
             Invoke-Fzf @fzfArguments -Header $header -Preview "$previewCmd" -HeaderLines 2 -BorderLabel '🆕 Pull Requests' | `
             ForEach-Object {
-            $result += $_.Split(' ')[0]
+            $result += $_.Split(' ')[0] # get the PR ID
         }
     }
     finally {