Shortcuts don't use the query params #328

enonic · May 7, 2024 · 9cf7b58 · 9cf7b58
1 parent 43fff4c
commit 9cf7b58
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/guillotine/validateShortcut.ts b/src/guillotine/validateShortcut.ts
@@ -9,15 +9,21 @@ import {UrlProcessor} from '../common/UrlProcessor';
 
 export function validateShortcut(props: FetchContentResult): void {
     const {data, meta, error} = props;
-    const pageUrl = data?.get?.data?.target?.pageUrl;
+    const dataObj = data?.get?.data;
+    const pageUrl = dataObj?.target?.pageUrl;
+    const parameters = dataObj?.parameters;
     if (meta.type === 'base:shortcut' && pageUrl) {
         if (meta.renderMode !== RENDER_MODE.NEXT) {
             // do not show shortcut targets in preview/edit mode
             console.warn(404, `Shortcuts are not available in ${RENDER_MODE.NEXT} render mode`);
             notFound();
         }
 
-        const destination = UrlProcessor.process(pageUrl, meta, true);
+        let destination = UrlProcessor.process(pageUrl, meta, true);
+        if (parameters) {
+            const searchParams = parameters.map(({name, value}) => `${encodeURIComponent(name)}=${encodeURIComponent(value)}`).join('&');
+            destination += '?' + searchParams;
+        }
         console.debug(`Redirecting shortcut content [${meta.path}] to`, destination);
         redirect(destination, RedirectType.replace);
     }
@@ -34,4 +40,4 @@ export function validateShortcut(props: FetchContentResult): void {
         console.warn(404, `Can not render content at [${meta.path}]`);
         notFound();
     }
-}
+}
diff --git a/src/query/Shortcut.ts b/src/query/Shortcut.ts
@@ -7,6 +7,10 @@ export const getShortcutQuery = `
             target {
               pageUrl(type: absolute)
             }
+            parameters {
+              name
+              value
+            }
           }
         }
       }