@designcrowd/library.brand-page 5.19.2 → 6.0.0-undo-redo-1

package/src/brand-page-maker/components/navigation/Navigation.mixin.ts

@@ -40,6 +40,7 @@ export default defineComponent({
       default: false,
     },
   },
+  emits: ['create-team-cards'],
   methods: {
     saveBrandPage() {
       this.$emit(EVENTS.Save);

package/src/brand-page-maker/components/rich-text-editor/RichTextEditor.vue

@@ -552,6 +552,7 @@ const availableTextFontFamilyOptions = computed(
   () => styleSettingsStore.availableTextFontFamilyOptions,
 );
 
+// eslint-disable-next-line vue/require-prop-types
 const model = defineModel();
 const emit = defineEmits([
   'focus',
@@ -709,7 +710,8 @@ watch(
   () =>
     contentSettingStore.getItem(props.rawId)?.settings?.content?.textItemsStyle
       ?.color,
-  (newColor) => {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  (_newColor) => {
     if (isAdmin.value) {
       if (props.textItemIndex !== undefined && selectedGlobalTextStyles) {
         toggleTextColor.value =

package/src/brand-page-maker/components/sensitive-content/SensitiveContent.vue

@@ -92,7 +92,7 @@
 </template>
 <script setup lang="ts">
 import { Button } from '@designcrowd/fe-shared-lib';
-import { computed, reactive, nextTick, useTemplateRef } from 'vue';
+import { computed, reactive, nextTick } from 'vue';
 import {
   SENSITIVE_CONTENT_TYPES,
   type SensitiveContent,
@@ -109,9 +109,6 @@ const brandPageMakerStore = useBrandPageMakerStore();
 
 const props = defineProps<Props>();
 
-const isBrandPage = computed(() => brandPageMakerStore.isBrandPage);
-const isBrandContact = computed(() => brandPageMakerStore.isBrandContact);
-
 const data = reactive({
   sensitiveSettings: [
     {

package/src/brand-page-maker/components/seo-settings/DeleteDomainModal.vue

@@ -59,7 +59,7 @@ interface Props {
   isCustomDomainRequestFailed?: boolean;
 }
 
-const props = defineProps<Props>();
+defineProps<Props>();
 const emit = defineEmits<{ (e: 'on-confirm'): void; (e: 'on-cancel'): void }>();
 
 const emitConfirm = () => emit('on-confirm');

package/src/brand-page-maker/components/seo-settings/SeoPageSettings.mixin.ts

@@ -41,6 +41,7 @@ export default defineComponent({
       default: undefined,
     },
   },
+  emits: ['update-settings'],
   setup() {
     const brandPageMakerStore = useBrandPageMakerStore();
     const localisedRouteStore = useLocalisedRouteStore();

package/src/brand-page-maker/components/seo-settings/SeoPageSettings.vue

@@ -106,7 +106,7 @@
 <script>
 import { Button, TextInput, Textarea } from '@designcrowd/fe-shared-lib';
 import SeoPageSettingsMixin from './SeoPageSettings.mixin.ts';
-import { tr, commonTr, seoSettingsTr } from '@src/composables/useTranslate';
+import { commonTr, seoSettingsTr } from '@src/composables/useTranslate';
 
 export default {
   components: {

package/src/brand-page-maker/components/seo-settings/UrlSettings.mixin.ts

@@ -9,7 +9,6 @@ import {
   useBrandPageContainerStore,
   useBrandPageMakerStore,
   useLocalisedRouteStore,
-  useBrandPageMakerUserStore,
 } from '@brand-page-maker/stores';
 import { defaultUSDCurrency } from '@brand-page-maker/constants/currency-constants';
 import { validateCustomDomainName } from '@brand-page-maker/utils';

package/src/brand-page-maker/components/seo-settings/UrlSettings.vue

@@ -393,7 +393,6 @@ import { Button, Loader, TextInput } from '@designcrowd/fe-shared-lib';
 import { SellDomainNameWidget } from '@designcrowd/fe-shared-lib';
 import UrlSettingsMixin from './UrlSettings.mixin.ts';
 import DeleteDomainModal from './DeleteDomainModal.vue';
-import ConfirmModal from '@shared/confirm-modal/ConfirmModal.vue';
 import UseExistingDomainModal from './UseExistingDomainModal.vue';
 import { commonTr, seoSettingsTr } from '@src/composables/useTranslate';
 

package/src/brand-page-maker/components/seo-settings/UseExistingDomainModal.vue

@@ -178,11 +178,7 @@ import {
   Loader,
 } from '@designcrowd/fe-shared-lib';
 import UseExistingDomainModalMixin from './UseExistingDomainModal.mixin.ts';
-import {
-  tr,
-  commonTr,
-  existingDomainModalTr,
-} from '@src/composables/useTranslate';
+import { commonTr, existingDomainModalTr } from '@src/composables/useTranslate';
 
 export default {
   components: {

package/src/brand-page-maker/components/shop/AddOrEditProductContainer.vue

@@ -172,7 +172,7 @@ const enableNotes = computed(() => productSettingStore.productEnableNotes);
 const hasVariants = computed(() => productSettingStore.productHasVariants);
 const currencySymbol = computed(() => shopConfigStore.currencySymbol);
 
-const emit = defineEmits(['update:modelValue']);
+defineEmits(['update:modelValue']);
 
 const onImageUpload = () => {
   productSettingStore.setImageUpload(true);

package/src/brand-page-maker/components/shop/ReplaceImageSettingsForShop.vue

@@ -25,7 +25,7 @@ import {
 import type { UserMediaItemWithDimensions } from 'src/shared/my-uploads/models';
 const productSettingStore = useProductConfigStore();
 
-const emit = defineEmits(['on-close', 'on-save']);
+defineEmits(['on-close', 'on-save']);
 
 const onBack = () => {
   productSettingStore.setImageUpload(false);

package/src/brand-page-maker/components/social-share/SocialShare.vue

@@ -55,7 +55,7 @@
   <!-- End Loader Overlay -->
 </template>
 <script>
-import { Button, Loader, TextInput } from '@designcrowd/fe-shared-lib';
+import { Loader, TextInput } from '@designcrowd/fe-shared-lib';
 import SocialShareMixin from './SocialShare.mixin';
 import ImageField from '@shared/content-settings/components/image-field/ImageField.vue';
 import { socialShareTr, commonTr } from '@src/composables/useTranslate';

package/src/brand-page-maker/components/video-play/VideoPlayButton.vue

@@ -28,5 +28,5 @@ interface Props {
   iconColor?: string;
 }
 
-const props = defineProps<Props>();
+defineProps<Props>();
 </script>

package/src/brand-page-maker/composables/ai-chat/useAiWebsiteBuilderChat.ts

@@ -1,4 +1,4 @@
-import { ref, computed, watch, nextTick, onUnmounted } from 'vue';
+import { ref, computed, watch, nextTick } from 'vue';
 import type { BrandPageModel } from '../../../brand-page/models';
 import {
   getInstance as getAiAssistantClient,

package/src/brand-page-maker/composables/rich-text-editor/useRichTextEditor.ts

@@ -628,15 +628,15 @@ export const useRichTextEditor = (
       );
       fontSettings.selectedTextColor = hasLogoColorVar(globalStyles.color ?? '')
         ? '#000000'
-        : globalStyles?.color ?? '#000000';
+        : (globalStyles?.color ?? '#000000');
       fontSettings.selectedBackgroundColor = hasLogoColorVar(
         globalStyles?.backgroundColor ?? '',
       )
         ? 'transparent'
-        : globalStyles?.backgroundColor ?? 'transparent';
+        : (globalStyles?.backgroundColor ?? 'transparent');
       lineHeight.value = globalStyles?.lineHeight?.includes('em')
         ? emToPx(globalStyles?.lineHeight ?? '1em')
-        : globalStyles?.lineHeight ?? '1';
+        : (globalStyles?.lineHeight ?? '1');
       letterSpacing.value = letterSpacingValueConvertor.convert(
         globalStyles ?? {},
       );
@@ -658,15 +658,15 @@ export const useRichTextEditor = (
         props.styles?.color ?? '#000000',
       )
         ? '#000000'
-        : props.styles?.color ?? '#000000';
+        : (props.styles?.color ?? '#000000');
       fontSettings.selectedBackgroundColor = hasLogoColorVar(
         props.styles?.backgroundColor ?? '',
       )
         ? 'transparent'
-        : props.styles?.backgroundColor ?? 'transparent';
+        : (props.styles?.backgroundColor ?? 'transparent');
       lineHeight.value = props.styles?.lineHeight?.includes('em')
         ? emToPx(props.styles?.lineHeight ?? '1em')
-        : props.styles?.lineHeight ?? '1';
+        : (props.styles?.lineHeight ?? '1');
       letterSpacing.value = letterSpacingValueConvertor.convert(
         props.styles ?? {},
       );

package/src/brand-page-maker/composables/useUndoRedoFlag.ts

@@ -1,30 +1,24 @@
 import { computed, type ComputedRef } from 'vue';
 import { useBrandPageMakerUserStore } from '@brand-page-maker/stores/user';
-import { useBrandPageMakerStore } from '@brand-page-maker/stores/brandpage-maker/brandpage-maker-store';
 
 /**
- * Returns whether undo/redo is active for the current maker session. All
- * three conditions must hold:
+ * Returns whether undo/redo is active for the current maker session. Both
+ * conditions must hold:
  *
  *   1. `userStore.features.canUseUndoRedo` is true. The flag is populated by
  *      the consumer (BrandCrowd.Net / web-renderer) via the
  *      `WebsiteDesignUserFeatures.CanUseUndoRedo` boolean on the ViewModel —
- *      same precedent as RichTextEditor / GettyVideos / AITextGenerator.
- *   2. The maker is a brand-site (Website Maker). V1 scope is brand-site
- *      only; brand-page (single-page profile) and brand-contact (vCard) are
- *      out of scope.
- *   3. The session is NOT in admin-maker mode (`userStore.isAdmin`). The
+ *      same precedent as RichTextEditor / GettyVideos / AITextGenerator. The
+ *      one flag governs all three brands (brand-site, brand-page,
+ *      brand-contact) — there is no per-brand gating.
+ *   2. The session is NOT in admin-maker mode (`userStore.isAdmin`). The
  *      admin maker uses the same components but a different editing flow
  *      (template authoring) where undo/redo is out of scope.
  */
 export function useUndoRedoFlag(): ComputedRef<boolean> {
   const userStore = useBrandPageMakerUserStore();
-  const brandPageMakerStore = useBrandPageMakerStore();
 
   return computed(
-    () =>
-      userStore.features.canUseUndoRedo &&
-      brandPageMakerStore.isBrandSite &&
-      !userStore.isAdmin,
+    () => userStore.features.canUseUndoRedo && !userStore.isAdmin,
   );
 }

package/src/brand-page-maker/constants/config-settings-constant.ts

@@ -446,9 +446,9 @@ const shopReplaceImageSettings =
     titleReplace: contentSettingsTr(`imageReplaceTitle`),
     contentMediaFieldName: MediaFieldNames.requestPaymentConfig,
     setContentMedia: (
-      content: ShopContent,
-      value: SetContentMediaPayload,
-      index?: number,
+      _content: ShopContent,
+      _value: SetContentMediaPayload,
+      _index?: number,
     ) => '',
     openByDefault: false,
     mediaType: null,

package/src/brand-page-maker/convertors/text-image-display-style.convertor.ts

@@ -11,7 +11,7 @@ import {
 import type { ImagesSectionContent, MediaType } from '@brand-page';
 
 export const getTextMediaOptionsConverterByMediaType = (
-  mediaType: MediaType,
+  _mediaType: MediaType,
 ): ValueConvertor<
   string | null,
   ButtonGroupConfig,

package/src/brand-page-maker/models/button-styles-config.ts

@@ -15,8 +15,10 @@ export const ButtonStyleConfigOptions = [
 
 export type ButtonStyleConfigOption = (typeof ButtonStyleConfigOptions)[number];
 
-export interface ButtonStyleConfig
-  extends Omit<ButtonStyles, 'style' | 'template' | 'selectedButtonStyleId'> {
+export interface ButtonStyleConfig extends Omit<
+  ButtonStyles,
+  'style' | 'template' | 'selectedButtonStyleId'
+> {
   readonly id: string;
   readonly hasShadow: boolean;
   readonly hasSoftShadow?: boolean;

package/src/brand-page-maker/models/content-settings-configs.ts

@@ -156,8 +156,10 @@ export interface ContentSettingsField<TContent> {
   styleName?: string;
 }
 
-export interface ContentSettingsMultiField<TContent, TField>
-  extends Omit<ContentSettingsField<TContent>, 'type' | 'role'> {
+export interface ContentSettingsMultiField<TContent, TField> extends Omit<
+  ContentSettingsField<TContent>,
+  'type' | 'role'
+> {
   type: ItemMultiFieldType;
   role: 'multi';
   fields?: {

package/src/brand-page-maker/models/navigation-style-configs.ts

@@ -14,7 +14,7 @@ import type {
 import type { PageSection } from '@shared/page-settings/models';
 import { PAGE_SECTIONS } from '@shared/page-settings/models';
 import type { ButtonGroupOption } from './button-group.model';
-import { tr, commonTr, modelsTr } from '@src/composables/useTranslate';
+import { commonTr, modelsTr } from '@src/composables/useTranslate';
 
 export const NavigationStyleConfigOptions = {
   defaultBorderColor: 'defaultBorderColor',
@@ -46,11 +46,10 @@ export const NAVIGATION_STYLE_CONFIG_OPTION_TITLES = (): Record<
   subNavBackgroundColor: modelsTr('subNavBackgroundColor'),
 });
 
-export interface NavigationStyleConfig
-  extends Omit<
-    NavigationDesktop | NavigationMobile,
-    'isLogoVisible' | 'hamburgerMenuStyle' | 'viewport'
-  > {
+export interface NavigationStyleConfig extends Omit<
+  NavigationDesktop | NavigationMobile,
+  'isLogoVisible' | 'hamburgerMenuStyle' | 'viewport'
+> {
   buttonGroupOption: ButtonGroupOption;
   options: NavigationStyleConfigOption[];
 }

package/src/brand-page-maker/stores/admin-logo-settings/admin-logo-settings-store.ts

@@ -2,7 +2,6 @@ import {
   EMPTY_LOGO_IMAGE_MODEL,
   type FabricLogoTheme,
   type LogoContent,
-  type LogoImageModel,
   type LogoTemplateImageModel,
   type LogoTheme,
 } from '@brand-page';

package/src/brand-page-maker/stores/brandpage-container/brand-page-container-store.ts

@@ -21,7 +21,6 @@ import {
   BRAND_PAGE_TYPES,
   SENSITIVE_CONTENT_TYPES,
   getAbTestResults,
-  getValueType,
   type AbTest,
   type LogoContent,
 } from '@brand-page';
@@ -34,7 +33,6 @@ import {
   TRIGGER_TYPE,
   UPGRADE_CTA_LOCATIONS,
   useEventTracker,
-  EVENTS,
 } from '@brand-page-maker/composables/useEventTracker';
 import { navigationTr } from '@src/composables/useTranslate';
 import type { WebsiteSlugCheckResponse } from '@brand-page-maker/models/api.model';
@@ -451,7 +449,7 @@ export const useBrandPageContainerStore = defineStore('brandPageContainer', {
 
     async publishBrandPage({ shouldPublish, slug }) {
       const brandPageMakerStore = useBrandPageMakerStore();
-      const eventTracker = useEventTracker();
+      const _eventTracker = useEventTracker();
 
       if (!this.designDraftToken) {
         throw new Error(
@@ -558,7 +556,7 @@ export const useBrandPageContainerStore = defineStore('brandPageContainer', {
       isPurchasedDomain,
     }) {
       const brandPageMakerStore = useBrandPageMakerStore();
-      const eventTracker = useEventTracker();
+      const _eventTracker = useEventTracker();
 
       if (!this.designDraftToken) {
         throw new Error(
@@ -892,7 +890,7 @@ export const useBrandPageContainerStore = defineStore('brandPageContainer', {
     ) {
       const userStore = useBrandPageMakerUserStore();
       const brandPageMakerStore = useBrandPageMakerStore();
-      const eventTracker = useEventTracker();
+      const _eventTracker = useEventTracker();
 
       if (userStore.isAdmin) {
         throw new Error('save brand page is not allowed in admin mode');

package/src/brand-page-maker/stores/brandpage-maker/brandpage-maker-store.test.ts

@@ -2,7 +2,6 @@ import { vi } from 'vitest';
 import {
   BRAND_PAGE,
   INITIALISE_PAYLOAD,
-  USER_FEATURES,
   userFeatures,
 } from '../../components/brand-page-maker/__fixtures__';
 import {
@@ -44,6 +43,7 @@ import { useUiBackgroundSettingsStore } from '@shared/background-settings/store'
 import { useBrandPageMakerUserStore } from '../user';
 import { useBrandPageContainerStore } from '../brandpage-container';
 import { useUiTemplateSettingsStore } from '@shared/template-settings/store';
+import { usePageNavigationStore } from '@shared/page-navigation/store/page-navigation-store';
 import {
   CONTENT_SETTINGS_MODES,
   useUiContentSettingsStore,
@@ -54,8 +54,6 @@ import { SIDE_BAR_TAB_NAMES } from '@brand-page-maker/constants';
 import { PAGE_SECTIONS } from '@shared/page-settings/models';
 import { FabricRenderClient } from '../../../clients/fabric-render-client';
 import { setLocaleAsync } from '@src/composables/useTranslate';
-import { usePageNavigationStore } from '@shared/page-navigation/store/page-navigation-store';
-import type { NavModel } from '@brand-page/models';
 
 const createInitialisePayload = () => {
   const initialisePayload = {

package/src/brand-page-maker/stores/brandpage-maker/brandpage-maker-store.ts

@@ -23,14 +23,12 @@ import {
   CONTENT_TYPES,
   NavigationDesktop,
   NavigationMobile,
-  NavModel,
 } from '@brand-page';
 import type {
   DesignTemplateType,
   InitialCategories,
   TemplateCategory,
 } from '@shared/template-settings/models';
-import type { UserFeatures } from '../user';
 import { useBrandPageMakerUserStore } from '../user';
 import { defineStore } from 'pinia';
 import { toRaw } from 'vue';
@@ -947,14 +945,7 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
         }
       }
 
-      const logoImage =
-        snapshot.brandPageType === BRAND_PAGE_TYPES.default
-          ? (
-              snapshot.pages?.[0]?.contents?.find(
-                (c) => c.type === 'logo',
-              ) as any
-            )?.logoImage
-          : snapshot.pageHeaderDesktop?.logoImage;
+      const logoImage = logoUtil.getLogoImageFromModel(snapshot);
 
       if (!logoImage) return;
 
@@ -1238,7 +1229,7 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
       industry,
       layout,
       logoVariationImageUrls,
-      shopConfigData,
+      shopConfigData: _shopConfigData,
       isServerRenderOverride = false,
     }: InitialisePayload) {
       const brandPageContainerStore = useBrandPageContainerStore();
@@ -1250,7 +1241,7 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
       const backgroundSettingsStore = useUiBackgroundSettingsStore();
       const styleSettingsStore = useUiStyleSettingsStore();
       const navigationStyleSettingsStore = useUiNavigationStyleSettingsStore();
-      const sideBarStore = useUiSideBarStore();
+      const _sideBarStore = useUiSideBarStore();
 
       navigationStyleSettingsStore.initialise({ reset: false });
 
@@ -1275,14 +1266,7 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
           brandPageType: _brandPageType,
         });
 
-        let logoImage =
-          brandPageModel.brandPageType === BRAND_PAGE_TYPES.default
-            ? (
-                brandPageModel.pages?.[0].contents.find(
-                  (c) => c.type === 'logo',
-                ) as any
-              )?.logoImage
-            : brandPageModel.pageHeaderDesktop?.logoImage;
+        let logoImage = logoUtil.getLogoImageFromModel(brandPageModel);
 
         if (!logoImage?.logoDraftToken) {
           logoImage = logoUtil.safeGetLogoImageFromLogoImageUrl(

package/src/brand-page-maker/utils/content-settings.util.ts

@@ -7,7 +7,7 @@ import type {
   ContentSettingsConfig,
   CreateInitialContentOptions,
 } from '../models';
-import { SENSITIVE_CONTENT_TYPES, type Content } from '@brand-page';
+import { type Content } from '@brand-page';
 import { RESERVED_FIELD_NAMES } from '@shared/content-settings/constants';
 import { CONTENT_SETTINGS_CONFIGS } from '../constants';
 import type { UIUserFeatures } from '@src/constants/ui';

package/src/brand-page-maker/utils/rich-text-editor.util.ts

@@ -431,7 +431,7 @@ const transformRTEField = (
   if (textStyleType && (textStyleType === type || uiStyleSettingsStore)) {
     let globalContentStyle = uiStyleSettingsStore
       ? uiStyleSettingsStore.textStyles.textStyleOptions[textStyleType].style
-      : newStyle ?? ({} as TextStyleDeclaration);
+      : (newStyle ?? ({} as TextStyleDeclaration));
 
     globalContentStyle = {
       ...globalContentStyle,
@@ -549,7 +549,7 @@ export const transformToRTE = (
                 ? uiStyleSettingsStore.textStyles.textStyleOptions[
                     textItemStyleType
                   ].style
-                : newStyle ?? ({} as TextStyleDeclaration);
+                : (newStyle ?? ({} as TextStyleDeclaration));
 
               globalContentStyle = {
                 ...globalContentStyle,
@@ -593,7 +593,7 @@ export const transformToRTE = (
             let globalContentStyle = uiStyleSettingsStore
               ? uiStyleSettingsStore.textStyles.textStyleOptions[textStyleType]
                   .style
-              : newStyle ?? ({} as TextStyleDeclaration);
+              : (newStyle ?? ({} as TextStyleDeclaration));
 
             globalContentStyle = {
               ...globalContentStyle,
@@ -647,7 +647,7 @@ export const switchAllContentToRTE = (
 
         if (textContent.textItems && textContent.textItems.length > 0) {
           for (const [
-            itemIndex,
+            _itemIndex,
             textItemContent,
           ] of textContent.textItems.entries()) {
             const textItemStyleType = textItemContent.textStyle.textStyleType;

package/src/lib.ts

@@ -96,6 +96,7 @@ export {
   useEventManagerStore,
   useLocalisedRouteStore,
   useVideoStore,
+  useRouteStore,
 } from './brand-page-maker/stores';
 export { useShopConfigStore } from './shared/ecommerce-settings/store/shop-settings-store';
 

package/src/metadata-builder/builders/reorder-pages-builder.ts

@@ -0,0 +1,80 @@
+import type { BrandPageModel, NavOrder } from '../../brand-page/models';
+import {
+  BaseMetadataBuilder,
+  type BuilderResult,
+  type MetadataBuilderRequest,
+} from '../models';
+import type { Logger } from '../logger';
+
+export interface ReorderPagesPayload {
+  pageOrder: string[];
+}
+
+export class ReorderPagesBuilder extends BaseMetadataBuilder<ReorderPagesPayload> {
+  constructor(
+    request: MetadataBuilderRequest<ReorderPagesPayload>,
+    logger?: Logger,
+  ) {
+    super(request, logger);
+  }
+
+  async validateAsync(): Promise<{ errors: string[] }> {
+    const errors: string[] = [];
+    const payload = this.request.payload;
+
+    if (!payload?.pageOrder?.length) {
+      errors.push('page_order is required for reorder_pages');
+    }
+
+    return { errors };
+  }
+
+  async buildAsync(model: BrandPageModel): Promise<BuilderResult> {
+    this.log('Build called');
+
+    const validation = await this.validateAsync();
+
+    if (validation.errors.length) {
+      return { request: this.request, model, errors: validation.errors };
+    }
+
+    const { pageOrder } = this.request.payload!;
+
+    // Build pageId → routeId lookup from nav.routes
+    const pageIdToRouteId = new Map<string, string>();
+
+    for (const route of model.nav.routes) {
+      pageIdToRouteId.set(route.pageId, route.id);
+    }
+
+    // Build new nav.orders from the flat page_order (array of pageIds)
+    const newOrders: NavOrder[] = [];
+    const seenRouteIds = new Set<string>();
+
+    for (const pageId of pageOrder) {
+      const routeId = pageIdToRouteId.get(pageId);
+
+      if (!routeId) continue;
+
+      newOrders.push({ routeId, subRoutes: [] });
+      seenRouteIds.add(routeId);
+    }
+
+    // Safety: append any routes not mentioned (don't lose pages)
+    for (const route of model.nav.routes) {
+      const routeId = pageIdToRouteId.get(route.pageId);
+
+      if (routeId && !seenRouteIds.has(routeId)) {
+        newOrders.push({ routeId, subRoutes: [] });
+      }
+    }
+
+    model.nav.orders = newOrders;
+
+    this.log({
+      message: `Reordered pages: ${pageOrder.join(', ')}`,
+    });
+
+    return { request: this.request, model };
+  }
+}

package/src/metadata-builder/builders/section-builders/image-gallery-builder.ts

@@ -46,7 +46,7 @@ const mergeGalleryImages = (
     const existing = content.images?.[index];
     const imageUrl = isValidUrl(img.image_url)
       ? img.image_url!
-      : existing?.imageUrl ?? '';
+      : (existing?.imageUrl ?? '');
 
     return {
       ...(existing || {}),

package/src/metadata-builder/builders/section-builders/images-section-builder.ts

@@ -80,7 +80,7 @@ const mergeImageItems = (
       ...(existing || {}),
       imageUrl: isValidUrl(item.image_url)
         ? item.image_url!
-        : existing?.imageUrl ?? '',
+        : (existing?.imageUrl ?? ''),
       imageTitle: existing?.imageTitle ?? '',
       width: existing?.width ?? 0,
       height: existing?.height ?? 0,

package/src/metadata-builder/builders/section-builders/testimonial-section-builder.ts

@@ -128,7 +128,7 @@ const mergeTestimonialItemsAsync = async (
         ? 'shape'
         : item.avatar_image_url
           ? 'image'
-          : existing?.mediaType ?? 'image';
+          : (existing?.mediaType ?? 'image');
 
       return {
         ...(existing || {}),

package/src/metadata-builder/builders/section-builders/text-section-builder.ts

@@ -128,7 +128,7 @@ const mergeTextItems = (
     ) as TextStyleDeclaration;
 
     const resolved = item.text !== undefined ? resolveText(item.text) : null;
-    const text = resolved ? resolved.html : existing?.text ?? '';
+    const text = resolved ? resolved.html : (existing?.text ?? '');
 
     return {
       text,

package/src/metadata-builder/builders/shape-color-utils.ts

@@ -68,8 +68,8 @@ export const applyColorThemeToReplacements = (
     replacementColor:
       replacements.length === 1
         ? colorTheme
-        : getNewColorBasedOnTargetColorTheme(
+        : (getNewColorBasedOnTargetColorTheme(
             r.originalColor,
             colorTheme,
-          )?.toString() ?? colorTheme,
+          )?.toString() ?? colorTheme),
   }));