Merge branch 'ISSUE_4833' into ISSUE_4948

3drepo · May 24, 2024 · 944dba7 · 944dba7
2 parents 2a254df + 3b3a8d7
commit 944dba7
Show file tree

Hide file tree

Showing 50 changed files with 265 additions and 730 deletions.
diff --git a/backend/VERSION.json b/backend/VERSION.json
@@ -1,4 +1,4 @@
-{ "VERSION" : "5.8.3",
+{ "VERSION" : "5.9.0",
   "unity" : {
 	"current" : "2.20.0",
 	"supported": []

diff --git a/backend/package.json b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "3drepo.io",
-  "version": "5.8.3",
+  "version": "5.9.0",
   "engines": {
     "node": "18.x.x"
   },

diff --git a/backend/src/v4/models/bcf.js b/backend/src/v4/models/bcf.js
@@ -606,12 +606,14 @@ function parseMarkupBuffer(markupBuffer) {
 		}
 
 		_.get(xml, "Markup.Comment") && xml.Markup.Comment.forEach(comment => {
+
 			const obj = addPreExistingComment(
 				_.get(comment, "Author[0]._"),
 				_.get(comment, "Comment[0]._") ?? "",
 				{ guid: utils.stringToUUID(_.get(comment, "Viewpoint[0].@.Guid"))},
-				utils.stringToUUID(_.get(comment, "@.Guid")),
-				utils.isoStringToTimestamp(_.get(comment, "Date[0]._"))
+				undefined,
+				utils.isoStringToTimestamp(_.get(comment, "Date[0]._")),
+				utils.stringToUUID(_.get(comment, "@.Guid"))
 			);
 
 			const commentExtras = {};

diff --git a/backend/src/v4/models/ticket.js b/backend/src/v4/models/ticket.js
@@ -310,7 +310,7 @@ class Ticket extends View {
 		data = await beforeUpdate(data, oldTicket, userPermissions, systemComments);
 
 		if (systemComments.length > 0) {
-			data.comments = (oldTicket.comments || []).map(c => ({ ...c, sealed: true }));
+			data.comments = (data.comments ?? oldTicket.comments ?? []).map(c => ({ ...c, sealed: true }));
 			data.comments = data.comments.concat(systemComments);
 		}