Merge pull request #726 from fallken/fix-return-to-last-collection-pa…

…ge-after-document-update-#724 fix return to last collection page after document update #724
mongo-express · Sep 9, 2022 · da25e2b · da25e2b
2 parents e7584d5 + f65a76f
commit da25e2b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 10 deletions.
diff --git a/lib/routes/document.js b/lib/routes/document.js
@@ -17,6 +17,7 @@ const routes = function (config) {
       editorTheme: config.options.editorTheme,
       docLength: bson.toString(req.document).split(/\r\n|\r|\n/).length,
       docString: bson.toString(req.document),
+      skip: req.query.skip || 0,
     };
 
     res.render('document', ctx);
@@ -64,6 +65,7 @@ const routes = function (config) {
 
   exp.updateDocument = async function (req, res) {
     const doc = req.body.document;
+    const skip = req.query.skip || 0;
 
     if (doc === undefined || doc.length === 0) {
       req.session.error = 'You forgot to enter a document!';
@@ -83,10 +85,11 @@ const routes = function (config) {
 
     await req.collection.updateOne(req.document, { $set: docBSON }).then(() => {
       req.session.success = 'Document updated!';
+
       if (config.options.persistEditMode === true) {
-        res.redirect(buildDocumentURL(res.locals.baseHref, req.dbName, req.collectionName, req.document._id));
+        res.redirect(buildDocumentURL(res.locals.baseHref, req.dbName, req.collectionName, req.document._id, { skip }));
       } else {
-        res.redirect(buildCollectionURL(res.locals.baseHref, req.dbName, req.collectionName));
+        res.redirect(buildCollectionURL(res.locals.baseHref, req.dbName, req.collectionName, { skip }));
       }
     }).catch((err) => {
       // document was not saved

diff --git a/lib/utils.js b/lib/utils.js
@@ -1,4 +1,5 @@
 import _ from 'lodash-es';
+import querystring from 'querystring';
 
 // Given some size in bytes, returns it in a converted, friendly size
 // credits: http://stackoverflow.com/users/1596799/aliceljm
@@ -97,12 +98,23 @@ export const buildDatabaseURL = function (base, dbName) {
   return base + 'db/' + encodeURIComponent(dbName);
 };
 
-export const buildCollectionURL = function (base, dbName, collectionName) {
-  return buildDatabaseURL(base, dbName) + '/' + encodeURIComponent(collectionName);
+export const buildCollectionURL = function (base, dbName, collectionName, queryOptions = {}) {
+  let url = buildDatabaseURL(base, dbName) + '/' + encodeURIComponent(collectionName);
+
+  if (Object.keys(queryOptions).length) {
+    url += '?' + querystring.encode(queryOptions);
+  }
+  return url;
 };
 
-export const buildDocumentURL = function (base, dbName, collectionName, documentId) {
-  return buildCollectionURL(base, dbName, collectionName) + '/' + encodeURIComponent(JSON.stringify(documentId));
+export const buildDocumentURL = function (base, dbName, collectionName, documentId, queryOptions = {}) {
+  let url = buildCollectionURL(base, dbName, collectionName) + '/' + encodeURIComponent(JSON.stringify(documentId));
+
+  if (Object.keys(queryOptions).length) {
+    url += '?' + querystring.encode(queryOptions);
+  }
+
+  return url;
 };
 
 export const isValidDatabaseName = function (name) {

diff --git a/lib/views/collection.html b/lib/views/collection.html
@@ -262,9 +262,9 @@ <h2>Add Indexes</h2>
       </thead>
       {% for document in docs %}
         {% if document._id._bsontype == 'Binary' %}
-        <tr onclick="loadDocument('{{ collectionUrl }}/{{ document._id | json | safe | url_encode }}?subtype={{ document._id.sub_type }}')">
+        <tr onclick="loadDocument('{{ collectionUrl }}/{{ document._id | json | safe | url_encode }}?subtype={{ document._id.sub_type }}&skip={{skip}}')">
         {% else %}
-        <tr onclick="loadDocument('{{ collectionUrl }}/{{ document._id | json | safe | url_encode }}')">
+        <tr onclick="loadDocument('{{ collectionUrl }}/{{ document._id | json | safe | url_encode }}?skip={{skip}}')">
         {% endif %}
           {% for column in columns %}
             <td><div class="tableContent">

diff --git a/lib/views/document.html b/lib/views/document.html
@@ -62,12 +62,12 @@
 {% if document._id._bsontype == 'Binary' %}
 <form method="POST"
   id="documentEditForm"
-  action="{{ collectionUrl }}/{{ document._id | json | safe | url_encode }}?subtype={{ document._id.sub_type }}"
+  action="{{ collectionUrl }}/{{ document._id | json | safe | url_encode }}?subtype={{ document._id.sub_type }}&skip={{skip}}"
 >
 {% else %}
 <form method="POST"
   id="documentEditForm"
-  action="{{ collectionUrl }}/{{ document._id | json | safe | url_encode }}"
+  action="{{ collectionUrl }}/{{ document._id | json | safe | url_encode }}?skip={{skip}}"
 >
 {% endif %}