@designcrowd/library.brand-page 6.1.1-json-prereq-4 → 6.1.1

package/src/metadata-builder/sanitizers/rte-schema-check.ts

@@ -1,6 +1,16 @@
-import { getSchema } from '@tiptap/core';
-import type { Schema } from '@tiptap/pm/model';
-import { getRteExtensions } from '../../brand-page-maker/composables/rich-text-editor/getRteExtensions';
+import { Editor } from '@tiptap/vue-3';
+import StarterKit from '@tiptap/starter-kit';
+import Underline from '@tiptap/extension-underline';
+import TextStyle from '@tiptap/extension-text-style';
+import TextAlign from '@tiptap/extension-text-align';
+import FontFamily from '@tiptap/extension-font-family';
+import ColorExtension from '@tiptap/extension-color';
+import Highlight from '@tiptap/extension-highlight';
+import Link from '@tiptap/extension-link';
+import { FontSize } from '../../brand-page-maker/composables/rich-text-editor/extensions/FontSize';
+import { LetterSpacing } from '../../brand-page-maker/composables/rich-text-editor/extensions/LetterSpacing';
+import { LineHeight } from '../../brand-page-maker/composables/rich-text-editor/extensions/LineHeight';
+import { AutoLink } from '../../brand-page-maker/composables/rich-text-editor/extensions/AutoLink';
 import { isTiptapDocument } from '../parsers/section-tool-arguments';
 import {
   rteStyleCheck,
@@ -9,30 +19,45 @@ import {
 } from './section-args-validator';
 
 /**
- * The ProseMirror schema built from the SAME extension set the editor and
- * renderer use (`getRteExtensions`), so validation matches real editor output.
- * `getSchema` is DOM-less (no Editor instance) and the schema is pure, so it is
- * built once and cached.
- *
- * We import `getRteExtensions` (a leaf module — @tiptap + prosemirror only), not
- * the maker composable (`useExternalRichTextEditor`), which would pull in the
- * AI executor → section-builders → section-rules graph and re-enter this file
- * before its exports are bound.
+ * Constructs a headless Tiptap Editor with the same extension set as
+ * `useExternalRichTextEditor` in the maker. We import the Tiptap extension
+ * files directly (they are leaf modules) instead of going through the maker
+ * composable, which would pull in the AI executor → section-builders →
+ * section-rules graph and re-enter this file before its exports are bound.
  */
-let cachedSchema: Schema | undefined;
-
-const getRteSchema = (): Schema =>
-  (cachedSchema ??= getSchema(getRteExtensions()));
+const buildHeadlessEditor = (): Editor =>
+  new Editor({
+    editable: false,
+    extensions: [
+      StarterKit,
+      Underline,
+      TextStyle.configure({ mergeNestedSpanStyles: true }),
+      TextAlign.configure({ types: ['heading', 'paragraph'] }),
+      FontFamily.configure({ types: ['textStyle'] }),
+      FontSize,
+      LetterSpacing,
+      LineHeight,
+      ColorExtension.configure({ types: ['textStyle'] }),
+      Highlight.configure({ multicolor: true }),
+      Link.configure({
+        openOnClick: false,
+        defaultProtocol: 'https',
+        autolink: true,
+      }),
+      AutoLink,
+    ],
+  });
 
 /**
- * Validates a Tiptap doc against the real ProseMirror schema
- * (`schema.nodeFromJSON`). Catches malformed AI input — stray non-node children
- * in `content`, unknown node types, malformed attrs — before the builder runs
- * and the renderer's silent `setContent` drops the doc to `<p></p>` (BP-5669).
+ * Validates a Tiptap doc against the headless editor's real ProseMirror
+ * schema (`schema.nodeFromJSON`). Catches malformed AI input — stray
+ * non-node children in `content`, unknown node types, malformed attrs —
+ * before the builder runs and the renderer's silent `setContent` drops
+ * the doc to `<p></p>` (BP-5669).
  *
- * Returns the field-prefixed error string so the AI's tool-call retry loop reads
- * it via `BuilderResult.errors` → `tool_result.errorMessage` and re-emits a
- * corrected payload.
+ * Returns the field-prefixed error string so the AI's tool-call retry
+ * loop reads it via `BuilderResult.errors` → `tool_result.errorMessage`
+ * and re-emits a corrected payload.
  */
 export const rteSchemaCheck =
   (field: string): SectionCheck =>
@@ -41,14 +66,18 @@ export const rteSchemaCheck =
 
     if (!isTiptapDocument(value)) return null;
 
+    const editor = buildHeadlessEditor();
+
     try {
-      getRteSchema().nodeFromJSON(value);
+      editor.schema.nodeFromJSON(value);
 
       return null;
     } catch (err) {
       const detail = err instanceof Error ? err.message : String(err);
 
       return `"${field}" is not valid Tiptap JSON: ${detail}`;
+    } finally {
+      editor.destroy();
     }
   };
 

package/src/shared/content-settings/components/GenericTextInput.mixin.ts

@@ -6,7 +6,7 @@ import { TextInput, Textarea } from '@designcrowd/fe-shared-lib';
 import type { ContentItemFieldSettings } from '../models';
 import {
   encodeContentText,
-  getContentTextLength,
+  escapeContentText,
   unescapeContentText,
 } from '@brand-page/utils';
 import { genericTextInputTr } from '@src/composables/useTranslate';
@@ -107,6 +107,7 @@ export default defineComponent({
       _oldValue: '' as string,
       isDirty: false,
       emitChangeDebounce: undefined as DebounceHandle | undefined,
+      lengthError: false,
       // Whether every write in the current debounce burst was an RTE
       // hydration write-back (see UpdateItemValuePayload.isHydrationWrite).
       // undefined = no burst pending; any user write downgrades it to false.
@@ -129,30 +130,6 @@ export default defineComponent({
       return this.settings?.isValid;
     },
 
-    // Derived from the current value + maxLength (not hand-synced in a watcher):
-    // stays correct when maxLength or showRichTextEditor change and on first
-    // render, and flips the instant `_value` updates rather than after the emit
-    // round-trips back through the `value` prop. `>=` (not `>`) because the RTE
-    // MaxLength extension hard-gates the length, so "reached the cap" is the
-    // signal to surface. Length is measured with getContentTextLength so it
-    // matches the editor's own char count (ProseMirror textContent) — NOT
-    // escapeContentText, whose space-join over-counts by one per mark boundary
-    // (e.g. hyperlinking a word), reporting length+1 at the cap (BP-5787).
-    lengthError(): boolean {
-      const value = this._value;
-      const maxLength = this.maxLength;
-
-      if (maxLength == null || value === false || value == null) {
-        return false;
-      }
-
-      const length = this.showRichTextEditor
-        ? getContentTextLength(value)
-        : value.length;
-
-      return length >= maxLength;
-    },
-
     label(): string {
       return this.name.replace(/./, (c: string) => c.toUpperCase());
     },
@@ -198,24 +175,16 @@ export default defineComponent({
     },
   },
   watch: {
-    value(newVal: string | undefined, oldVal: string | undefined) {
-      // BP-5787: RTE values are Tiptap JSON objects. The parent (TextItemsField)
-      // re-clones its items array (cloneDeep) on ANY change — including a sibling
-      // field's style sync — yielding a NEW object reference with identical text
-      // content. For objects Vue fires this watcher on reference change, so that
-      // spurious re-clone would overwrite `_value` and clobber an in-flight edit
-      // (a mark applied but not yet debounced to the store), silently dropping
-      // the user's formatting. Strings never hit this (same content = same
-      // reference = no fire), so mirror that: ignore re-clones whose content is
-      // unchanged from the previous prop value.
-      if (
-        this.showRichTextEditor &&
-        JSON.stringify(newVal) === JSON.stringify(oldVal)
-      ) {
-        return;
-      }
-
+    value(newVal: string | undefined) {
       this._value = newVal;
+
+      if (this.showRichTextEditor) {
+        const textValue = escapeContentText(this._value);
+
+        this.lengthError = textValue && textValue.length >= this.maxLength;
+      } else {
+        this.lengthError = this._value.length >= this.maxLength;
+      }
     },
 
     isToggled(newVal: boolean) {

package/src/shared/content-settings/components/content-settings-item/ContentSettingsItemField.mixin.ts

@@ -21,9 +21,6 @@ import {
   replaceTextInRTE,
   RTE_ALLOWED_SECTION_TYPES,
   isRTEManagedStyleField,
-  isTiptapDocument,
-  renderRteToHtml,
-  toRteJson,
 } from '@brand-page-maker/utils';
 import { isDefaultContentText } from '@shared/content-settings/utils';
 import { useUiLogoSettingsStore } from '../../../logo-settings/store';
@@ -330,20 +327,10 @@ export default defineComponent({
       this.isToggled = isToggled;
     },
     onUseGeneratedText(generatedText: string) {
-      let formattedText: unknown = generatedText;
+      let formattedText = generatedText;
 
-      // BP-5787: preserve the field's formatting when dropping in AI text.
-      // replaceTextInRTE is HTML-based, so JSON is rendered/parsed around it
-      // (cold AI path, shared editor); string fields use it directly.
-      if (this.showRichTextEditor) {
-        if (isTiptapDocument(this.value)) {
-          formattedText =
-            toRteJson(
-              replaceTextInRTE(renderRteToHtml(this.value), generatedText),
-            ) ?? generatedText;
-        } else if (typeof this.value === 'string') {
-          formattedText = replaceTextInRTE(this.value, generatedText);
-        }
+      if (this.showRichTextEditor && typeof this.value === 'string') {
+        formattedText = replaceTextInRTE(this.value, generatedText);
       }
 
       this.contentSettingsStore.updateItemValue({

package/src/shared/content-settings/components/testimonial-items-field/TestimonialItemsField.mixin.ts

@@ -4,7 +4,6 @@ import type {
   ColorReplacement,
   Content,
   LogoTheme,
-  RichTextValue,
   TestimonialItems,
 } from '@brand-page';
 import {
@@ -18,7 +17,7 @@ import debounce from 'lodash.debounce';
 import type { UpdateItemValuePayload } from '../../models';
 import cloneDeep from 'lodash.clonedeep';
 import { useSnapshotStore } from '@brand-page-maker/stores';
-import { getPlainTextFromRTE, getRteTextLength } from '@brand-page-maker/utils';
+import { getPlainTextFromRTE } from '@brand-page-maker/utils';
 import { isDefaultContentText } from '../../utils';
 import { decodeHtmlEntities } from '@brand-page/utils';
 import { ESCAPED_NEWLINE_CHARACTER } from '../../../../constants/ui';
@@ -92,10 +91,8 @@ export default defineComponent({
   created() {
     this.options = cloneDeep(this.value);
 
-    // BP-5787: testimonials may be Tiptap JSON (migrated legacy content), so
-    // read visible text via getPlainTextFromRTE rather than `.trim()` on a doc.
     this.isEmpty = this.options.map(
-      (option) => getPlainTextFromRTE(option.testimonials).length === 0,
+      (option) => option.testimonials.trim().length === 0,
     );
 
     if (!this.changeDebounce) {
@@ -209,17 +206,11 @@ export default defineComponent({
       this.options[index][payload.name] = payload.value;
       this.emitChange();
     },
-    getItemTextPreview(text: RichTextValue): string {
-      // BP-5787: a JSON doc has no `.replace` — take its visible text first.
-      const value = typeof text === 'string' ? text : getPlainTextFromRTE(text);
-
+    getItemTextPreview(text: string): string {
       return decodeHtmlEntities(
-        value.replace(new RegExp(ESCAPED_NEWLINE_CHARACTER, 'g'), ' '),
+        text.replace(new RegExp(ESCAPED_NEWLINE_CHARACTER, 'g'), ' '),
       );
     },
-    rteTextLength(value: RichTextValue): number {
-      return getRteTextLength(value);
-    },
     getPlainTextValue(index: number): string {
       const text = this.options[index]?.testimonials || '';
       const plainText = getPlainTextFromRTE(text);

package/src/shared/content-settings/components/testimonial-items-field/TestimonialItemsField.vue

@@ -26,8 +26,7 @@
           :error="
             isEmpty[option.index] ||
             (options[option.index].testimonials &&
-              rteTextLength(options[option.index].testimonials) >=
-                maxTestimonialLength)
+              options[option.index].testimonials.length >= maxTestimonialLength)
           "
           :resize="false"
           class="tw-w-full"
@@ -43,8 +42,7 @@
         <p
           v-else-if="
             options[option.index].testimonials &&
-            rteTextLength(options[option.index].testimonials) >=
-              maxTestimonialLength
+            options[option.index].testimonials.length >= maxTestimonialLength
           "
           class="tw-text-error-500 tw-text-sm"
         >
@@ -129,7 +127,7 @@
           v-if="
             options[option.index] &&
             options[option.index].name &&
-            rteTextLength(options[option.index].name) >= maxTitleLength
+            options[option.index].name.length >= maxTitleLength
           "
           class="tw-text-error-500 tw-text-sm"
         >
@@ -160,7 +158,7 @@
           v-if="
             options[option.index] &&
             options[option.index].position &&
-            rteTextLength(options[option.index].position) >= maxTitleLength
+            options[option.index].position.length >= maxTitleLength
           "
           class="tw-text-error-500 tw-text-sm"
         >

package/src/shared/content-settings/components/text-image-field/TextImageField.vue

@@ -97,10 +97,10 @@
           :attrs="{
             'data-test-tag': 'image-title-text-input',
           }"
-          :error="rteTextLength(options[option.index].title) >= titleLength"
+          :error="options[option.index].title.length >= titleLength"
         />
         <p
-          v-if="rteTextLength(options[option.index].title) >= titleLength"
+          v-if="options[option.index].title.length >= titleLength"
           class="tw-text-error-500 tw-text-sm tw-mt-2"
         >
           {{ maxLengthError }}
@@ -134,9 +134,7 @@
           :attrs="{
             'data-test-tag': 'image-description-text-input',
           }"
-          :error="
-            rteTextLength(options[option.index].paragraph) >= descriptionLength
-          "
+          :error="options[option.index].paragraph.length >= descriptionLength"
           @update:model-value="onTextAreaTextChange($event, option.index)"
         />
         <PersonalisationOverrideField
@@ -313,7 +311,6 @@ import debounce from 'lodash.debounce';
 import type { UpdateItemValuePayload } from '../../models';
 import cloneDeep from 'lodash.clonedeep';
 import { isURL } from '../../../../utils/validator.util';
-import { getRteTextLength as rteTextLength } from '@brand-page-maker/utils';
 
 const DEBOUNCE_IN_MS = 250;
 

package/src/shared/content-settings/components/text-items-field/TextItemsField.mixin.ts

@@ -3,7 +3,6 @@ import type { PropType } from 'vue';
 import type {
   Content,
   LogoTheme,
-  RichTextValue,
   TextItem,
   TextStyleDeclaration,
 } from '@brand-page/models';
@@ -20,7 +19,7 @@ import type { UpdateItemValuePayload } from '../../models';
 import cloneDeep from 'lodash.clonedeep';
 import { decodeHtmlEntities, escapeContentText } from '@brand-page/utils';
 import { useSnapshotStore } from '@brand-page-maker/stores';
-import { getPlainTextFromRTE, getRteTextLength } from '@brand-page-maker/utils';
+import { getPlainTextFromRTE } from '@brand-page-maker/utils';
 import { isDefaultContentText } from '../../utils';
 
 const DEBOUNCE_IN_MS = 250;
@@ -235,10 +234,6 @@ export default defineComponent({
       this.emitChange();
     },
 
-    rteTextLength(value: RichTextValue): number {
-      return getRteTextLength(value);
-    },
-
     getPlainTextValue(index: number): string {
       const text = this.options[index]?.text || '';
       const plainText = getPlainTextFromRTE(text);

package/src/shared/content-settings/components/text-items-field/TextItemsField.vue

@@ -32,7 +32,7 @@
           size="sm"
           :error="
             isEmpty[option.index] ||
-            rteTextLength(options[option.index].text) >= maxTextLength
+            options[option.index].text.length >= maxTextLength
           "
           :resize="false"
           class="tw-w-full"

package/src/shared/template-settings/store/template-settings-store.ts

@@ -26,7 +26,10 @@ import {
   useUiStore,
 } from '@brand-page-maker/stores';
 import { useUiSideBarStore } from '../../side-bar/store';
-import { BrandPageModel } from '@brand-page/models';
+import {
+  BrandPageModel,
+  type UserPersonalisationContent,
+} from '@brand-page/models';
 import { migrateBrandPageModel } from '@brand-page/utils';
 import { getAiContentIndexByTemplateTokenAndNumberOfVariations } from '@brand-page-maker/utils/ai-content-selection.util';
 import {
@@ -50,6 +53,7 @@ const POST_PURCHASE_PAGE_SECTION_BY_TAB: Record<string, string> = {
 
 const PRE_PURCHASE_PAGE_SECTION_BY_TAB: Record<string, string> = {
   [TEMPLATE_TABS.all]: 'MakerPrePurchaseSidebarTemplatesAllTab',
+  [TEMPLATE_TABS.AI]: 'MakerPrePurchaseSidebarTemplatesAiTab',
   [TEMPLATE_TABS.categories]: 'MakerPrePurchaseSidebarTemplatesCategoryTab',
 };
 const LOAD_PAGE_RETRY_DELAY = 250;
@@ -76,6 +80,7 @@ export interface TemplatesSettingState {
   selectedTab: SelectedTabType;
   selectedCategory: string | undefined;
   searchTerm: string | undefined;
+  searchPersonalisationData: UserPersonalisationContent[] | undefined;
   tabsWithTranslations: SelectedTabType[];
   logoChangeWatcherInitialized: boolean;
   initialSearchTerm: string | undefined;
@@ -98,6 +103,7 @@ export const useUiTemplateSettingsStore = defineStore('uiTemplateSettings', {
         displayName: templateSettingsTr(`headerAll`),
       },
       searchTerm: undefined,
+      searchPersonalisationData: undefined,
       selectedCategory: undefined,
       templateCategories: [],
       tabsWithTranslations: [
@@ -321,17 +327,25 @@ export const useUiTemplateSettingsStore = defineStore('uiTemplateSettings', {
         const isBrandSite =
           this.templateType === BP_BRAND_SITE_TEMPLATE_TYPE_NAME;
 
-        // Pre-purchase has no logo draft for logo-based recommendation, so fall back to the seeded
-        // search term (the keyword from the URL/cookie - never the business name) so the All tab
-        // stays relevant instead of generic (bp-5454).
-        const effectiveSearchTerm =
+        // With no user search, the All tab must still show industry-relevant templates rather than
+        // generic ones (searchIndustries alone doesn't rank the non-AI half). Seed searchTerm as an
+        // invisible default: pre-purchase has no logo to read an industry from, so it uses the seeded
+        // keyword from the URL/cookie (bp-5454); post-purchase falls back to the logo draft's industry
+        // (bp-5789). Once the user searches, this.searchTerm takes over. this.searchTerm stays unset
+        // here, so AI content-key resolution below is unaffected.
+        const useSeededSearchTerm =
           !this.searchTerm &&
           !this.selectedCategory &&
-          isPrePurchase &&
           isBrandSite &&
-          this.selectedTab.key === TEMPLATE_TABS.all
-            ? this.initialSearchTerm
-            : this.searchTerm;
+          this.selectedTab.key === TEMPLATE_TABS.all;
+
+        const seededSearchTerm = isPrePurchase
+          ? this.initialSearchTerm
+          : brandPageMakerStore.industry;
+
+        const effectiveSearchTerm = useSeededSearchTerm
+          ? seededSearchTerm
+          : this.searchTerm;
 
         const pageSection = isBrandSite
           ? (isPrePurchase
@@ -397,6 +411,23 @@ export const useUiTemplateSettingsStore = defineStore('uiTemplateSettings', {
           }
         }
 
+        // searchPersonalisation is a per-search payload established on page 1; only set it there
+        // (like abTestValuesToBePushed above) so paginating to page 2+ can't reset it to undefined.
+        // Every context change (search/clear/category/logo swap) reloads from page 1, so this still
+        // clears stale search content on a new search.
+        //
+        // Set BEFORE the mapping loop so tiles and the apply path read the same value — reading the
+        // per-page `result.searchPersonalisation` here made page-2 tiles fall back to page-load
+        // content while applying used page-1 search content.
+        //
+        // Empty [] is stored as undefined: it wins `??` but fails `?.length`, so it would strand
+        // the downstream fallback to uiStore.personalisationData and silently skip the apply.
+        if (pageNo === 1) {
+          this.searchPersonalisationData = result.searchPersonalisation?.length
+            ? result.searchPersonalisation
+            : undefined;
+        }
+
         const templates = await Promise.all(
           result.paginatedItems.map(async (item) => {
             try {
@@ -411,17 +442,20 @@ export const useUiTemplateSettingsStore = defineStore('uiTemplateSettings', {
                 let personalisationContentIndex: number | undefined;
                 let contentKey: string | undefined;
 
-                if (uiStore.personalisationData?.length) {
+                const activePersonalisation =
+                  this.searchPersonalisationData ?? uiStore.personalisationData;
+
+                if (activePersonalisation?.length) {
                   personalisationContentIndex =
                     await getAiContentIndexByTemplateTokenAndNumberOfVariations(
                       item.designTemplateToken,
-                      uiStore.personalisationData.length,
+                      activePersonalisation.length,
                     );
 
                   contentKey =
-                    uiStore.personalisationData[personalisationContentIndex]
+                    activePersonalisation[personalisationContentIndex]
                       .contentKey;
-                } else if (item.isPersonalisable) {
+                } else if (item.isPersonalisable && !this.searchTerm) {
                   // Pre-purchase has no personalisationData; personalise AI
                   // template previews with the prompt content key (bp-5742).
                   contentKey = uiStore.userPromptContentKey;
@@ -431,10 +465,9 @@ export const useUiTemplateSettingsStore = defineStore('uiTemplateSettings', {
                   id: item.designTemplateToken,
                   isPersonalisable: item.isPersonalisable,
                   contentKey,
-                  // A userPromptContentKey signals this design's real AI images live
-                  // in the userPrompt bucket (post- or pre-purchase). The preview must
-                  // then resolve via userPromptContentKey, not the regular bucket which
-                  // holds placeholders post-purchase (bp-5454).
+                  // userPromptContentKey signals the content lives in the userPrompt S3
+                  // bucket (post- or pre-purchase); the preview must resolve via
+                  // userPromptContentKey, not the regular bucket (bp-5454).
                   usesUserPromptContentKey: !!uiStore.userPromptContentKey,
                   previewImageUrl: item.previewImageUrl,
                 } as TemplateSettingsTemplate;
@@ -450,13 +483,25 @@ export const useUiTemplateSettingsStore = defineStore('uiTemplateSettings', {
           (t): t is TemplateSettingsTemplate => t !== null,
         );
 
-        // The Categories tab must never surface AI templates or the AI badge
-        // (bp-5454 scenario 5). The badge is driven purely by isPersonalisable,
-        // so clear it for category results regardless of the template's catalog flag.
-        const displayTemplates =
-          this.selectedTab.key === TEMPLATE_TABS.categories
-            ? validTemplates.map((t) => ({ ...t, isPersonalisable: false }))
-            : validTemplates;
+        let displayTemplates = validTemplates;
+
+        // The All tab shows backend-interleaved AI templates (gated server-side on the AB
+        // variation) even when the dedicated AI tab is hidden — e.g. regular templates
+        // pre-purchase (bp-5789). So only strip AI when the AI tab is hidden AND we're not on
+        // the All tab; the backend is the interleave gate, control buckets return no AI here.
+        if (
+          !uiStore.showAiTemplatesTab &&
+          this.selectedTab.key !== TEMPLATE_TABS.all
+        ) {
+          displayTemplates = displayTemplates.filter(
+            (t) => !t.isPersonalisable,
+          );
+        } else if (this.selectedTab.key === TEMPLATE_TABS.categories) {
+          displayTemplates = displayTemplates.map((t) => ({
+            ...t,
+            isPersonalisable: false,
+          }));
+        }
 
         this._addTemplates({ templates: displayTemplates });
         this._setPageNoLoaded({ pageNoLoaded: pageNo });
@@ -529,6 +574,11 @@ export const useUiTemplateSettingsStore = defineStore('uiTemplateSettings', {
         searchTerm: payload.searchTerm,
       });
 
+      // Drive AI industry selection from the typed term; fall back to the
+      // seeded keyword on clear so the AI tab doesn't go generic (bp-5789).
+      this.aiTemplateKeywords =
+        payload.searchTerm || this.initialSearchTerm || '';
+
       this.onSearchTermChanged?.(payload.searchTerm);
 
       await this._setPageNo({ pageNo: 1 });
@@ -617,7 +667,8 @@ export const useUiTemplateSettingsStore = defineStore('uiTemplateSettings', {
             return;
           }
 
-          // Only refetch for post-purchase users and when logo actually changes
+          // Refetch previews on any logo change (pre- and post-purchase) so the new logo
+          // shows in the thumbnails.
           const hasLogoChanged =
             newLogoImage.logoDraftToken !== oldLogoImage.logoDraftToken ||
             newLogoImage.logoVariation !== oldLogoImage.logoVariation;
@@ -627,8 +678,23 @@ export const useUiTemplateSettingsStore = defineStore('uiTemplateSettings', {
             newLogoImage.logoDraftToken &&
             hasLogoChanged
           ) {
-            // Reset templates state and reload with new logo
-            // Use the same pattern as onCategorySelected and onSearch
+            const uiStore = useUiStore();
+            const isPrePurchase = useBrandPageContainerStore().isPrePurchase;
+
+            uiStore.setUserPersonalisationData({
+              personalisationData: undefined,
+            });
+
+            if (
+              !isPrePurchase &&
+              newLogoImage.logoDraftToken !== oldLogoImage.logoDraftToken
+            ) {
+              uiStore.setUserPromptContentKey({
+                userPromptContentKey: undefined,
+              });
+              uiStore.setShowAiTemplatesTab({ showAiTemplatesTab: false });
+            }
+
             await this._setTemplates({ templates: [] });
             await this._setPageNoLoaded({ pageNoLoaded: 0 });
             await this._setPageNo({ pageNo: 1 });

package/src/utils/minify-brand-page-metadata.ts

@@ -10,7 +10,7 @@ import {
 } from '../brand-page/models';
 import type { Content, ContentType } from '../brand-page/models/content.model';
 import type { TextStyleDeclaration } from '../brand-page/models/styles.model';
-import { hasRTEContent, isTiptapDocument } from '../brand-page-maker/utils';
+import { hasRTEContent } from '../brand-page-maker/utils';
 import { useExternalRichTextEditor } from '../brand-page-maker/composables/rich-text-editor/useRichTextEditor';
 import type { Editor, JSONContent } from '@tiptap/vue-3';
 import {
@@ -106,9 +106,6 @@ const convertText = (
   value: unknown,
   editor: Editor,
 ): RichTextValue | undefined => {
-  // Already Tiptap JSON (BP-5787 storage) — keep as-is.
-  if (isTiptapDocument(value)) return value;
-
   if (typeof value !== 'string' || !value) return undefined;
 
   if (hasRTEContent(value)) {

package/lib/src/brand-page/utils/migration/migration-20.d.ts

@@ -1,2 +0,0 @@
-import type { MigrationData } from '../migration.util';
-export declare const migration20: (migrationResult: MigrationData) => Promise<MigrationData>;