Changeset 32871 for main/trunk/greenstone3/web/interfaces/default

Timestamp:

2019-03-07T19:20:59+13:00 (5 years ago)

Author:

ak19

Message:

Need to reset init states to current states AFTER setArchivesMetadata has been successfully performed on all the list of changed metadata. Implementing Dr Bainbridge's suggested way of doing this, which is to set the entire editableInitStates array to editableCurrentStates. And similarly for ALL map editors: set ALL map-editors' savedOverlays to their current overlays. Tested for metadata and map-editors. Incremental change. Still need to add errorResponseFunction handling into setMeta methods before we can use that.

Location:

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

Files:

• documentedit_scripts.js (modified) (1 diff)
• documentedit_scripts_util.js (modified) (2 diffs)

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

@@ -154 +154 @@
             // But for now, we're doing this here *because* this is the procedure with regular metadata (works out changes,
             // then saves those changes as initStates BEFORE saveAndRebuild is called)          
-            map_editor.savedOverlays = newMapData;
+            //map_editor.savedOverlays = newMapData; // happens after all setArchivesMeta calls have succeeded, just at the start of sendBuildRequest() in documentedit_scripts_util.js::saveAndRebuild()
         }
         

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

@@ -345 +345 @@
     var sendBuildRequest = function()
     {
+        console.log("Replacing init states with current states");
+        // Clean changes. We're here because setting meta for all meta changes was successful, so
+        // - update doc's metadata initial states to current:
+        editableInitStates = editableLastStates;        
+        // - update doc's map editors' initial states to current:
+        var map_editors_array = Object.values(gsmap_store);
+        for(var i = 0; i < map_editors_array.length; i++) {
+            var map_editor = map_editors_array[i];
+            map_editor.savedOverlays = JSON.stringify(ShapesUtil.overlayToJSON(map_editor.overlays));
+        }
+        
+        
         var request = "[";
         for(var i = 0; i < _transactions.length; i++)
@@ -442 +454 @@
   
   //Clean changes
-  editableInitStates = editableLastStates;
+  ////editableInitStates = editableLastStates; // moved into processChangesLoop(): when all changes have successfully been processed.
+        // Alternative is to set initState per metadata in changes array: after each setArchiveMetadata call for each individual meta change.
+        // But since our setMeta calls are always synchronous, happening in sequence, if one setArchivesMeta() call fails
+        // we'll not attempt subsequent ones or coll building at the end.
   
     for(var i = 0; i < changes.length; i++)