Revize ceadebfe

Fixed issue with cached info not being returned to FE

Backend/Core/Services/AnnotationService/AnnotationServiceEF.cs

@@ -174 +174 @@
             else
             {
                 docToRender = annotation.CachedDocumentHTML;
-                HTMLService.CachedInfo cachedInfo = new()
+                cachedInfoToReturn = new()
                 {
                     TagStartPositions = JsonConvert.DeserializeObject<List<int>>(annotation.CachedStartPositions),
                     TagStartLengths = JsonConvert.DeserializeObject<List<int>>(annotation.CachedLengths),
                     TagClosingPositions = JsonConvert.DeserializeObject<List<int>>(annotation.CachedClosingPositions),
-                    TagClosingLengths = JsonConvert.DeserializeObject<List<int>>(annotation.CachedClosingLengths)
+                    TagClosingLengths = JsonConvert.DeserializeObject<List<int>>(annotation.CachedClosingLengths),
+                    TagInstanceCSS = JsonConvert.DeserializeObject<List<TagInstanceCSSInfo>>(annotation.CachedCSS)
                 };
                 
                 // The annotation has been modified and we need to either add the new tag or remove the tag
@@ -188 +189 @@
                     if (annotation.ModifiedType == EModified.ADDED)
                     {
                         var lastModifiedTag = context.AnnotationTags.Where(at => at.Id == annotation.LastModifiedTagId).First();
-                        var result = htmlService.PartialPreprocessHTMLAddTag(docToRender, documentContent.Content, lastModifiedTag, tags, cachedInfo);
+                        var result = htmlService.PartialPreprocessHTMLAddTag(docToRender, documentContent.Content, lastModifiedTag, tags, cachedInfoToReturn);
                         docToRender = result.Item1;
                         cachedInfoToReturn = result.Item2;
                     }
                     else if (annotation.ModifiedType == EModified.REMOVED)
                     {
-                        var result = htmlService.PartialPreprocessHTMLRemoveTag(docToRender, documentContent.Content, new AnnotationTag() { Id = annotation.LastModifiedTagId.Value }, tags, cachedInfo);
+                        var result = htmlService.PartialPreprocessHTMLRemoveTag(docToRender, documentContent.Content, new AnnotationTag() { Id = annotation.LastModifiedTagId.Value }, tags, cachedInfoToReturn);
                         docToRender = result.Item1;
                         cachedInfoToReturn = result.Item2;
                     }
@@ -249 +250 @@
                 }
             }
 
-            if (annotation.State == EState.NEW)
-            {
-                annotation.State = EState.IN_PROGRESS;
-            }
-
             AnnotationTag annotationTag = new()
             {
                 Id = Guid.NewGuid(),
@@ -312 +308 @@
                 throw new ArgumentException($"Unknown tag type {request.Type}");
             }
 
+            if (annotation.State == EState.NEW)
+            {
+                annotation.State = EState.IN_PROGRESS;
+            }
+
             annotation.LastModifiedTagId = annotationTag.Id;
             annotation.ModifiedType = EModified.ADDED;
 

Backend/Core/Services/HTMLService/HTMLService.cs

@@ -66 +66 @@
             AssignIdsToOriginalDocument(descendantsOriginal, ref currentId);
 
             WrapTextInSpan(descendantsOriginal, docToEdit);
+
+            descendantsToEdit = docToEdit.DocumentNode.DescendantsAndSelf().ToList();
             int descCount = descendantsToEdit.Count;
 
             foreach (var tag in tags)