From cb5152a463abefe1a34cdd087d337d5c61ce84b2 Mon Sep 17 00:00:00 2001
From: Cezar Augusto <cezaraugusto@outlook.it>
Date: Wed, 15 Mar 2017 18:17:23 -0300
Subject: [PATCH 1/2] Remove string from tab on persistent partition

Auditors: @bsclifton

Fix #7716
---
 app/renderer/components/tabContent.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/renderer/components/tabContent.js b/app/renderer/components/tabContent.js
index a3eac1c0b2..7b0292c414 100644
--- a/app/renderer/components/tabContent.js
+++ b/app/renderer/components/tabContent.js
@@ -147,7 +147,13 @@ class NewSessionIcon extends ImmutableComponent {
   }
 
   get partitionNumber () {
-    return this.props.tabProps.get('partitionNumber')
+    let partition = this.props.tabProps.get('partitionNumber')
+    // Persistent partitions opened by `target="_blank"` will have
+    // *partition-* string first, which causes bad UI. We don't need it for tabs
+    if (typeof partition === 'string') {
+      partition = partition.replace('partition-', '')
+    }
+    return partition
   }
 
   get partitionIndicator () {

From 7b30867437d9163198a078fd58d783491a9c530d Mon Sep 17 00:00:00 2001
From: Brian Clifton <brian@clifton.me>
Date: Wed, 15 Mar 2017 15:05:33 -0700
Subject: [PATCH 2/2] Added unit test + updated replace to use regex (instead
 of string match)

Auditors: @cezaraugusto

Test Plan:
run `npm run unittest -- --grep="tabContent components"`
---
 app/renderer/components/tabContent.js    |  2 +-
 test/unit/app/renderer/tabContentTest.js | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/renderer/components/tabContent.js b/app/renderer/components/tabContent.js
index 7b0292c414..1bedf822ae 100644
--- a/app/renderer/components/tabContent.js
+++ b/app/renderer/components/tabContent.js
@@ -151,7 +151,7 @@ class NewSessionIcon extends ImmutableComponent {
     // Persistent partitions opened by `target="_blank"` will have
     // *partition-* string first, which causes bad UI. We don't need it for tabs
     if (typeof partition === 'string') {
-      partition = partition.replace('partition-', '')
+      partition = partition.replace(/^partition-/i, '')
     }
     return partition
   }
diff --git a/test/unit/app/renderer/tabContentTest.js b/test/unit/app/renderer/tabContentTest.js
index 95888370f5..d36185b79e 100644
--- a/test/unit/app/renderer/tabContentTest.js
+++ b/test/unit/app/renderer/tabContentTest.js
@@ -264,6 +264,17 @@ describe('tabContent components', function () {
       )
       assert.equal(wrapper.props().symbolContent, 3)
     })
+    it('should read and show partition number for sessions with number set by opener (ex: clicking target=_blank)', function () {
+      const wrapper = shallow(
+        <NewSessionIcon
+          tabProps={
+            Immutable.Map({
+              partitionNumber: 'partition-3'
+            })}
+        />
+      )
+      assert.equal(wrapper.props().symbolContent, 3)
+    })
     it('should show max partition number even if session is bigger', function () {
       const wrapper = shallow(
         <NewSessionIcon