[bugfix] Fixed issue where document id was not being updated when loading annotations

Author: justinjung04

src/apis/saveAnnotations.js

@@ -1,23 +1,16 @@
 import core from 'core';
-import selectors from 'selectors';
-import { documentTypes } from 'constants/types';
 
 export default store => () =>  {
   const state = store.getState();
-  const serverUrl = state.advanced.serverUrl || '/annotations';
-  const serverUrlHeaders = state.advanced.serverUrlHeaders;
-  const docId = state.document.id;
+  const { id: docId } = state.document;
+  const { serverUrl, serverUrlHeaders } = state.advanced;
   const docIdQuery = docId ? { did: docId } : {};
 
-  if (selectors.getDocumentType(state) === documentTypes.BLACKBOX) {
-    console.warn('Cannot save annotations from WebViewer demo server.');
+  if (!serverUrl) {
+    console.warn('serverUrl option is not defined. Please pass this option in WebViewer constructor to save/load annotations. See https://www.pdftron.com/documentation/web/guides/annotations/saving-loading-annotations for details.');
     return;
   }
 
-  if (serverUrl === '/annotations') {
-    console.warn('serverUrl option is not defined. Falling back to `/annotations`, which handles requests in /samples/server.js');
-  }
-
   $.ajax({
     type: 'POST',
     url: serverUrl,
@@ -27,7 +20,7 @@ export default store => () =>  {
       'data': core.exportAnnotations()
     },
     success: () => {
-      alert(`Annotations saved to /annotations/${docId ? docId : 'default'}.xfdf`);
+      alert(`Annotations saved to ${serverUrl}/${docId ? docId : 'default'}.xfdf`);
     }
   });
 };

src/helpers/setupLoadAnnotationsFromServer.js

@@ -1,11 +1,17 @@
 import core from 'core';
 
-export default (documentId, serverUrl, serverUrlHeaders) =>  {
+export default (store) =>  {  
+  const state = store.getState();
+  const { serverUrl, serverUrlHeaders } = state.advanced;
+
   if (!serverUrl) {
     return;
   }
 
   const getAnnotsFromServer = (originalData, callback) => {
+    const state = store.getState();
+    const { id: documentId } = state.document;
+
     if (window.readerControl.serverFailed) {
       callback(originalData);
     } else if (window.readerControl.loadedFromServer) {

src/index.js

@@ -108,7 +108,7 @@ if (window.CanvasRenderingContext2D) {
     setUserPermission(state);
     addEventHandlers(),
     setDefaultDisabledElements(store),
-    setupLoadAnnotationsFromServer(state.document.id, state.advanced.serverUrl, state.advanced.serverUrlHeaders);
+    setupLoadAnnotationsFromServer(store);
 
     ReactDOM.render(
       <Provider store={store}>

src/redux/initialState.js

@@ -202,7 +202,7 @@ export default {
     fullAPI: getHashParams('pdfnet', false),
     pdftronServer: getHashParams('pdftronServer', ''),
     preloadWorker: getHashParams('preloadWorker', false),
-    serverUrl: getHashParams('server_url', process.env.NODE_ENV === 'development' ? '/annotations' : ''),
+    serverUrl: getHashParams('server_url', ''),
     serverUrlHeaders: JSON.parse(getHashParams('serverUrlHeaders', '{}')),
     streaming: getHashParams('streaming', false),
     subzero: getHashParams('subzero', false),