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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@designcrowd/library.brand-page",
   "description": "A collection of Maker/Designer applications",
-  "version": "6.0.0-undo-redo-1",
+  "version": "6.0.0",
   "author": "Design.com Eng",
   "license": "UNLICENSED",
   "type": "module",
@@ -248,4 +248,4 @@
       "public"
     ]
   }
-}
+}

package/src/brand-page/utils/logo.util.test.ts

@@ -12,12 +12,7 @@ import {
   PageHeaderMobile,
   PageStyles,
 } from '../models';
-import type {
-  BrandPageModel,
-  BrandPageType,
-  LogoContent,
-  PageModel,
-} from '../models';
+import type { BrandPageModel, LogoContent, PageModel } from '../models';
 import * as logoUtil from './logo.util';
 
 interface GetLogoVariationIndexFromLogoImageUrlTestCase {
@@ -217,52 +212,4 @@ describe('logo-util', () => {
       logoImage.logoDraftToken,
     );
   });
-
-  describe('getLogoImageFromModel', () => {
-    // Distinct tokens in the content block vs the header so each assertion
-    // proves which location the helper read from.
-    const buildModel = (brandPageType: BrandPageType): BrandPageModel => {
-      const model = createTestBrandPageModel();
-
-      model.brandPageType = brandPageType;
-      (model.pages[0].contents[0] as LogoContent).logoImage = {
-        logoDraftToken: 'content-token',
-        logoVariation: 0,
-        logoLastUpdate: undefined,
-      };
-      model.pageHeaderDesktop.logoImage = {
-        logoDraftToken: 'header-token',
-        logoVariation: 0,
-        logoLastUpdate: undefined,
-      };
-
-      return model;
-    };
-
-    test('reads the header logo for brand-site', () => {
-      const model = buildModel(BRAND_PAGE_TYPES.brandSite);
-
-      expect(logoUtil.getLogoImageFromModel(model)?.logoDraftToken).toBe(
-        'header-token',
-      );
-    });
-
-    test('reads the content-block logo for brand-page', () => {
-      const model = buildModel(BRAND_PAGE_TYPES.default);
-
-      expect(logoUtil.getLogoImageFromModel(model)?.logoDraftToken).toBe(
-        'content-token',
-      );
-    });
-
-    // Regression guard: brand-contact previously fell through to the header
-    // branch (the `=== brandPage` check) and read a stale header logo on undo.
-    test('reads the content-block logo for brand-contact', () => {
-      const model = buildModel(BRAND_PAGE_TYPES.brandContact);
-
-      expect(logoUtil.getLogoImageFromModel(model)?.logoDraftToken).toBe(
-        'content-token',
-      );
-    });
-  });
 });

package/src/brand-page/utils/logo.util.ts

@@ -394,29 +394,6 @@ export const calculateOptimizedLogoDimensions = (
   return { width: currentWidth, height: currentHeight };
 };
 
-/**
- * Resolves the "current" logo image from a brand-page MODEL (the raw,
- * deserialized shape — not the live stores, whose contents are wrapped in
- * `settings.content`).
- *
- * Brand-site keeps its logo in the page header; brand-page and brand-contact
- * keep it as a logo CONTENT block on the home page — the same `isBrandSite ?
- * header : content` split the logo-settings store getters/setter use. This is
- * the single source of truth for model-level logo reads: initial load and
- * history-restore both call it so the two paths can't drift. They previously
- * hard-coded `=== brandPage`, which silently excluded brand-contact and read a
- * stale header logo on undo.
- */
-export const getLogoImageFromModel = (
-  model: BrandPageModel,
-): LogoImageModel | undefined => {
-  if (model.brandPageType === BRAND_PAGE_TYPES.brandSite) {
-    return model.pageHeaderDesktop?.logoImage;
-  }
-
-  return model.pages?.[0]?.contents?.find(isLogoContent)?.logoImage;
-};
-
 export const recalculateLogoContentDimensions = async (
   pageData: any,
   editableLogoVariations: {

package/src/brand-page-maker/components/brand-page-maker/BrandPageMaker.mixin.ts

@@ -291,7 +291,7 @@ export default defineComponent({
 
     // Capture baseline for undo/redo when the feature is active for this
     // session — see useUndoRedoFlag.ts for the gate (LaunchDarkly flag +
-    // non-admin maker; all three brands).
+    // brand-site + non-admin maker).
     if (useUndoRedoFlag().value) {
       useHistoryStore().captureBaseline();
     }

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

@@ -1,24 +1,30 @@
 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. Both
- * conditions must hold:
+ * Returns whether undo/redo is active for the current maker session. All
+ * three 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. 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
+ *      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
  *      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 && !userStore.isAdmin,
+    () =>
+      userStore.features.canUseUndoRedo &&
+      brandPageMakerStore.isBrandSite &&
+      !userStore.isAdmin,
   );
 }

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

@@ -945,7 +945,14 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
         }
       }
 
-      const logoImage = logoUtil.getLogoImageFromModel(snapshot);
+      const logoImage =
+        snapshot.brandPageType === BRAND_PAGE_TYPES.default
+          ? (
+              snapshot.pages?.[0]?.contents?.find(
+                (c) => c.type === 'logo',
+              ) as any
+            )?.logoImage
+          : snapshot.pageHeaderDesktop?.logoImage;
 
       if (!logoImage) return;
 
@@ -1266,7 +1273,14 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
           brandPageType: _brandPageType,
         });
 
-        let logoImage = logoUtil.getLogoImageFromModel(brandPageModel);
+        let logoImage =
+          brandPageModel.brandPageType === BRAND_PAGE_TYPES.default
+            ? (
+                brandPageModel.pages?.[0].contents.find(
+                  (c) => c.type === 'logo',
+                ) as any
+              )?.logoImage
+            : brandPageModel.pageHeaderDesktop?.logoImage;
 
         if (!logoImage?.logoDraftToken) {
           logoImage = logoUtil.safeGetLogoImageFromLogoImageUrl(

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

@@ -1,13 +0,0 @@
-import type { BrandPageModel } from '../../brand-page/models';
-import { BaseMetadataBuilder, type BuilderResult, type MetadataBuilderRequest } from '../models';
-import type { Logger } from '../logger';
-export interface ReorderPagesPayload {
-    pageOrder: string[];
-}
-export declare class ReorderPagesBuilder extends BaseMetadataBuilder<ReorderPagesPayload> {
-    constructor(request: MetadataBuilderRequest<ReorderPagesPayload>, logger?: Logger);
-    validateAsync(): Promise<{
-        errors: string[];
-    }>;
-    buildAsync(model: BrandPageModel): Promise<BuilderResult>;
-}

package/lib/src/metadata-builder/builders/reorder-pages-builder.js

@@ -1,49 +0,0 @@
-import { BaseMetadataBuilder, } from '../models';
-export class ReorderPagesBuilder extends BaseMetadataBuilder {
-    constructor(request, logger) {
-        super(request, logger);
-    }
-    async validateAsync() {
-        const errors = [];
-        const payload = this.request.payload;
-        if (!payload?.pageOrder?.length) {
-            errors.push('page_order is required for reorder_pages');
-        }
-        return { errors };
-    }
-    async buildAsync(model) {
-        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();
-        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 = [];
-        const seenRouteIds = new Set();
-        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/reorder-pages-builder.ts

@@ -1,80 +0,0 @@
-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 };
-  }
-}