@nitrogenbuilder/connector-payload 0.1.30 → 0.1.32

package/dist/collections/NitrogenTemplates.js

@@ -81,6 +81,16 @@ export const NitrogenTemplates = {
                         },
                     },
                 },
+                {
+                    name: 'templateConditions',
+                    type: 'json',
+                    admin: {
+                        description: 'Template conditions used by the Nitrogen editor',
+                        components: {
+                            Field: '@nitrogenbuilder/connector-payload/components/NitrogenDataViewer',
+                        },
+                    },
+                },
             ],
         },
     ],

package/dist/components/NitrogenEditButton.d.ts

@@ -1,3 +1,4 @@
 export declare const NitrogenEditButton: import("react").ComponentType<{
     collection: string;
+    routePattern?: string;
 }>;

package/dist/components/NitrogenEditButtonRuntime.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
 export declare const NitrogenEditButtonRuntime: React.FC<{
     collection: string;
+    routePattern?: string;
 }>;

package/dist/components/NitrogenEditButtonRuntime.js

@@ -15,16 +15,44 @@ function getPreferredSiteUrl(data) {
     const fallbackUrl = isLocalAdmin ? data.frontendUrl : data.developmentUrl;
     return preferredUrl || fallbackUrl || '';
 }
-export const NitrogenEditButtonRuntime = ({ collection }) => {
+function normalizeRoutePattern(routePattern) {
+    if (!routePattern)
+        return undefined;
+    return routePattern.startsWith('/') ? routePattern : `/${routePattern}`;
+}
+function trimSlashes(value) {
+    return value.replace(/^\/+|\/+$/g, '');
+}
+function buildRelativePath(slug, routePattern, templateSlug) {
+    const normalizedRoutePattern = normalizeRoutePattern(routePattern);
+    if (normalizedRoutePattern) {
+        if (normalizedRoutePattern.includes('[...slug]')) {
+            return normalizedRoutePattern.replace('[...slug]', slug);
+        }
+        if (normalizedRoutePattern.includes('[slug]')) {
+            return normalizedRoutePattern.replace('[slug]', slug);
+        }
+        return normalizedRoutePattern.endsWith('/')
+            ? `${normalizedRoutePattern}${slug}`
+            : normalizedRoutePattern;
+    }
+    if (templateSlug) {
+        return `/${trimSlashes(templateSlug)}/${trimSlashes(slug)}`;
+    }
+    return `/${trimSlashes(slug)}`;
+}
+export const NitrogenEditButtonRuntime = ({ collection, routePattern }) => {
     const [id, setId] = useState(undefined);
     const [token, setToken] = useState(undefined);
     const [slug, setSlug] = useState(undefined);
     const [frontendUrl, setFrontendUrl] = useState(undefined);
     const [instanceUrl, setInstanceUrl] = useState(undefined);
     const [authorId, setAuthorId] = useState(undefined);
+    const [templateSlug, setTemplateSlug] = useState(undefined);
     useEffect(() => {
         const segments = window.location.pathname.split('/').filter(Boolean);
         const docId = segments.length >= 4 ? segments[3] : undefined;
+        const shouldResolveTemplateSlug = collection !== 'nitrogen-templates' && !routePattern;
         if (docId) {
             setId(docId);
             fetch(`/api/${collection}/${docId}`)
@@ -38,6 +66,29 @@ export const NitrogenEditButtonRuntime = ({ collection }) => {
                 console.error('Failed to fetch document:', err);
             });
         }
+        setTemplateSlug(undefined);
+        if (shouldResolveTemplateSlug) {
+            const params = new URLSearchParams();
+            params.set('where[associatedCollection][equals]', collection);
+            params.set('where[status][equals]', 'published');
+            params.set('limit', '1');
+            params.set('depth', '0');
+            fetch(`/api/nitrogen-templates?${params.toString()}`)
+                .then((res) => res.json())
+                .then((data) => {
+                const doc = Array.isArray(data?.docs) ? data.docs[0] : undefined;
+                if (typeof doc?.slug === 'string') {
+                    setTemplateSlug(doc.slug);
+                }
+                else {
+                    setTemplateSlug(null);
+                }
+            })
+                .catch((err) => {
+                console.error('Failed to fetch nitrogen template:', err);
+                setTemplateSlug(null);
+            });
+        }
         fetch('/api/users/me')
             .then((res) => res.json())
             .then((data) => {
@@ -65,7 +116,7 @@ export const NitrogenEditButtonRuntime = ({ collection }) => {
             .catch((err) => {
             console.error('Failed to fetch nitrogen settings:', err);
         });
-    }, [collection]);
+    }, [collection, routePattern]);
     if (!id || !token || !authorId)
         return null;
     const editorBase = instanceUrl ?? '';
@@ -73,13 +124,18 @@ export const NitrogenEditButtonRuntime = ({ collection }) => {
     const encodedAuthorId = encodeURIComponent(authorId);
     const developmentFlags = isDevelopmentMode ? '&development=true' : '';
     const editHref = `${editorBase}/nitrogen-editor?token=${encodeURIComponent(token)}&collection=${encodeURIComponent(collection)}&pageId=${id}&authorId=${encodedAuthorId}&author=${encodedAuthorId}${developmentFlags}`;
-    const viewHref = collection === 'nitrogen-templates'
-        ? `${frontendUrl}/nitrogen-templates/${slug}`
-        : `${frontendUrl}/${slug}`;
+    const viewRelativePath = collection === 'nitrogen-templates'
+        ? `/nitrogen-templates/${trimSlashes(slug || '')}`
+        : buildRelativePath(slug || '', routePattern, templateSlug ?? undefined);
+    const viewHref = `${frontendUrl}${viewRelativePath}`;
     const editButtonVars = isDevelopmentMode
         ? nitrogenEditDevButtonVars
         : nitrogenEditLiveButtonVars;
-    return (_jsxs("div", { style: nitrogenButtonGroupStyle, children: [slug && frontendUrl && (_jsx(Button, { buttonStyle: "primary", el: "anchor", margin: false, newTab: true, url: viewHref, extraButtonProps: {
+    return (_jsxs("div", { style: nitrogenButtonGroupStyle, children: [slug &&
+                frontendUrl &&
+                (collection === 'nitrogen-templates' ||
+                    routePattern ||
+                    templateSlug !== undefined) && (_jsx(Button, { buttonStyle: "primary", el: "anchor", margin: false, newTab: true, url: viewHref, extraButtonProps: {
                     style: nitrogenViewButtonVars,
                 }, children: collection === 'nitrogen-templates' ? 'View Template' : 'View Page' })), _jsx(Button, { buttonStyle: "primary", el: "anchor", margin: false, newTab: true, url: editHref, extraButtonProps: {
                     style: editButtonVars,

package/dist/components/NitrogenViewButton.d.ts

@@ -1,3 +1,4 @@
 export declare const NitrogenViewButton: import("react").ComponentType<{
     collection: string;
+    routePattern?: string;
 }>;

package/dist/components/NitrogenViewButtonRuntime.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
 export declare const NitrogenViewButtonRuntime: React.FC<{
     collection: string;
+    routePattern?: string;
 }>;

package/dist/components/NitrogenViewButtonRuntime.js

@@ -12,12 +12,40 @@ function getPreferredSiteUrl(data) {
     const fallbackUrl = isLocalAdmin ? data.frontendUrl : data.developmentUrl;
     return preferredUrl || fallbackUrl || '';
 }
-export const NitrogenViewButtonRuntime = ({ collection }) => {
+function normalizeRoutePattern(routePattern) {
+    if (!routePattern)
+        return undefined;
+    return routePattern.startsWith('/') ? routePattern : `/${routePattern}`;
+}
+function trimSlashes(value) {
+    return value.replace(/^\/+|\/+$/g, '');
+}
+function buildRelativePath(slug, routePattern, templateSlug) {
+    const normalizedRoutePattern = normalizeRoutePattern(routePattern);
+    if (normalizedRoutePattern) {
+        if (normalizedRoutePattern.includes('[...slug]')) {
+            return normalizedRoutePattern.replace('[...slug]', slug);
+        }
+        if (normalizedRoutePattern.includes('[slug]')) {
+            return normalizedRoutePattern.replace('[slug]', slug);
+        }
+        return normalizedRoutePattern.endsWith('/')
+            ? `${normalizedRoutePattern}${slug}`
+            : normalizedRoutePattern;
+    }
+    if (templateSlug) {
+        return `/${trimSlashes(templateSlug)}/${trimSlashes(slug)}`;
+    }
+    return `/${trimSlashes(slug)}`;
+}
+export const NitrogenViewButtonRuntime = ({ collection, routePattern }) => {
     const [slug, setSlug] = useState(undefined);
     const [siteUrl, setSiteUrl] = useState(undefined);
+    const [templateSlug, setTemplateSlug] = useState(undefined);
     useEffect(() => {
         const segments = window.location.pathname.split('/').filter(Boolean);
         const docId = segments.length >= 4 ? segments[3] : undefined;
+        const shouldResolveTemplateSlug = collection !== 'nitrogen-templates' && !routePattern;
         if (!docId)
             return;
         fetch(`/api/${collection}/${docId}`)
@@ -30,6 +58,29 @@ export const NitrogenViewButtonRuntime = ({ collection }) => {
             .catch((err) => {
             console.error('Failed to fetch document:', err);
         });
+        setTemplateSlug(undefined);
+        if (shouldResolveTemplateSlug) {
+            const params = new URLSearchParams();
+            params.set('where[associatedCollection][equals]', collection);
+            params.set('where[status][equals]', 'published');
+            params.set('limit', '1');
+            params.set('depth', '0');
+            fetch(`/api/nitrogen-templates?${params.toString()}`)
+                .then((res) => res.json())
+                .then((data) => {
+                const doc = Array.isArray(data?.docs) ? data.docs[0] : undefined;
+                if (typeof doc?.slug === 'string') {
+                    setTemplateSlug(doc.slug);
+                }
+                else {
+                    setTemplateSlug(null);
+                }
+            })
+                .catch((err) => {
+                console.error('Failed to fetch nitrogen template:', err);
+                setTemplateSlug(null);
+            });
+        }
         fetch('/api/globals/nitrogen-settings')
             .then((res) => res.json())
             .then((data) => {
@@ -41,11 +92,17 @@ export const NitrogenViewButtonRuntime = ({ collection }) => {
             .catch((err) => {
             console.error('Failed to fetch nitrogen settings:', err);
         });
-    }, [collection]);
+    }, [collection, routePattern]);
     if (!slug || !siteUrl) {
         return null;
     }
-    const href = `${siteUrl}/${slug}`;
+    if (collection !== 'nitrogen-templates' && !routePattern && templateSlug === undefined) {
+        return null;
+    }
+    const relativePath = collection === 'nitrogen-templates'
+        ? `/nitrogen-templates/${trimSlashes(slug)}`
+        : buildRelativePath(slug, routePattern, templateSlug ?? undefined);
+    const href = `${siteUrl}${relativePath}`;
     return (_jsx(Button, { buttonStyle: "primary", el: "anchor", margin: false, newTab: true, url: href, extraButtonProps: {
             style: nitrogenViewButtonVars,
         }, children: "View Page" }));

package/dist/endpoints/templates.js

@@ -3,6 +3,9 @@ import { buildPermalink, buildRelativePermalink } from '../collection-registry';
 function isContentTemplateCollection(collection) {
     return !!collection && collection !== 'header' && collection !== 'footer';
 }
+function getTemplateConditions(doc) {
+    return doc.templateConditions ?? { conditionGroups: [] };
+}
 function getTemplatePreviewTarget(doc, settings, associatedCollection, associatedDoc) {
     const previewCollection = associatedDoc && isContentTemplateCollection(associatedCollection)
         ? associatedCollection
@@ -65,6 +68,7 @@ export const templatesEndpoints = [
                     permalink: previewTarget.permalink,
                     relative_permalink: previewTarget.relative_permalink,
                     postType: associatedCollection || '',
+                    templateConditions: getTemplateConditions(doc),
                     headerTemplate: isContentTemplateCollection(associatedCollection) ? headerTemplate : null,
                     footerTemplate: isContentTemplateCollection(associatedCollection) ? footerTemplate : null,
                 });
@@ -151,6 +155,7 @@ export const templatesEndpoints = [
                     permalink: previewTarget.permalink,
                     relative_permalink: previewTarget.relative_permalink,
                     postType: associatedCollection || '',
+                    templateConditions: getTemplateConditions(doc),
                     headerTemplate: isContentTemplateCollection(associatedCollection) ? headerTemplate : null,
                     footerTemplate: isContentTemplateCollection(associatedCollection) ? footerTemplate : null,
                 });
@@ -172,10 +177,13 @@ export const templatesEndpoints = [
             const id = routeParams?.id;
             const body = (await req.json?.());
             const data = (body?.data && typeof body.data === 'object') ? body.data : body;
-            if (!data?.title) {
-                return Response.json({ error: 'Title is required' }, { status: 400 });
+            if (!data) {
+                return Response.json({ error: 'No update data provided' }, { status: 400 });
+            }
+            const updateData = {};
+            if (data.title !== undefined) {
+                updateData.title = data.title;
             }
-            const updateData = { title: data.title };
             if (data.author) {
                 updateData.author = data.author;
             }
@@ -189,6 +197,12 @@ export const templatesEndpoints = [
             if (data.settings !== undefined) {
                 updateData.templateSettings = data.settings;
             }
+            if (data.conditions !== undefined) {
+                updateData.templateConditions = data.conditions;
+            }
+            if (Object.keys(updateData).length === 0) {
+                return Response.json({ error: 'No update data provided' }, { status: 400 });
+            }
             await payload.update({
                 collection: 'nitrogen-templates',
                 id,

package/dist/index.js

@@ -120,7 +120,7 @@ export const nitrogenConnectorPlugin = (options = {}) => (incomingConfig) => {
                             ...beforeControls,
                             {
                                 path: "@nitrogenbuilder/connector-payload/components/NitrogenEditButton#NitrogenEditButton",
-                                clientProps: { collection: slug },
+                                clientProps: { collection: slug, routePattern },
                             },
                         ],
                     },

package/dist/types.d.ts

@@ -28,6 +28,7 @@ export interface NitrogenTemplateDoc extends NitrogenDocBase {
     templateType?: string;
     associatedCollection?: string;
     templateSettings?: JsonObject;
+    templateConditions?: JsonObject;
 }
 export interface NitrogenSettingsGlobal {
     licenseKey?: string;
@@ -99,6 +100,7 @@ export interface TemplateUpdateRequestBody {
     data_content?: string | JsonObject[];
     templateType?: string;
     settings?: JsonObject;
+    conditions?: JsonObject;
 }
 interface TemplateUpdateData {
     title?: string;
@@ -106,6 +108,7 @@ interface TemplateUpdateData {
     data?: string | JsonObject[];
     templateType?: string;
     settings?: JsonObject;
+    conditions?: JsonObject;
 }
 export interface SlugLookupRequestBody {
     slug?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nitrogenbuilder/connector-payload",
-  "version": "0.1.30",
+  "version": "0.1.32",
   "description": "Nitrogen page builder connector plugin for Payload CMS 3.x",
   "author": "Leonardo Dentzien <leo@torchmedia.ca>",
   "type": "module",