From 616738070441c4f74e5cd2bbc45f5f245afb3388 Mon Sep 17 00:00:00 2001
From: Alexey Kontsevoy <alex@kontsevoy.com>
Date: Mon, 16 Oct 2017 21:08:24 -0400
Subject: [PATCH] fix terminal title when connected to unlisted server

---
 ....4a662ad59690ea8b5b60.js => app.91911a466ab6998ab848.js} | 4 ++++
 ...662ad59690ea8b5b60.js => styles.91911a466ab6998ab848.js} | 0
 ...662ad59690ea8b5b60.js => vendor.91911a466ab6998ab848.js} | 2 +-
 web/dist/index.html                                         | 2 +-
 web/src/app/flux/terminal/store.js                          | 6 +++++-
 5 files changed, 11 insertions(+), 3 deletions(-)
 rename web/dist/app/{app.4a662ad59690ea8b5b60.js => app.91911a466ab6998ab848.js} (99%)
 rename web/dist/app/{styles.4a662ad59690ea8b5b60.js => styles.91911a466ab6998ab848.js} (100%)
 rename web/dist/app/{vendor.4a662ad59690ea8b5b60.js => vendor.91911a466ab6998ab848.js} (99%)

diff --git a/web/dist/app/app.4a662ad59690ea8b5b60.js b/web/dist/app/app.91911a466ab6998ab848.js
similarity index 99%
rename from web/dist/app/app.4a662ad59690ea8b5b60.js
rename to web/dist/app/app.91911a466ab6998ab848.js
index d3587bd4322..ea6de1375cd 100644
--- a/web/dist/app/app.4a662ad59690ea8b5b60.js
+++ b/web/dist/app/app.91911a466ab6998ab848.js
@@ -17679,6 +17679,10 @@ webpackJsonp([0],[
 	      return this.login + '@' + this.hostname;
 	    }
 
+	    if (this.serverId && this.login) {
+	      return this.login + '@' + this.serverId;
+	    }
+
 	    return '';
 	  };
 
diff --git a/web/dist/app/styles.4a662ad59690ea8b5b60.js b/web/dist/app/styles.91911a466ab6998ab848.js
similarity index 100%
rename from web/dist/app/styles.4a662ad59690ea8b5b60.js
rename to web/dist/app/styles.91911a466ab6998ab848.js
diff --git a/web/dist/app/vendor.4a662ad59690ea8b5b60.js b/web/dist/app/vendor.91911a466ab6998ab848.js
similarity index 99%
rename from web/dist/app/vendor.4a662ad59690ea8b5b60.js
rename to web/dist/app/vendor.91911a466ab6998ab848.js
index 998f6d43d2b..8c5253942f9 100644
--- a/web/dist/app/vendor.4a662ad59690ea8b5b60.js
+++ b/web/dist/app/vendor.91911a466ab6998ab848.js
@@ -1,4 +1,4 @@
-!function(t){function e(n){if(r[n])return r[n].exports;var i=r[n]={exports:{},id:n,loaded:!1};return t[n].call(i.exports,i,i.exports,e),i.loaded=!0,i.exports}var n=window.webpackJsonp;window.webpackJsonp=function(o,a){for(var s,u,l=0,c=[];l<o.length;l++)u=o[l],i[u]&&c.push.apply(c,i[u]),i[u]=0;for(s in a)Object.prototype.hasOwnProperty.call(a,s)&&(t[s]=a[s]);for(n&&n(o,a);c.length;)c.shift().call(null,e);if(a[0])return r[0]=0,e(0)};var r={},i={2:0};return e.e=function(t,n){if(0===i[t])return n.call(null,e);if(void 0!==i[t])i[t].push(n);else{i[t]=[n];var r=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.src=e.p+""+{0:"5fab8792306700e88dbb",1:"3278e57a3ee4223eadb3"}[t]+".js",r.appendChild(o)}},e.m=t,e.c=r,e.p="/web/app",e(0)}([function(t,e,n){t.exports=n(560)},,function(t,e,n){"use strict";t.exports=n(3)},function(t,e,n){"use strict";var r=n(4),i=n(5),o=n(17),a=n(20),s=n(21),u=n(26),l=n(9),c=n(27),d=n(29),h=n(30),f=(n(11),l.createElement),p=l.createFactory,m=l.cloneElement,_=r,v={Children:{map:i.map,forEach:i.forEach,count:i.count,toArray:i.toArray,only:h},Component:o,PureComponent:a,createElement:f,cloneElement:m,isValidElement:l.isValidElement,PropTypes:c,createClass:s.createClass,createFactory:p,createMixin:function(t){return t},DOM:u,version:d,__spread:_};t.exports=v},function(t,e){/*
+!function(t){function e(n){if(r[n])return r[n].exports;var i=r[n]={exports:{},id:n,loaded:!1};return t[n].call(i.exports,i,i.exports,e),i.loaded=!0,i.exports}var n=window.webpackJsonp;window.webpackJsonp=function(o,a){for(var s,u,l=0,c=[];l<o.length;l++)u=o[l],i[u]&&c.push.apply(c,i[u]),i[u]=0;for(s in a)Object.prototype.hasOwnProperty.call(a,s)&&(t[s]=a[s]);for(n&&n(o,a);c.length;)c.shift().call(null,e);if(a[0])return r[0]=0,e(0)};var r={},i={2:0};return e.e=function(t,n){if(0===i[t])return n.call(null,e);if(void 0!==i[t])i[t].push(n);else{i[t]=[n];var r=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.src=e.p+""+{0:"bc2e83016c05b51cf235",1:"3278e57a3ee4223eadb3"}[t]+".js",r.appendChild(o)}},e.m=t,e.c=r,e.p="/web/app",e(0)}([function(t,e,n){t.exports=n(560)},,function(t,e,n){"use strict";t.exports=n(3)},function(t,e,n){"use strict";var r=n(4),i=n(5),o=n(17),a=n(20),s=n(21),u=n(26),l=n(9),c=n(27),d=n(29),h=n(30),f=(n(11),l.createElement),p=l.createFactory,m=l.cloneElement,_=r,v={Children:{map:i.map,forEach:i.forEach,count:i.count,toArray:i.toArray,only:h},Component:o,PureComponent:a,createElement:f,cloneElement:m,isValidElement:l.isValidElement,PropTypes:c,createClass:s.createClass,createFactory:p,createMixin:function(t){return t},DOM:u,version:d,__spread:_};t.exports=v},function(t,e){/*
 	object-assign
 	(c) Sindre Sorhus
 	@license MIT
diff --git a/web/dist/index.html b/web/dist/index.html
index 3c4829f7d17..9dd8f285f38 100644
--- a/web/dist/index.html
+++ b/web/dist/index.html
@@ -11,5 +11,5 @@
   <link rel="shortcut icon" href="/web/app/favicon.ico"><link href="/web/app/vendor.042b9c25b63ae69f1746fe9c6d227b47.css" rel="stylesheet"></head>
   <body class="grv">
     <div id="app"></div>        
-  <script type="text/javascript" src="/web/app/vendor.4a662ad59690ea8b5b60.js"></script><script type="text/javascript" src="/web/app/styles.4a662ad59690ea8b5b60.js"></script><script type="text/javascript" src="/web/app/app.4a662ad59690ea8b5b60.js"></script></body>
+  <script type="text/javascript" src="/web/app/vendor.91911a466ab6998ab848.js"></script><script type="text/javascript" src="/web/app/styles.91911a466ab6998ab848.js"></script><script type="text/javascript" src="/web/app/app.91911a466ab6998ab848.js"></script></body>
 </html>
diff --git a/web/src/app/flux/terminal/store.js b/web/src/app/flux/terminal/store.js
index 3b89f6dd555..89034bb4dc0 100644
--- a/web/src/app/flux/terminal/store.js
+++ b/web/src/app/flux/terminal/store.js
@@ -59,11 +59,15 @@ export class TermRec extends Record({
     return ttyParams;
   }
 
-  getServerLabel() {    
+  getServerLabel() {                 
     if (this.hostname && this.login) {
       return `${this.login}@${this.hostname}`;  
     }
 
+    if (this.serverId && this.login) {
+      return `${this.login}@${this.serverId}`;  
+    }
+
     return '';
   }
 }