From 587000ec024b800d968ede14fc01ed28818e4b32 Mon Sep 17 00:00:00 2001
From: Josh Christopherson <josh.christopherson@stacksports.com>
Date: Thu, 27 Jun 2019 14:16:57 -0500
Subject: [PATCH] Some tweaks to the Jira plugin

[x] Updating `branch` command to be compatible with git-flow style branches by removing any prefix before attempting to go to the ticket number in Jira.
[x] Removing the switch between /browse/ and /issues/ based off of the `JIRA_RAPID_BOARD` setting - as all issues are under browse now it seems.
---
 plugins/jira/README.md       |  3 +++
 plugins/jira/jira.plugin.zsh | 10 ++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/jira/README.md b/plugins/jira/README.md
index 091dccb97..a211e34e0 100644
--- a/plugins/jira/README.md
+++ b/plugins/jira/README.md
@@ -23,6 +23,9 @@ jira reported [username]  # queries for issues reported by a user
 jira assigned [username]  # queries for issues assigned to a user
 jira myissues   # queries for you own issues
 jira branch     # opens an existing issue matching the current branch name
+                # The branch name may have prefixes ending in "/": "feature/MP-1234",
+                # and also suffixes starting with "_": "MP-1234_fix_dashboard"
+                # In both these cases, the issue opened will be "MP-1234"
 jira ABC-123    # opens an existing issue
 jira ABC-123 m  # opens an existing issue for adding a comment
 ```
diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index ed88368cd..cb46f540b 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -67,7 +67,9 @@ function jira() {
     if [[ "$action" == "branch" ]]; then
       # Get name of the branch
       issue_arg=$(git rev-parse --abbrev-ref HEAD)
-      # Split by _ character and get the first element
+      # Strip prefixes like feature/ or bugfix/
+      issue_arg=${issue_arg##*/}
+      # Strip suffixes starting with _
       issue_arg=(${(s:_:)issue_arg})
       issue_arg=${issue_arg[1]}
       if [[ "$issue_arg" = ${jira_prefix}* ]]; then
@@ -87,11 +89,7 @@ function jira() {
     else
       echo "Opening issue #$issue"
     fi
-    if [[ "$JIRA_RAPID_BOARD" == "true" ]]; then
-      open_command "${jira_url}/issues/${issue}${url_fragment}"
-    else
-      open_command "${jira_url}/browse/${issue}${url_fragment}"
-    fi
+    open_command "${jira_url}/browse/${issue}${url_fragment}"
   fi
 }