From 0d19ef40e1518b8b6b85997745a8d7aa58306464 Mon Sep 17 00:00:00 2001
From: ziti-ci <ziti-ci@netfoundry.io>
Date: Sat, 31 Oct 2020 00:15:09 -0400
Subject: [PATCH 1/3] fix overflow on detail page when the name is very very
 long

---
 DesktopEdge/IdentityDetails.xaml    | 15 +++++++++------
 DesktopEdge/IdentityDetails.xaml.cs |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/DesktopEdge/IdentityDetails.xaml b/DesktopEdge/IdentityDetails.xaml
index 48163dd3..6fa88c39 100644
--- a/DesktopEdge/IdentityDetails.xaml
+++ b/DesktopEdge/IdentityDetails.xaml
@@ -17,21 +17,24 @@
         </Canvas>
         <Rectangle Margin="10,10,10,10" Fill="White" RadiusY="10" RadiusX="10"></Rectangle>
 
-        <Grid Margin="20,20,20,-20">
+        <Grid Margin="20,20,20,-20" MaxWidth="350">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
             <StackPanel Grid.Column="0" Orientation="Vertical" HorizontalAlignment="Stretch" Margin="10,10,10,10">
                 <Grid Margin="0,0,0,10">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="70"/>
+                        <ColumnDefinition Width="40"/>
                         <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="70"/>
+                        <ColumnDefinition Width="40"/>
                     </Grid.ColumnDefinitions>
                     <local:Toggler x:Name="IdDetailToggle" Grid.Column="0" HorizontalAlignment="Left" OnToggled="IdToggle"></local:Toggler>
-                    <Label Name="IdDetailName" Grid.Column="1" HorizontalAlignment="Center" MaxWidth="160" FontSize="14" FontWeight="SemiBold" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" Foreground="#0F0F23">
-                        <TextBlock TextTrimming="CharacterEllipsis">Identity Name</TextBlock>
-                    </Label>
+                    <TextBlock Name="IdDetailName" Grid.Column="1" HorizontalAlignment="Center" 
+                           FontSize="14" FontWeight="SemiBold" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" 
+                           Foreground="#0F0F23" VerticalAlignment="Center" TextWrapping="Wrap"
+                           Text="Identity Name Here"
+                           >
+                    </TextBlock>
                     <Image Grid.Column="2" Cursor="Hand" Source="/Assets/Images/x.png" Width="20" Height="20" Margin="0,0,0,0" HorizontalAlignment="Right" MouseUp="HideMenu"></Image>
                 </Grid>
                 <Rectangle HorizontalAlignment="Stretch" Height="1" Fill="#7d8faf" Opacity="0.2"></Rectangle>
diff --git a/DesktopEdge/IdentityDetails.xaml.cs b/DesktopEdge/IdentityDetails.xaml.cs
index b9cf1c93..3e86f06c 100644
--- a/DesktopEdge/IdentityDetails.xaml.cs
+++ b/DesktopEdge/IdentityDetails.xaml.cs
@@ -69,7 +69,7 @@ namespace ZitiDesktopEdge {
 		}
 
 		public void UpdateView() {
-			IdDetailName.Content = _identity.Name;
+			IdDetailName.Text = _identity.Name;
 			IdDetailToggle.Enabled = _identity.IsEnabled;
 			IdentityName.Value = _identity.Name;
 			IdentityNetwork.Value = _identity.ControllerUrl;

From 07190a464ce103c735333d3ce0f2c6228ab7265a Mon Sep 17 00:00:00 2001
From: ziti-ci <ziti-ci@netfoundry.io>
Date: Sat, 31 Oct 2020 04:24:08 +0000
Subject: [PATCH 2/3] [ci skip] committing updated version information

---
 service/ziti-tunnel/version.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go
index 54e6569b..f43855e0 100644
--- a/service/ziti-tunnel/version.go
+++ b/service/ziti-tunnel/version.go
@@ -21,8 +21,8 @@ package main
 
 const (
 	Version   = "1.2.13"
-	Revision  = "03148d65e5f4"
-	Branch    = "release-1.2.13"
+	Revision  = "0d19ef40e151"
+	Branch    = "release-1.2.13-tweaks"
 	BuildUser = ""
-	BuildDate = "2020-10-29 14:09:14"
+	BuildDate = "2020-10-31 04:20:32"
 )

From fcfa8a485798586a66580cd71e8c31f17c2475b8 Mon Sep 17 00:00:00 2001
From: ziti-ci <ziti-ci@netfoundry.io>
Date: Sat, 31 Oct 2020 00:28:39 -0400
Subject: [PATCH 3/3] add the controllerversion back

---
 service/ziti-tunnel/service/state.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/service/ziti-tunnel/service/state.go b/service/ziti-tunnel/service/state.go
index 86b9535d..c39bd74f 100644
--- a/service/ziti-tunnel/service/state.go
+++ b/service/ziti-tunnel/service/state.go
@@ -202,6 +202,7 @@ func (t *RuntimeState) LoadIdentity(id *Id) {
 		return
 	}
 
+	id.ControllerVersion = id.CId.Version
 	id.CId.Fingerprint = id.FingerPrint
 
 	// hack for now - if the identity name is '<unknown>' don't set it... :(