Review Comments Export

DmitryMK · DmitryMK · commit 65d380b57ebc · 2024-10-04T01:57:47.000-03:00
diff --git a/app/main/exportReviewComments.js b/app/main/exportReviewComments.js
@@ -27,7 +27,7 @@ const panelLabels = {
 
 const panels = Object.keys(panelLabels);
 
-const saveReviewCommentsToFile = async (mainWindow, exportData, saveDialogResult) => {
+const saveReviewCommentsToFile = async(mainWindow, exportData, saveDialogResult) => {
     let { filePath, canceled } = saveDialogResult;
     if (!canceled && filePath !== undefined) {
         if (!filePath.toLowerCase().endsWith('.xlsx')) {
@@ -52,7 +52,7 @@ const saveReviewCommentsToFile = async (mainWindow, exportData, saveDialogResult
         // Handle All Comments
         let comments = exportData['allComments'].data.map(comment =>
             ([comment.id, comment.author, comment.text, comment.createdAt, comment.modifiedAt, comment.resolvedAt, comment.resolvedBy,
-                JSON.stringify(comment.reviewCommentOids), JSON.stringify(comment.sources)
+                JSON.stringify(comment.reviewCommentOids), JSON.stringify(comment.commentSources)
             ])
         );
         workbook.sheet('All Comments').cell('A2').value(comments);
@@ -62,7 +62,7 @@ const saveReviewCommentsToFile = async (mainWindow, exportData, saveDialogResult
     }
 };
 
-const exportReviewComments = async (mainWindow, exportData) => {
+const exportReviewComments = async(mainWindow, exportData) => {
     let result = await dialog.showSaveDialog(
         mainWindow,
         {
diff --git a/app/tabs/reviewCommentTab.js b/app/tabs/reviewCommentTab.js
@@ -282,7 +282,8 @@ class ConnectedReviewCommentTab extends React.Component {
             let reviewComment = reviewComments[id];
             let commentData = {};
             if (extendedFormat) {
-                commentData = { ...reviewComment, id };
+                const reviewCommentSources = getSources(mdv, 'ReviewComment', id, odm);
+                commentData = { ...reviewComment, id, commentSources: reviewCommentSources };
                 if (reviewComment.resolvedBy) {
                     commentData.resolvedFlag = 'Yes';
                 }
@@ -381,7 +382,15 @@ class ConnectedReviewCommentTab extends React.Component {
                                     commentData.parentItemOid = itemGroupOid;
                                     if (itemGroupOid && mdv.itemGroups.hasOwnProperty(itemGroupOid)) {
                                         sourceName = `${sourceName} ${mdv.itemGroups[itemGroupOid].name}.${parentItemDef.name}.${variableName}`;
-                                        sourceParts = sourceParts.concat([mdv.itemGroups[itemGroupOid].name, parentItemDef.name, variableName]);
+                                        if (sourceParts.length === 0) {
+                                            sourceParts = [mdv.itemGroups[itemGroupOid].name, parentItemDef.name, variableName];
+                                        } else {
+                                            sourceParts = [
+                                                sourceParts[0] + ',' + mdv.itemGroups[itemGroupOid].name,
+                                                sourceParts[1] + ',' + parentItemDef.name,
+                                                sourceParts[2] + ',' + variableName,
+                                            ];
+                                        }
                                     }
                                 });
                             } else {
@@ -391,7 +400,16 @@ class ConnectedReviewCommentTab extends React.Component {
                                     commentData.parentItemOid = itemGroupOid;
                                     if (itemGroupOid && mdv.itemGroups.hasOwnProperty(itemGroupOid)) {
                                         sourceName = `${sourceName} ${mdv.itemGroups[itemGroupOid].name}.${variableName}`;
-                                        sourceParts = sourceParts.concat([mdv.itemGroups[itemGroupOid].name, variableName, '']);
+                                        // sourceParts = sourceParts.concat([mdv.itemGroups[itemGroupOid].name, variableName, '']);
+                                        if (sourceParts.length === 0) {
+                                            sourceParts = [mdv.itemGroups[itemGroupOid].name, variableName, ''];
+                                        } else {
+                                            sourceParts = [
+                                                sourceParts[0] + ',' + mdv.itemGroups[itemGroupOid].name,
+                                                sourceParts[1] + ',' + variableName,
+                                                '',
+                                            ];
+                                        }
                                     }
                                 });
                             }
