mcp-magento-cms 1.0.4 → 1.2.0

package/src/magentoClient.js

@@ -141,25 +141,116 @@ export class MagentoClient {
     return this.get(`/cmsPage/${pageId}`);
   }
 
+  /**
+   * Magento 2.4.8 cmsPage REST uses `active` (not `is_active`) and rejects
+   * store_id / unknown fields with "%fieldName is not supported".
+   * Accept either name from callers; always send `active` on the wire.
+   */
+  normalizePagePayload(page, { requireId } = {}) {
+    const allowed = [
+      'title',
+      'identifier',
+      'content',
+      'content_heading',
+      'page_layout',
+      'meta_title',
+      'meta_keywords',
+      'meta_description',
+      'active',
+      'custom_theme',
+      'custom_root_template',
+      'layout_update_xml',
+      'custom_theme_from',
+      'custom_theme_to',
+    ];
+    const payload = {};
+    if (requireId != null) payload.id = Number(requireId);
+    for (const key of allowed) {
+      if (page[key] !== undefined) payload[key] = page[key];
+    }
+    if (page.is_active !== undefined && payload.active === undefined) {
+      payload.active = page.is_active;
+    }
+    if (page.active !== undefined) payload.active = page.active;
+    return payload;
+  }
+
   async createPage(page) {
-    return this.post('/cmsPage', { page });
+    return this.post('/cmsPage', {
+      page: this.normalizePagePayload(page),
+    });
   }
 
   async updatePage(pageId, page) {
-    return this.put(`/cmsPage/${pageId}`, { page: { ...page, id: Number(pageId) } });
+    return this.put(`/cmsPage/${pageId}`, {
+      page: this.normalizePagePayload(page, { requireId: pageId }),
+    });
   }
 
   async getBlock(blockId) {
     return this.get(`/cmsBlock/${blockId}`);
   }
 
+  /**
+   * Magento 2.4.8 cmsBlock REST uses `active` (not `is_active`), same as cmsPage.
+   * Accept either name from callers; always send `active` on the wire.
+   */
+  normalizeBlockPayload(block, { requireId } = {}) {
+    const allowed = ['title', 'identifier', 'content', 'active'];
+    const payload = {};
+    if (requireId != null) payload.id = Number(requireId);
+    for (const key of allowed) {
+      if (block[key] !== undefined) payload[key] = block[key];
+    }
+    if (block.is_active !== undefined && payload.active === undefined) {
+      payload.active = block.is_active;
+    }
+    if (block.active !== undefined) payload.active = block.active;
+    return payload;
+  }
+
   async createBlock(block) {
-    return this.post('/cmsBlock', { block });
+    // Magento REST rejects unsupported fields (e.g. store_id / is_active) on cmsBlock POST.
+    return this.post('/cmsBlock', {
+      block: this.normalizeBlockPayload(block),
+    });
   }
 
   async updateBlock(blockId, block) {
     return this.put(`/cmsBlock/${blockId}`, {
-      block: { ...block, id: Number(blockId) },
+      block: this.normalizeBlockPayload(block, { requireId: blockId }),
     });
   }
+
+  /**
+   * Search CMS pages by identifier (exact or like).
+   * @param {string} identifier
+   * @param {'eq'|'like'} [conditionType]
+   */
+  async searchPagesByIdentifier(identifier, conditionType = 'eq') {
+    const value =
+      conditionType === 'like' ? `%${identifier}%` : identifier;
+    const q =
+      `/cmsPage/search?searchCriteria[filterGroups][0][filters][0][field]=identifier` +
+      `&searchCriteria[filterGroups][0][filters][0][value]=${encodeURIComponent(value)}` +
+      `&searchCriteria[filterGroups][0][filters][0][conditionType]=${conditionType}` +
+      `&searchCriteria[pageSize]=20`;
+    return this.get(q);
+  }
+
+  /**
+   * Search CMS blocks by identifier (exact or like).
+   * @param {string} identifier
+   * @param {'eq'|'like'} [conditionType]
+   */
+  async searchBlocksByIdentifier(identifier, conditionType = 'eq') {
+    const value =
+      conditionType === 'like' ? `%${identifier}%` : identifier;
+    const q =
+      `/cmsBlock/search?searchCriteria[filterGroups][0][filters][0][field]=identifier` +
+      `&searchCriteria[filterGroups][0][filters][0][value]=${encodeURIComponent(value)}` +
+      `&searchCriteria[filterGroups][0][filters][0][conditionType]=${conditionType}` +
+      `&searchCriteria[pageSize]=20`;
+    return this.get(q);
+  }
 }

package/src/pageBuilder.js

@@ -1,93 +1,73 @@
 /**
- * Page Builder simple text: Row (contained) → Text
- * Matches Brainvire_CmsContentStudio SimpleTextComposer.
+ * Page Builder composition API (project-agnostic).
+ * - composeFromFields / composePageBuilderSimpleText: Row → Text (legacy simple)
+ * - composeDocument / composeElement: full native content-type tree
+ * See pageBuilderElements.js for all Magento_PageBuilder types.
  */
 
-function escapeHtml(value) {
-  return String(value)
-    .replace(/&/g, '&')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&#039;');
-}
-
-function looksLikeHtml(value) {
-  return /<[^>]+>/.test(value);
-}
-
-function plainTextToParagraphs(text) {
-  const parts = String(text)
-    .split(/\r\n|\r|\n/)
-    .map((l) => l.trim())
-    .filter(Boolean)
-    .map((l) => `<p>${escapeHtml(l)}</p>`);
-  return parts.length ? parts.join('') : '<p></p>';
-}
-
-function normalizeInnerHtml(htmlContent) {
-  const t = String(htmlContent || '').trim();
-  if (!t) return '<p></p>';
-  if (!looksLikeHtml(t)) return plainTextToParagraphs(t);
-  return t;
-}
+import {
+  composeDocument,
+  composeElement,
+  StyleBag,
+  normalizeHtml,
+  escapeHtml,
+  PAGEBUILDER_ELEMENT_TYPES,
+  describeElements,
+} from './pageBuilderElements.js';
 
-function generateStyleId(prefix) {
-  const random = [...Array(12)]
-    .map(() => Math.floor(Math.random() * 16).toString(16))
-    .join('');
-  return `${prefix}${random}`.toUpperCase();
-}
+export {
+  composeDocument,
+  composeElement,
+  StyleBag,
+  normalizeHtml,
+  escapeHtml,
+  PAGEBUILDER_ELEMENT_TYPES,
+  describeElements,
+};
 
 /**
  * @param {string} htmlContent
  * @returns {string}
  */
 export function composePageBuilderSimpleText(htmlContent) {
-  const inner = normalizeInnerHtml(htmlContent);
-  const rowStyleId = generateStyleId('R');
-  const textStyleId = generateStyleId('T');
-
-  return (
-    `<div data-content-type="row" data-appearance="contained" data-element="main">` +
-    `<div data-enable-parallax="0" data-parallax-speed="0.5" data-background-images="{}"` +
-    ` data-background-type="image" data-video-loop="true" data-video-play-only-visible="true"` +
-    ` data-video-lazy-load="true" data-video-fallback-src="" data-element="inner"` +
-    ` data-pb-style="${rowStyleId}"` +
-    ` style="justify-content: flex-start; display: flex; flex-direction: column;` +
-    ` background-position: left top; background-size: cover; background-repeat: no-repeat;` +
-    ` background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px;` +
-    ` margin: 0px 0px 10px; padding: 10px;">` +
-    `<div data-content-type="text" data-appearance="default" data-element="main"` +
-    ` data-pb-style="${textStyleId}" class="bypass-html-filter"` +
-    ` style="border-style: none; border-width: 1px; border-radius: 0px; margin: 0px; padding: 0px;">` +
-    `${inner}` +
-    `</div></div></div>` +
-    `<style>` +
-    `#html-body [data-pb-style=${rowStyleId}]{justify-content:flex-start;display:flex;flex-direction:column;` +
-    `background-position:left top;background-size:cover;background-repeat:no-repeat;` +
-    `background-attachment:scroll}` +
-    `#html-body [data-pb-style=${textStyleId}]{border-style:none}` +
-    `</style>`
-  );
+  const doc = composeDocument([
+    {
+      type: 'row',
+      appearance: 'contained',
+      children: [{ type: 'text', html: htmlContent }],
+    },
+  ]);
+  return doc.html;
 }
 
 /**
  * @param {{ content?: string, headline?: string, subheadline?: string }} fields
  */
 export function composeFromFields(fields = {}) {
-  const chunks = [];
+  const children = [];
   const headline = (fields.headline || '').trim();
   const subheadline = (fields.subheadline || '').trim();
   const content = (fields.content || fields.source_content || '').trim();
 
-  if (headline) chunks.push(`<h2>${escapeHtml(headline)}</h2>`);
-  if (subheadline) chunks.push(`<p><strong>${escapeHtml(subheadline)}</strong></p>`);
+  if (headline) {
+    children.push({ type: 'heading', text: headline, heading_type: 'h2' });
+  }
+  if (subheadline) {
+    children.push({
+      type: 'text',
+      html: `<p><strong>${escapeHtml(subheadline)}</strong></p>`,
+    });
+  }
   if (content) {
-    chunks.push(looksLikeHtml(content) ? content : plainTextToParagraphs(content));
+    children.push({ type: 'text', html: normalizeHtml(content) });
+  }
+  if (!children.length) {
+    children.push({ type: 'text', html: '<p></p>' });
   }
 
-  return composePageBuilderSimpleText(chunks.length ? chunks.join('') : '<p></p>');
+  return composeDocument([
+    { type: 'row', appearance: 'contained', children },
+  ]).html;
 }
 
 export function generateIdentifier(title) {
@@ -99,10 +79,28 @@ export function generateIdentifier(title) {
   return value || `page-${Date.now()}`;
 }
 
+/**
+ * Lightweight check that HTML looks like Page Builder master format.
+ * Prefer validatePageBuilderContent for stage-safety.
+ */
 export function validatePageBuilderHtml(html) {
   return (
     typeof html === 'string' &&
     html.includes('data-content-type="row"') &&
-    html.includes('data-content-type="text"')
+    (html.includes('data-content-type="text"') ||
+      html.includes('data-content-type="heading"') ||
+      html.includes('data-content-type="banner"') ||
+      html.includes('data-content-type="html"') ||
+      html.includes('data-content-type="image"') ||
+      html.includes('data-content-type="columns"') ||
+      html.includes('data-content-type="column-group"') ||
+      html.includes('data-content-type="buttons"') ||
+      html.includes('data-content-type="slider"') ||
+      html.includes('data-content-type="tabs"') ||
+      html.includes('data-content-type="products"') ||
+      html.includes('data-content-type="block"') ||
+      html.includes('data-content-type="video"') ||
+      html.includes('data-content-type="divider"') ||
+      html.includes('data-content-type="map"'))
   );
 }