#83: simplify enonic-connection-config.js

enonic · Oct 18, 2021 · 9cad670 · 9cad670
1 parent 1474cf6
commit 9cad670
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/src/enonic-connection-config.js b/src/enonic-connection-config.js
@@ -4,32 +4,25 @@ const mode = DEVELOPMENT;
 
 
 /** XP server domain, incl. protocol:// and :port. Eg. 'localhost:8080' in localhost:8080/site/default/draft/mysite/api */
-const apiDomain = "http://hmdb-draft:8080";
-
+const apiDomain = "http://localhost:8080";
 
 /** Which site this server communicates with: content item _name for the root site item */
 const siteName = 'hmdb';
 
-/** Branch-specific (and domain-less) root URL to the XP site content, sensitive to XP vhosting. Eg. 'site/default/draft/mysite' in localhost:8080/site/default/draft/mysite */
-const siteRoot = ''; //`site/hmdb/draft/${siteName}`;
-
-/** Mapped pattern to the controller of of the API, eg. 'api' in localhost:8080/site/default/draft/mysite/api */
-const apiPostfix = '_guillotine';
+/** URL to the guillotine API */
+const contentApiUrl = `${apiDomain}/site/hmdb/draft/${siteName}/api`;
 
 /** full app key = appName in gradle.properties in the XP app */
 const appKey = "com.example.myproject";
 
 /** The domain (full: with protocol and port if necessary) of this next.js server */
 const nextDomain = "http://localhost:3000";
 
-/** Where requests from XP CS previews (requesting next renderings) will come from */
+/** Where requests from XP CS previews (requesting next renderings) will come from. Identical out of the box, but may not always be. */
 const xpPreviewOrigin = apiDomain;
 
-const FROM_XP_PARAM = '__fromXp__';
 
-
-const siteUrl = `${apiDomain}/${siteRoot}`;
-const contentApiUrl = `${siteUrl}/${apiPostfix}`;
+const FROM_XP_PARAM = '__fromXp__';
 
 const publicPattern = new RegExp('^/*');
 
@@ -42,7 +35,6 @@ module.exports = {
     apiDomain,
     xpPreviewOrigin,
     siteName,
-    siteRoot,
     contentApiUrl,
     fromXpParam: FROM_XP_PARAM,
 

diff --git a/src/shared/data/fetchContent.ts b/src/shared/data/fetchContent.ts
@@ -44,7 +44,8 @@ export type ContentResult = Result & {
 
 type FetcherConfig<T extends {
     contentApiUrl: string,
-    getXpPath: (siteRelativeContentPath: string) => string
+    getXpPath: (siteRelativeContentPath: string) => string,
+    fromXpParam: string
 }> = {
     enonicConnectionConfig: T,
     typeSelector?: TypeSelector,
@@ -158,7 +159,7 @@ export const buildContentFetcher = <T extends {
     }: FetcherConfig<T>
 ): ContentFetcher => {
 
-    const { contentApiUrl, getXpPath } = enonicConnectionConfig;
+    const { contentApiUrl, getXpPath, fromXpParam } = enonicConnectionConfig;
 
     const defaultGetVariables: VariablesGetter = (path) => ({ path });
 
@@ -306,7 +307,8 @@ export const buildContentFetcher = <T extends {
             } as ContentResult;
 
             // .meta will be visible in final rendered inline props. Only adding .requestIsFromXp here if the page is actually viewed through content studio, in which case this is true (instead if always adding it and letting it be visible as false)
-            if (context?.query?.__fromXp__) {
+            // @ts-ignore
+            if ((context?.query || {})[fromXpParam]) {
                 // @ts-ignore
                 response.meta.requestIsFromXp = true
             }