Merge pull request #29 from apostrophecms/document-skip-option

Document skip option, fix another bug
apostrophecms · Mar 5, 2024 · ce28a11 · ce28a11
2 parents 6fb6b75 + ba5cc84
commit ce28a11
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/i18n/en.json b/i18n/en.json
@@ -7,8 +7,8 @@
   "urlType": "Link Type",
   "urlTypeInternal": "Internal Page",
   "urlTypeExternal": "External URL",
-  "ignoreQuery": "Ignore query string when matching.",
-  "forwardQuery": "Forward query string.",
+  "ignoreQuery": "Ignore query string when matching",
+  "forwardQuery": "Forward query string",
   "newPage": "Page Title",
   "external": "URL",
   "statusCode": "Redirect Type",

diff --git a/index.js b/index.js
@@ -197,10 +197,16 @@ module.exports = {
             }
 
             const foundTarget = results.find(({ redirectSlug }) => redirectSlug === slug) ||
-            results.find(({
-              redirectSlug,
-              ignoreQueryString
-            }) => redirectSlug === pathOnly && ignoreQueryString);
+              results.find(({
+                redirectSlug,
+                ignoreQueryString
+              }) => redirectSlug === pathOnly && ignoreQueryString);
+
+            if (!foundTarget) {
+              // Query will produce a match if the path matches, but we need
+              // to implement ignoreQueryString: false properly
+              return await emitAndRedirectOrNext();
+            }
 
             const shouldForwardQueryString = foundTarget && foundTarget.forwardQueryString;