Updated the Log Viewer application with SXP 8.1 changes.

Author: ob1dev

src/Sitecore.Azure.Diagnostics.UI/sitecore/Shell/Applications/Blobs/BlobLister/BlobLister.xml

@@ -6,12 +6,12 @@
 
       <CodeBeside Type="Sitecore.Azure.Diagnostics.UI.Shell.Applications.Blobs.BlobLister.BlobListerForm, Sitecore.Azure.Diagnostics.UI"/>
 
-      <Border Background="white" Border="1px inset" Height="100%">
+      <Border Background="white" Height="100%">
         <Listview ID="FileLister" DblClick="OnFileListerDblClick" View="Details">
           <ListviewHeader>
             <ListviewHeaderItem Name="name" Header="Name"/>
             <ListviewHeaderItem Name="size" Header="Size"/>
-            <ListviewHeaderItem Name="modified" Header="Last Modified"/>
+            <ListviewHeaderItem Name="modified" Header="Date modified"/>
           </ListviewHeader>
         </Listview>
       </Border>

src/Sitecore.Azure.Diagnostics.UI/sitecore/Shell/Applications/Blobs/BlobLister/BlobListerForm.cs

@@ -17,7 +17,7 @@ namespace Sitecore.Azure.Diagnostics.UI.Shell.Applications.Blobs.BlobLister
   /// </summary>
   public class BlobListerForm : DialogForm
   {
-    #region Fields
+    #region Protected fields
 
     /// <summary>
     /// The dialog.
@@ -28,11 +28,70 @@ public class BlobListerForm : DialogForm
     /// The file lister.
     /// </summary>
     protected Listview FileLister;
-    
-    #endregion
+
+    #endregion Protected fields
 
     #region Protected methods
 
+    /// <summary>
+    /// Checks the security.
+    /// </summary>
+    /// <exception cref="AccessDeniedException">
+    /// Application access denied.
+    /// </exception>
+    protected virtual void CheckSecurity()
+    {
+      ShellPage.IsLoggedIn();
+
+      var user = Context.User;
+
+      if (user.IsAdministrator)
+      {
+        return;
+      }
+
+      var isDeveloping = user.IsInRole("sitecore\\Sitecore Client Developing");
+      var isMaintaining = user.IsInRole("sitecore\\Sitecore Client Maintaining");
+      var isAccessDenied = !isDeveloping && !isMaintaining;
+
+      if (isAccessDenied)
+      {
+        throw new AccessDeniedException("Application access denied.");
+      }
+    }
+
+    /// <summary>
+    /// Executes the OK event.
+    /// </summary>
+    protected void DoOk()
+    {
+      var selected = this.FileLister.SelectedItems;
+
+      if (selected.Length == 0)
+      {
+        SheerResponse.Alert(Texts.PLEASE_SELECT_A_FILE);
+        return;
+      }
+
+      if (selected.Length > 1)
+      {
+        SheerResponse.Alert(Texts.PLEASE_SELECT_A_SINGLE_FILE);
+        return;
+      }
+
+      var result = selected[0].ServerProperties["Blob"] as string;
+      SheerResponse.SetDialogValue(result);
+      SheerResponse.CloseWindow();
+    }
+
+    /// <summary>
+    /// Called when the file lister DBL has click.
+    /// </summary>
+    protected void OnFileListerDblClick()
+    {
+      this.DoOk();
+    }
+
     /// <summary>
     /// Raises the load event.
     /// </summary>
@@ -63,24 +122,28 @@ protected override void OnLoad([NotNull] EventArgs e)
       var urlHandle = UrlHandle.Get();
 
       var icon = urlHandle["ic"];
+
       if (!string.IsNullOrEmpty(icon))
       {
         this.Dialog["Icon"] = icon;
       }
 
       var header = WebUtil.SafeEncode(urlHandle["he"]);
+
       if (header.Length > 0)
       {
         this.Dialog["Header"] = header;
       }
 
       var text = WebUtil.SafeEncode(urlHandle["txt"]);
+
       if (text.Length > 0)
       {
         this.Dialog["Text"] = text;
       }
 
       var button = WebUtil.SafeEncode(urlHandle["btn"]);
+
       if (button.Length > 0)
       {
         this.Dialog["OKButton"] = button;
@@ -93,7 +156,6 @@ protected override void OnLoad([NotNull] EventArgs e)
       {
         var item = new ListviewItem();
         this.FileLister.Controls.Add(item);
-
         item.ID = Control.GetUniqueID("I");
         item.Header = blob.Uri.Segments.Last();
         item.Icon = "Applications/16x16/document.png";
@@ -103,65 +165,6 @@ protected override void OnLoad([NotNull] EventArgs e)
       }
     }
 
-    /// <summary>
-    /// Checks the security.
-    /// </summary>
-    /// <exception cref="AccessDeniedException">
-    /// Application access denied.
-    /// </exception>
-    protected virtual void CheckSecurity()
-    {
-      ShellPage.IsLoggedIn();
-
-      var user = Context.User;
-
-      if (user.IsAdministrator)
-      {
-        return;
-      }
-
-      var isDeveloping = user.IsInRole("sitecore\\Sitecore Client Developing");
-      var isMaintaining = user.IsInRole("sitecore\\Sitecore Client Maintaining");
-      var isAccessDenied = !isDeveloping && !isMaintaining;
-
-      if (isAccessDenied)
-      {
-        throw new AccessDeniedException("Application access denied.");
-      }
-    }
-
-    /// <summary>
-    /// Executes the OK event.
-    /// </summary>
-    protected void DoOk()
-    {
-      var selected = this.FileLister.SelectedItems;
-
-      if (selected.Length == 0)
-      {
-        SheerResponse.Alert(Texts.PLEASE_SELECT_A_FILE);
-        return;
-      }
-
-      if (selected.Length > 1)
-      {
-        SheerResponse.Alert(Texts.PLEASE_SELECT_A_SINGLE_FILE);
-        return;
-      }
-
-      var result = selected[0].ServerProperties["Blob"] as string;
-      SheerResponse.SetDialogValue(result);
-      SheerResponse.CloseWindow();
-    }
-
-    /// <summary>
-    /// Called when the file lister DBL has click.
-    /// </summary>
-    protected void OnFileListerDblClick()
-    {
-      this.DoOk();
-    }
-
     /// <summary>
     /// Handles a click on the OK button.
     /// </summary>
@@ -182,7 +185,7 @@ protected override void OnOK([NotNull] object sender, [NotNull] EventArgs args)
 
       this.DoOk();
     }
-    
+
     #endregion Protected methods
   }
 }

src/Sitecore.Azure.Diagnostics.UI/sitecore/Shell/Applications/Reports/LogViewer/LogViewerDetailsForm.cs

@@ -16,6 +16,8 @@ namespace Sitecore.Azure.Diagnostics.UI.Shell.Applications.Reports.LogViewer
   /// </summary>
   public class LogViewerDetailsForm : BaseForm
   {
+    #region Protected fields
+
     /// <summary>
     /// The log viewer.
     /// </summary>
@@ -25,18 +27,22 @@ public class LogViewerDetailsForm : BaseForm
     /// The text panel.
     /// </summary>
     protected Border TextPanel;
-    
+
+    #endregion Protected fields
+
+    #region Protected methods
+
     /// <summary>
     /// Raises the load event.
     /// </summary>
-    /// <param name="e">The <see cref="T:System.EventArgs" /> instance containing the event data.</param>
+    /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
     /// <contract>
-    ///   <requires name="e" condition="not null" />
-    /// </contract>
-    protected override void OnLoad(EventArgs e)
+    ///   <requires name="e" condition="not null"/>
+    ///   </contract>
+    protected override void OnLoad([NotNull] EventArgs e)
     {
       Assert.ArgumentNotNull(e, "e");
-      Assert.CanRunApplication("/sitecore/content/Applications/Control Panel/Reports/Log Viewer");
+      Assert.CanRunApplication("/sitecore/content/Applications/Tools/Log Viewer");
 
       base.OnLoad(e);
 
@@ -46,18 +52,18 @@ protected override void OnLoad(EventArgs e)
       }
 
       string blobName = WebUtil.GetQueryString("blob");
+
       if (string.IsNullOrEmpty(blobName))
       {
         return;
       }
-
-      this.TextPanel.Visible = false;
-
+     
       var blob = LogStorageManager.GetBlob(blobName);
       var data = string.Empty;
 
       if (blob.BlobType == BlobType.AppendBlob)
       {
+        this.TextPanel.Visible = false;
         data = ((CloudAppendBlob)blob).DownloadText(LogStorageManager.DefaultTextEncoding);
       }
 
@@ -70,5 +76,7 @@ protected override void OnLoad(EventArgs e)
       data = HttpUtility.HtmlEncode(data).Replace("\n", "<br/>");
       this.LogViewer.Controls.Add(new LiteralControl(data));
     }
+
+    #endregion
   }
 }

src/Sitecore.Azure.Diagnostics.UI/sitecore/Shell/Applications/Reports/LogViewer/LogViewerForm.cs

@@ -41,45 +41,13 @@ protected override void OnLoad([NotNull] EventArgs e)
 
       base.OnLoad(e);
 
-      Assert.CanRunApplication("/sitecore/content/Applications/Control Panel/Reports/Log Viewer");
+      Assert.CanRunApplication("/sitecore/content/Applications/Tools/Log Viewer");
     }
-
+    
     #endregion
-
+    
     #region Public methods
-
-    /// <summary>
-    /// Opens the specified args.
-    /// </summary>
-    /// <param name="args">The arguments.</param>
-    /// <contract>
-    ///   <requires name="args" condition="not null" />
-    /// </contract>
-    [HandleMessage("logviewer:open", true)]
-    public void Open([NotNull] ClientPipelineArgs args)
-    {
-      Assert.ArgumentNotNull(args, "args");
-
-      if (args.IsPostBack)
-      {
-        if (args.Result.Length > 0 && args.Result != "undefined")
-        {
-          if (string.IsNullOrEmpty(args.Result))
-          {
-            SheerResponse.Alert(Texts.YOU_CAN_ONLY_OPEN_LOG_FILES);
-            return;
-          }
-
-          this.SetBlob(args.Result);
-        }
-      }
-      else
-      {
-        Framework.Blobs.ListBlobs(Texts.OPEN_LOG_FILE, Texts.SELECT_A_LOG_FILE, "Software/32x32/text_code_colored.png", Texts.OPEN, "*log*.txt");
-        args.WaitForPostBack();
-      }
-    }
-
+    
     /// <summary>
     /// Deletes the specified args.
     /// </summary>
@@ -148,12 +116,12 @@ public void Download([NotNull] Message message)
       Assert.ArgumentNotNull(message, "message");
 
       var blobName = StringUtil.GetString(Context.ClientPage.ServerProperties["Blob"]);
-      if (blobName == null)
+      if (string.IsNullOrEmpty(blobName))
       {
         Context.ClientPage.ClientResponse.Alert(Texts.YOU_MUST_OPEN_A_LOG_FILE_FIRST);
         return;
       }
-      
+
       if (string.IsNullOrEmpty(blobName))
       {
         return;
@@ -162,6 +130,43 @@ public void Download([NotNull] Message message)
       Framework.Blobs.Download(blobName);
     }
 
+    /// <summary>
+    /// Opens the specified args.
+    /// </summary>
+    /// <param name="args">The arguments.</param>
+    /// <contract>
+    ///   <requires name="args" condition="not null" />
+    /// </contract>
+    [HandleMessage("logviewer:open", true)]
+    public void Open([NotNull] ClientPipelineArgs args)
+    {
+      Assert.ArgumentNotNull(args, "args");
+
+      if (args.IsPostBack)
+      {
+        if (args.Result.Length > 0 && args.Result != "undefined")
+        {
+          if (string.IsNullOrEmpty(args.Result))
+          {
+            SheerResponse.Alert(Texts.YOU_CAN_ONLY_OPEN_LOG_FILES);
+            return;
+          }
+
+          this.SetBlob(args.Result);
+        }
+      }
+      else
+      {
+        Framework.Blobs.ListBlobs(
+          Texts.OPEN_LOG_FILE, 
+          " ", 
+          "Software/32x32/text_code_colored.png", 
+          Texts.OPEN, 
+          "*log*.txt");
+        args.WaitForPostBack();
+      }
+    }
+
     /// <summary>
     /// Refreshes the specified message.
     /// </summary>
@@ -182,9 +187,9 @@ public void Refresh([NotNull] Message message)
     #region Private methods
 
     /// <summary>
-    /// Sets the file.
+    /// Sets the blob.
     /// </summary>
-    /// <param name="blobName">The filename.</param>
+    /// <param name="blobName">The blob name.</param>
     /// <contract>
     ///   <requires name="filename" condition="none" />
     /// </contract>