PMN-2022.2 Release

.gitignore

@@ -391,6 +391,7 @@ semver.ps1
 /Lpp.Dns.Api.Tests/ConnectionStrings.config
 Lpp.Dns.Portal/Scripts/PmnGrid/PmnGrid.js
 /DMCS/PopMedNet.DMCS/appsettings.Development.json
+/Lpp.Dns.Portal/js/_rootlayout.js.map
 /PopMedNet.Hangfire.ServerManagement/ConnectionStrings.config
 /Tests/PopMedNet.UITests/App.config
 /DMCS/PopMedNet.DMCS.Tests/appsettings.json

Build/CommonAssemblyInfo.cs

@@ -7,6 +7,6 @@
 [assembly: AssemblyCopyright("Copyright © PopMedNet 2011-2022")]
 [assembly: ComVisible(false)]
 //Please Also update The Click Once version under Lpp.Dns.DataMartClient Properties > publish > Version Number 
-[assembly: AssemblyVersion( /*<VERSION>*/ "7.5.0.0" /*</VERSION>*/ )]
-[assembly: AssemblyFileVersion( /*<VERSION>*/ "7.5.0.0" /*</VERSION>*/ )]
-[assembly: AssemblyInformationalVersion("2022.1")]
+[assembly: AssemblyVersion( /*<VERSION>*/ "7.6.0.0" /*</VERSION>*/ )]
+[assembly: AssemblyFileVersion( /*<VERSION>*/ "7.6.0.0" /*</VERSION>*/ )]
+[assembly: AssemblyInformationalVersion("2022.2")]

Build/DataMartClientCommonAssemlbyInfo.cs

@@ -7,6 +7,6 @@
 [assembly: AssemblyCopyright("Copyright © PopMedNet 2011-2022")]
 [assembly: ComVisible(false)]
 //Please Also update The Click Once version under Lpp.Dns.DataMartClient Properties > publish > Version Number 
-[assembly: AssemblyVersion( /*<VERSION>*/ "7.5.0.0" /*</VERSION>*/ )]
-[assembly: AssemblyFileVersion( /*<VERSION>*/ "7.5.0.0" /*</VERSION>*/ )]   
-[assembly: AssemblyInformationalVersion("2022.1")]
+[assembly: AssemblyVersion( /*<VERSION>*/ "7.6.0.0" /*</VERSION>*/ )]
+[assembly: AssemblyFileVersion( /*<VERSION>*/ "7.6.0.0" /*</VERSION>*/ )]   
+[assembly: AssemblyInformationalVersion("2022.2")]

Build/Dependencies.targets

@@ -22,7 +22,7 @@
     <BootstrapCSS Include="./node_modules/bootstrap/dist/css/*.*" />
     <BootstrapFonts Include="./node_modules/bootstrap/fonts/*.*" />
   </ItemGroup>
-	<Target Name="NodeBuild" DependsOnTargets="CompileTypeScript">
+	<Target Name="NodeBuild">
     <Message Text="Executing npm install"></Message>
 		<Exec Command="npm install" />
     <Copy SourceFiles="./node_modules/bootstrap/dist/js/bootstrap.js;./node_modules/bootstrap/dist/js/bootstrap.min.js;" DestinationFolder="./Scripts/bootstrap" />

Build/DomainManagerCommonAssemlbyInfo.cs

@@ -6,8 +6,8 @@
 [assembly: AssemblyCopyright("Copyright © PopMedNet 2011-2022")]
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion( /*<VERSION>*/ "7.5.0.*" /*</VERSION>*/ )]
+[assembly: AssemblyVersion( /*<VERSION>*/ "7.6.0.*" /*</VERSION>*/ )]
 
 //Need to keep the file private part equal to 3000 or above for RavenDB as Embedded usage in adapter packages.
-[assembly: AssemblyFileVersion( /*<VERSION>*/ "7.5.0.3000" /*</VERSION>*/ )]
-[assembly: AssemblyInformationalVersion("2022.1")]
+[assembly: AssemblyFileVersion( /*<VERSION>*/ "7.6.0.3000" /*</VERSION>*/ )]
+[assembly: AssemblyInformationalVersion("2022.2")]

Build/Lpp.Dns.targets

@@ -14,8 +14,6 @@
     <WarningLevel>4</WarningLevel>
     <RuntimeCCCheck>False</RuntimeCCCheck>
     <RestorePackages>true</RestorePackages>
-    <TypeScriptTarget>ES5</TypeScriptTarget>
-    <TypeScriptModuleKind>AMD</TypeScriptModuleKind>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>

Lpp.Adapters/Lpp.Dns.DataMart.Client/Controls/DataMartViewPanel.cs

@@ -251,7 +251,7 @@ public void SetAttachments(IEnumerable<Document> attachments)
         public void InitializeResponseDocumentsFromCache(Lib.Caching.DocumentCacheManager cache)
         {
             _cache = cache;
-            this.documents = (cache.GetResponseDocuments() ?? Array.Empty<Document>()).ToArray();
+            this.documents = (cache.GetResponseDocuments().Cast<Document>() ?? Array.Empty<Document>()).ToArray();
 
             FileListDataSource = documents;
 

Lpp.Adapters/Lpp.Dns.DataMart.Client/Forms/RequestDetailForm.cs

@@ -402,7 +402,12 @@ private void btnUploadResults_Click(object sender, EventArgs e)
                         new ParallelOptions { MaxDegreeOfParallelism = 4 },
                         (doc) =>
                         {
-                            string uploadIdentifier = ("[" + Utilities.Crypto.Hash(Guid.NewGuid()) + "]").PadRight(16);
+                            var cacheDocument = doc as Lib.Caching.CacheDocument;
+                            if(cacheDocument != null && !string.IsNullOrEmpty(cacheDocument.UploadedOn))
+                            {
+                                //document has already been uploaded, do not upload again
+                                return;
+                            }
 
                             Stream stream;
 
@@ -418,7 +423,7 @@ private void btnUploadResults_Click(object sender, EventArgs e)
                             var beforeMath = 25 / responseDocuments.Length;
 
                             progressPercentage = Math.Ceiling(progressPercentage + beforeMath);
-
+                            //TODO: use the calculated percentage
                             uploadWorker.ReportProgress(0);
 
                             var dto = new DTO.DataMartClient.Criteria.DocumentMetadata
@@ -434,13 +439,20 @@ private void btnUploadResults_Click(object sender, EventArgs e)
                                 CurrentChunkIndex = 0
                             };
 
+                            string uploadIdentifier = ("[" + Utilities.Crypto.Hash(Guid.NewGuid()) + "]").PadRight(16);
                             DnsServiceManager.PostDocumentChunk(uploadIdentifier, dto, stream, netWorkSetting);
 
                             double afterMath = 75 / responseDocuments.Length;
-
+                            
                             progressPercentage = Math.Ceiling(progressPercentage + afterMath);
-
+                            //TODO: use the calculated percentage
                             uploadWorker.ReportProgress(0);
+
+                            if(cacheDocument != null)
+                            {
+                                Cache.MarkUploaded(cacheDocument);
+                            }
+
                         });
 
 

Lpp.Adapters/Lpp.Dns.DataMart.Client/Lib/Caching/CacheDocument.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Lpp.Dns.DataMart.Client.Lib.Caching
+{
+    [DataContract, Serializable]
+    public class CacheDocument : Model.Document
+    {
+        internal CacheDocument() : base(string.Empty, string.Empty, string.Empty)
+        {
+
+        }
+
+        public CacheDocument(string documentID, string mimeType, string filename) : base(documentID, mimeType, filename)
+        {
+
+        }
+
+        public CacheDocument(Guid documentID, string mimeType, string filename, bool isViewable, int size, string kind) : base(documentID, mimeType, filename, isViewable, size, kind)
+        {
+
+        }
+
+        public Guid ID
+        {
+            get
+            {
+                return Guid.Parse(DocumentID);
+            }
+        }
+
+        [DataMember]
+        public string UploadedOn
+        {
+            get;set;
+        }
+
+        internal static CacheDocument FromDocument(Model.Document document)
+        {
+            return new CacheDocument(Guid.Parse(document.DocumentID), document.MimeType, document.Filename, document.IsViewable, document.Size, document.Kind);
+        }
+
+    }
+}

Lpp.Adapters/Lpp.Dns.DataMart.Client/Lib/Caching/DocumentCacheManager.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.IO;
 using System.Security.Cryptography;
 using Lpp.Dns.DataMart.Model;
@@ -89,15 +87,15 @@ public bool CanClearRequestSpecificCache
             }
         }
 
-        public IEnumerable<Document> GetResponseDocuments()
+        public IEnumerable<CacheDocument> GetResponseDocuments()
         {
             if (Enabled == false)
             {
-                return Array.Empty<Document>();
+                return Array.Empty<CacheDocument>();
             }
 
             var files = Directory.GetFiles(BaseCachePath, "*.meta");
-            List<Document> documents = new List<Document>(files.Length * 2);
+            List<CacheDocument> documents = new List<CacheDocument>(files.Length * 2);
 
             foreach (var path in files)
             {
@@ -109,9 +107,9 @@ public IEnumerable<Document> GetResponseDocuments()
                 using (var json = new Newtonsoft.Json.JsonTextReader(reader))
                 {
                     var serializer = new Newtonsoft.Json.JsonSerializer();
-                    serializer.Converters.Add(new DocumentCreationConverter());
+                    serializer.Converters.Add(new CacheDocumentCreationConverter());
 
-                    var doc = serializer.Deserialize<Document>(json);
+                    var doc = serializer.Deserialize<CacheDocument>(json);
                     documents.Add(doc);
                 }
             }
@@ -155,7 +153,7 @@ public void Add(IEnumerable<DocumentWithStream> documents)
                 using (var json = new Newtonsoft.Json.JsonTextWriter(writer))
                 {
                     var serializer = new Newtonsoft.Json.JsonSerializer();
-                    serializer.Serialize(json, document.Document);
+                    serializer.Serialize(json, CacheDocument.FromDocument(document.Document));
                     json.Flush();
                 }
 
@@ -169,6 +167,27 @@ public void Add(IEnumerable<DocumentWithStream> documents)
             }
         }
 
+        /// <summary>
+        /// Updates the serialized document metadata to include an uploaded on timestamp.
+        /// The timestamp is set as Utc now.
+        /// </summary>
+        /// <param name="document"></param>
+        public void MarkUploaded(CacheDocument document)
+        {
+            document.UploadedOn = DateTime.UtcNow.ToString("s");
+
+            string metaDataPath = Path.Combine(BaseCachePath, document.ID.ToString("D") + (Configuration.EncryptCacheItems ? ".e" : "") + ".meta");
+
+            using (var fileStream = File.OpenWrite(metaDataPath))
+            using (StreamWriter writer = Configuration.EncryptCacheItems ? new StreamWriter(CreateEncryptionStream(fileStream)) : new StreamWriter(fileStream))
+            using (var json = new Newtonsoft.Json.JsonTextWriter(writer))
+            {
+                var serializer = new Newtonsoft.Json.JsonSerializer();
+                serializer.Serialize(json, document);
+                json.Flush();
+            }
+        }
+
         public void ClearCache()
         {
             foreach(var file in Directory.GetFiles(BaseCachePath))
@@ -243,16 +262,16 @@ static byte[] ReadByteArray(Stream s)
 
     }
 
-    public class DocumentCreationConverter : Newtonsoft.Json.Converters.CustomCreationConverter<Document>
+    internal class CacheDocumentCreationConverter : Newtonsoft.Json.Converters.CustomCreationConverter<CacheDocument>
     {
-        public override Document Create(Type objectType)
+        public override CacheDocument Create(Type objectType)
         {
-            return new Document("", "", "");
+            return new CacheDocument();
         }
 
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            var document = new Document("", "", "");
+            var document = new CacheDocument();
             while (reader.Read())
             {
                 if(reader.TokenType == JsonToken.PropertyName && (reader.Value.ToStringEx() == "DocumentID"))
@@ -285,6 +304,11 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
                     reader.Read();
                     document.Kind = reader.Value.ToStringEx();
                 }
+                else if (reader.TokenType == JsonToken.PropertyName && (reader.Value.ToStringEx() == "UploadedOn"))
+                {
+                    reader.Read();
+                    document.UploadedOn = reader.Value.ToStringEx();
+                }
             }
 
             return document;

Lpp.Adapters/Lpp.Dns.DataMart.Client/Lib/DnsApiClient.cs

@@ -193,7 +193,7 @@ public async Task PostResponseDocumentChunk(Guid documentID, IEnumerable<byte> d
         public async Task PostDocumentChunk(Lpp.Dns.DTO.DataMartClient.Criteria.DocumentMetadata doc, byte[] data)
         {
             string identifier;
-            _log.Debug(ExecutingMessage("PostResponseDocumentChunk?documentID=" + doc.ID.ToString("D"), out identifier));
+            _log.Debug(ExecutingMessage("PostDocumentChunk", out identifier));
             using (var content = new MultipartFormDataContent())
             {
                 var docContent = JsonConvert.SerializeObject(doc, HttpClientHelpers.SerializerSettings());
@@ -210,7 +210,7 @@ public async Task PostDocumentChunk(Lpp.Dns.DTO.DataMartClient.Criteria.Document
                 if (!result.IsSuccessStatusCode)
                 {
                     var errorMsg = await result.GetMessage();
-                    _log.Error(CompletionMessage(identifier, "PostResponseDocumentChunk?documentID=" + doc.ID.ToString("D"), false) + ".\r\n" + errorMsg);
+                    _log.Error(CompletionMessage(identifier, "PostDocumentChunk", false) + ".\r\n" + errorMsg);
 
                     throw new Exception("An error occured during upload of document data: " + errorMsg);
                 }

Lpp.Adapters/Lpp.Dns.DataMart.Client/Lpp.Dns.DataMart.Client.csproj

@@ -245,6 +245,7 @@
     <Compile Include="Forms\ViewSQL.Designer.cs">
       <DependentUpon>ViewSQL.cs</DependentUpon>
     </Compile>
+    <Compile Include="Lib\Caching\CacheDocument.cs" />
     <Compile Include="Lib\Caching\CacheRetentionService.cs" />
     <Compile Include="Lib\Configuration\DataMartDescription.cs" />
     <Compile Include="Lib\Configuration\ModelDescription.cs" />
@@ -544,22 +545,22 @@
   <ItemGroup>
     <PublishFile Include="System.Net.Http">
       <Visible>False</Visible>
-      <PublishState>Include</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="System.Net.Http.Primitives">
       <Visible>False</Visible>
-      <PublishState>Include</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
   </ItemGroup>