Changeset 38426 for main/trunk/greenstone3/web

Timestamp:

2023-11-23T17:52:35+13:00 (6 months ago)

Author:

anupama

Message:

Don't need to do setMetadataArray on edits in user comment rows that are not just edited but also deleted. (Avoiding the extra work of first editing then deleting the affected user comment row).

Location:

main/trunk/greenstone3/web/interfaces/default/js

Files:

• documentedit_scripts_usercomments.js (modified) (2 diffs)
• documentedit_scripts_util.js (modified) (5 diffs)

main/trunk/greenstone3/web/interfaces/default/js/documentedit_scripts_usercomments.js

@@ -4 +4 @@
 // This function should return usercomments data (only exists for doc root's section) so that
 // setMetadataArray can be called for doc root and the entire collection rebuilt with the changes
-function getUserCommentsEditDataForSaving(userCommentsMetaFields, userCommentsRowsChanged) {
+function getUserCommentsEditDataForSaving(userCommentsMetaFields, userCommentsRowsChanged,
+                      docids_to_delCommentsMetapositions) {
     // https://medium.com/@martin.crabtree/javascript-tracking-key-value-pairs-using-hashmaps-7de6df598257
     // Just using JS object. Not using Map in case it's not always compatible with older
@@ -27 +28 @@
     currentElem = changedElem;
     while((currentElem = currentElem.parentNode).tagName != "TR");
-    var metapos = currentElem.firstElementChild.textContent;        
+    var metapos = currentElem.firstElementChild.textContent;
+    
+    // don't consider edits in user comment rows that have also been marked for deletion
+    var metapositionsToBeDeleted = docids_to_delCommentsMetapositions[docID];
+    if(metapositionsToBeDeleted !== undefined) {
+        // https://www.digitalocean.com/community/tutorials/js-array-search-methods
+        if(metapositionsToBeDeleted.indexOf(metapos) != -1) {
+        alert("Discarding edit at metapos " + metapos + " as user comment row is to be deleted.");
+        continue;
+        }
+    }
     
     //currentElem = changedElem.parentNode; //TD

main/trunk/greenstone3/web/interfaces/default/js/documentedit_scripts_util.js

@@ -453 +453 @@
     //addCollectionToBuild(collection);
 
-      var i;
+    var i;
     for(i = 0; i < _deletedMetadata.length; i++) {
       
@@ -460 +460 @@
       //Get document ID
       var currentElem = currentRow;
+      //console.log("metapos: " + currentElem.firstElementChild.textContent);
       while((currentElem = currentElem.parentNode).tagName != "TABLE");
     
@@ -501 +502 @@
     }
 
-    
-
   }
 
@@ -524 +523 @@
         {
             //Get document ID
-            var currentElem = changedElem;
-            while((currentElem = currentElem.parentNode).tagName != "TABLE");
+            var currentElem = changedElem;
+            while((currentElem = currentElem.parentNode).tagName != "TABLE");
             if(currentElem.getAttribute("id").startsWith("usercomments-")) {
             userCommentsRowsChanged.push(changedElem);
@@ -593 +592 @@
     //alert("Usercomments colnames: " + userCommentsMetaFields);
     var docArray = getUserCommentsEditDataForSaving(
-        userCommentsMetaFields, userCommentsRowsChanged);
+        userCommentsMetaFields, userCommentsRowsChanged, docids_to_delCommentsMetapositions);
+        // passing in docids_to_delCommentsMetapositions to cancel any edits in user comment
+        // rows that have also been marked for deletion.
     
     metadataChanges.push({type:'editUserComments',collection:collection,docArray:docArray});