@designcrowd/library.brand-page 5.14.8-flacky-nav-21 → 5.14.9

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

@@ -1,4 +1,3 @@
-import { LOGO_MIGRATION_VERSION } from '../constants';
 import { type BrandPageModel, type LogoImageModel } from '../models';
 import { migration01 } from './migration/migration-01';
 import { migration01_1 } from './migration/migration-01_1';
@@ -6,24 +5,18 @@ import { migration02 } from './migration/migration-02';
 import { migration03 } from './migration/migration-03';
 import { migration04 } from './migration/migration-04';
 import { migration05 } from './migration/migration-05';
-import { migration06 } from './migration/migration-06';
 import { migration05_1 } from './migration/migration-05_1';
 import { migration05_2 } from './migration/migration-05_2';
-export interface MigrationData {
-  brandPageModel: BrandPageModel;
-  useOldLogoRenderSize: boolean;
-}
 
 interface MigrationTableItem {
   version: number;
   migrateFn: (
-    migrationResult: MigrationData,
+    brandPageModel: BrandPageModel,
     options: {
       logoImage?: LogoImageModel;
       isUserDraft: boolean;
-      isServerRender: boolean;
     },
-  ) => Promise<MigrationData>;
+  ) => BrandPageModel;
   description: string;
   runAlways?: boolean;
 }
@@ -71,42 +64,32 @@ const MIGRATION_TABLE = [
     migrateFn: migration05_2,
     description: 'Migrating twitter content to x content',
   },
-  {
-    version: 6,
-    migrateFn: migration06,
-  },
 ] as MigrationTableItem[];
 
 export const GetLatestModelVersion = () =>
   Math.max(...MIGRATION_TABLE.map((x) => x.version));
 
-export const migrateBrandPageModel = async (
+export const migrateBrandPageModel = (
   brandPageModel: BrandPageModel,
   options: {
     logoImage?: LogoImageModel;
     isUserDraft: boolean;
-    isServerRender: boolean;
   },
-): Promise<MigrationData> => {
+): BrandPageModel => {
   let modelVersion = brandPageModel.v;
 
-  let migrationResult: MigrationData = {
-    brandPageModel,
-    useOldLogoRenderSize: false,
-  };
-
   if (!modelVersion) {
     modelVersion = 0;
   }
 
-  for (const x of MIGRATION_TABLE) {
+  MIGRATION_TABLE.forEach((x) => {
     if (x.runAlways || modelVersion < x.version) {
-      migrationResult = await x.migrateFn(migrationResult, options);
+      brandPageModel = x.migrateFn(brandPageModel, options);
     }
-  }
+  });
 
   // Set the model to latest version
-  migrationResult.brandPageModel.v = GetLatestModelVersion();
+  brandPageModel.v = GetLatestModelVersion();
 
-  return migrationResult;
+  return brandPageModel;
 };

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

@@ -5,7 +5,7 @@ import {
 } from './migration/migration-02';
 
 describe('migration02.ts', () => {
-  test('migration02 should return converted letterspacing', async () => {
+  test('migration02 should return converted letterspacing', () => {
     const data: BrandPageData = {
       pages: [
         {
@@ -94,12 +94,7 @@ describe('migration02.ts', () => {
       ],
     };
 
-    const model = await migration02(
-      { brandPageModel: new BrandPageModel(data), useOldLogoRenderSize: false },
-      {
-        isUserDraft: false,
-      },
-    );
+    const model = migration02(new BrandPageModel(data), { isUserDraft: false });
 
     expect(model).toMatchSnapshot();
   });

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

@@ -60,7 +60,7 @@ describe('personalisation.util', async () => {
 
     const textContent = {
       ...createInitialTextContent({
-        brandPageType: 'default',
+        brandPageType: BRAND_PAGE_TYPES.brandSite,
       }),
       text,
       personalisationRole: undefined,
@@ -94,7 +94,7 @@ describe('personalisation.util', async () => {
 
     const textContent = {
       ...createInitialTextContent({
-        brandPageType: 'default',
+        brandPageType: BRAND_PAGE_TYPES.brandSite,
       }),
       text,
       personalisationRole: 'about',
@@ -120,7 +120,7 @@ describe('personalisation.util', async () => {
     // Assert
     expect(result.isModified).toBe(true);
     expect((result.model.pages[0].contents[0] as TextContent).text).toBe(
-      PERSONALISATION.aboutSection.description,
+      PERSONALISATION.aboutSection.descriptionShort,
     );
   });
 
@@ -162,7 +162,7 @@ describe('personalisation.util', async () => {
 
     const textContent = {
       ...createInitialTextContent({
-        brandPageType: 'default',
+        brandPageType: BRAND_PAGE_TYPES.brandSite,
       }),
       text: replaceText,
       personalisationRole: 'about',
@@ -207,7 +207,7 @@ describe('personalisation.util', async () => {
     // Assert
     expect(result.isModified).toBe(true);
     expect((result.model.pages[0].contents[0] as TextContent).text).toBe(
-      PERSONALISATION.aboutSection.description,
+      PERSONALISATION.aboutSection.descriptionShort,
     );
     expect(
       (result.model.pages[0].contents[1] as GeneralLinkContent).title,
@@ -217,7 +217,7 @@ describe('personalisation.util', async () => {
     ).toBe(PERSONALISATION.profileSection.title);
     expect(
       (result.model.pages[1].contents[0] as BannerSectionContent).description,
-    ).toBe(PERSONALISATION.profileSection.description);
+    ).toBe(PERSONALISATION.profileSection.descriptionShort);
   });
 
   test('applyUserPersonalisationToBrandPageModelAsync should return modified when input has personalised images contents', async () => {
@@ -704,7 +704,7 @@ describe('personalisation.util', async () => {
     // Arrange
     const textContent = {
       ...createInitialTextContent({
-        brandPageType: 'default',
+        brandPageType: BRAND_PAGE_TYPES.default,
       }),
       textItems: [
         {
@@ -826,7 +826,7 @@ describe('personalisation.util', async () => {
     // Arrange
     const textContent = {
       ...createInitialTextContent({
-        brandPageType: 'default',
+        brandPageType: BRAND_PAGE_TYPES.brandSite,
       }),
       textItems: [
         {
@@ -851,7 +851,7 @@ describe('personalisation.util', async () => {
     } as BannerSectionContent;
 
     const model = new BrandPageModel({
-      brandPageType: BRAND_PAGE_TYPES.default,
+      brandPageType: BRAND_PAGE_TYPES.brandSite,
       pages: [
         {
           title: 'home',

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

@@ -59,10 +59,8 @@ export const getModifiedPersonalisationPropertyKeyBasedOnCondition = (
 ) => {
   let newProperty = property;
 
-  if (
-    property === 'description' &&
-    option.brandPageType !== BRAND_PAGE_TYPES.brandSite
-  ) {
+  if (property === 'description') {
+    // For now we are using short description for all types
     newProperty = 'descriptionShort';
   } else if (property === 'imageUrls' || property === 'shapes') {
     newProperty = !!option.isSvgShape ? 'shapes' : 'imageUrls';

package/src/brand-page/utils/view-model.util.ts

@@ -274,7 +274,6 @@ export const mapToImageGalleryViewModel = (
 const mapToLogoViewModel = (
   content: LogoContent,
   globalStyles: LogoStyles,
-  useOldLogoRenderSize: boolean,
   options?: {
     width: string;
     height: string;
@@ -330,7 +329,6 @@ const mapToLogoViewModel = (
       },
     },
     isVisible: content.isLogoVisible,
-    useOldLogoRenderSize,
   });
 };
 
@@ -873,7 +871,6 @@ export const mapToPageHeaderViewModel = (
   pageHeader: PageHeaderDesktop | PageHeaderMobile,
   pageStyles: PageStyles,
   pages: PageViewModel[],
-  useOldLogoRenderSize = false,
 ): PageHeaderViewModel => {
   const viewport = pageHeader.viewport;
 
@@ -938,7 +935,7 @@ export const mapToPageHeaderViewModel = (
 
   return {
     displayStyle: pageHeader.displayStyle,
-    logo: mapToLogoViewModel(logoContent, logoStyles, useOldLogoRenderSize),
+    logo: mapToLogoViewModel(logoContent, logoStyles),
     pages: pages.filter((p) => !p.isHidden),
     navigation:
       viewport === VIEWPORTS.mobile
@@ -963,7 +960,6 @@ export const mapToPageHeaderViewModel = (
 export const mapToPageFooterViewModel = (
   pageFooter: PageFooterDesktop | PageFooterMobile,
   pageStyles: PageStyles,
-  useOldLogoRenderSize = false,
 ): PageFooterViewModel => {
   const {
     logoImageBase64Url,
@@ -1005,18 +1001,14 @@ export const mapToPageFooterViewModel = (
       { fill: pageStyles.textStyles?.style.color },
       pageFooter.iconStyle,
     ),
-    logo: mapToLogoViewModel(logoContent, logoStyles, useOldLogoRenderSize),
+    logo: mapToLogoViewModel(logoContent, logoStyles),
     socialLinks: pageFooter.socialLinks,
     textFontFamily: pageFooter.textFontFamily,
   };
 };
 
 export const mapToViewModel =
-  (
-    styles: PageStyles,
-    brandPageType: BrandPageType,
-    options?: { useOldLogoRenderSize: boolean },
-  ) =>
+  (styles: PageStyles, brandPageType: BrandPageType) =>
   (content: Content): ContentViewModel | undefined => {
     switch (content.type) {
       case 'image':
@@ -1033,15 +1025,10 @@ export const mapToViewModel =
           return undefined;
         }
 
-        return mapToLogoViewModel(
-          content as LogoContent,
-          styles.logoStyles,
-          options?.useOldLogoRenderSize || false,
-          {
-            height: DEFAULT_LOGO_HEIGHT,
-            width: DEFAULT_LOGO_WIDTH,
-          },
-        );
+        return mapToLogoViewModel(content as LogoContent, styles.logoStyles, {
+          height: DEFAULT_LOGO_HEIGHT,
+          width: DEFAULT_LOGO_WIDTH,
+        });
 
       case 'map':
         return mapToMapViewModel(content as MapContent);
@@ -1153,7 +1140,6 @@ export const getBrandPageViewModelFromBrandPageModel = (
   model: BrandPageModel,
   brandPageToken: string | undefined,
   showBrandCrowdLogo = true,
-  useOldLogoRenderSize = false,
 ): BrandPageViewModel => {
   const pages = model.pages.map((p) => {
     const contents = p.contents
@@ -1161,7 +1147,6 @@ export const getBrandPageViewModelFromBrandPageModel = (
         mapToViewModel(
           model.styles,
           model.brandPageType || BRAND_PAGE_TYPES.default,
-          { useOldLogoRenderSize },
         ),
       )
       .filter((c) => c !== undefined) as ContentViewModel[];
@@ -1183,23 +1168,19 @@ export const getBrandPageViewModelFromBrandPageModel = (
       model.pageHeaderDesktop,
       model.styles,
       pages,
-      useOldLogoRenderSize,
     ),
     headerViewModelMobile: mapToPageHeaderViewModel(
       model.pageHeaderMobile,
       model.styles,
       pages,
-      useOldLogoRenderSize,
     ),
     footerViewModelDesktop: mapToPageFooterViewModel(
       model.pageFooterDesktop,
       model.styles,
-      useOldLogoRenderSize,
     ),
     footerViewModelMobile: mapToPageFooterViewModel(
       model.pageFooterMobile,
       model.styles,
-      useOldLogoRenderSize,
     ),
     brandPageType: model.brandPageType || BRAND_PAGE_TYPES.default,
     faviconUrl: model.faviconUrl,

package/src/brand-page/view-models.ts

@@ -103,7 +103,6 @@ export interface LogoViewModel extends ContentViewModel {
   logoImageWidth: string | undefined;
   /** @deprecated */
   imageStyle?: LogoStyles['imageStyle'];
-  useOldLogoRenderSize?: boolean;
 }
 
 export interface ProfileViewModel

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

@@ -27,7 +27,6 @@ import {
   BRAND_PAGE_PERSONALISED,
   PUBLISHED_DESIGN_DRAFT_TOKEN,
   BRAND_SITE,
-  BRAND_SITE_SAMPLE_WITH_LOGO,
   CUSTOM_DOMAIN_DESIGN_DRAFT_TOKEN,
   brandPageCustom,
   BRAND_CONTACT,
@@ -596,56 +595,6 @@ export const SamplePublishedWithCustomDomain: Story = {
   }),
 };
 
-export const SamplePublishedBrandSiteWithLogo: Story = {
-  name: 'Sample (published brandsite with logo)',
-  render: () => ({
-    setup() {
-      InitialiseMakerStores({});
-
-      const containerStore = useBrandPageContainerStore();
-
-      containerStore.$patch({
-        isSellDomainNameEnabled: true,
-        baseFabricRenderUrl: FABRIC_RENDER_BASE_URL,
-      });
-
-      containerStore.setBrandPageStatus('Published');
-      containerStore.setDesignDraftToken({
-        designDraftToken: CUSTOM_DOMAIN_DESIGN_DRAFT_TOKEN,
-      });
-      containerStore.brandPageBaseUrl = 'https://brand.site';
-      containerStore.setSlug({
-        slug: 'my-page',
-      });
-    },
-    components: {
-      BrandPageMaker,
-    },
-    data() {
-      return {
-        viewModel: {
-          brandPageData: JSON.stringify(BRAND_SITE_SAMPLE_WITH_LOGO),
-          isSaving: false,
-          logoDraftDesignAttributes: simpleLogoDesignAttributes,
-          logoVariationImageUrls,
-          baseBrandPageUrl: 'https://brand.site',
-          features: userFeatures,
-          initialCategories: {},
-        },
-        show: false,
-      };
-    },
-    template: `
-      <BrandPageMaker v-if="show" :view-model="viewModel"/>
-    `,
-    pinia: setupStoryPinia(),
-    async beforeMount() {
-      await setLocaleAsync('en-US');
-      this.show = true;
-    },
-  }),
-};
-
 export const SamplePublishedBrandSite: Story = {
   name: 'Sample (published brandsite)',
   render: () => ({
@@ -1389,7 +1338,7 @@ SampleAdminMode.story = {
 };
 
 export const SampleAdminModeBrandSite: Story = {
-  name: 'Sample (admin mode brandsite1)',
+  name: 'Sample (admin mode brandsite)',
   render: () => ({
     setup() {
       InitialiseMakerStores({ isAdmin: true });