@designcrowd/library.brand-page 5.10.15-sync-fix-1 → 5.10.15

package/lib/src/index.mjs

@@ -63798,7 +63798,7 @@ const r0 = (e) => {
       pageIndex: e,
       contents: t
     }) {
-      e >= this.pages.length || (console.log("before", this.pages[e].contents), this.pages[e].contents = [...t], console.log("after", this.pages[e].contents));
+      e >= this.pages.length || (this.pages[e].contents = t);
     },
     setPages({ pages: e }) {
       var r;
@@ -64190,15 +64190,14 @@ const rt = Qt("uiContentSettings", {
       item: e,
       index: t
     }) {
-      console.log("Adding item:", e), this.items.splice(t ?? this.items.length, 0, e), this.initialiseItemState({ item: e });
+      this.items.splice(t ?? this.items.length, 0, e), this.initialiseItemState({ item: e });
     },
     async setState(e) {
       this.$patch(e.newState), await this.updateIsDefaultTextColorRequired();
     },
     _deleteItem({ id: e }) {
-      console.log("Deleting item with id:", e, this.items);
-      const t = this.items.findIndex((n) => (console.log("Checking items ", n, "againsts:", e), n.id === e));
-      if (console.log("Item index:", t), t < 0) {
+      const t = this.items.findIndex((n) => n.id === e);
+      if (t < 0) {
         console.error(`Unable to find content item by id '${e}'`);
         return;
       }
@@ -64392,7 +64391,7 @@ const rt = Qt("uiContentSettings", {
       id: e,
       itemState: t
     }) {
-      console.log("======= before setItemState =======", this.itemStates), this.itemStates[e] = t, console.log("======= after setItemState =======", this.itemStates);
+      this.itemStates[e] = t;
     },
     setItemGroupState({
       id: e,
@@ -64896,16 +64895,19 @@ const rt = Qt("uiContentSettings", {
             logoImageBase64Url: void 0
           });
         });
-      }), n.pages.forEach((i) => {
-        i.contents.forEach((r) => {
-          if (r.type !== "logo")
-            return r;
-          const s = { ...r };
-          let o = e;
-          t && (o = {
-            ...o,
-            logoVariation: s.settings.content.logoImage.logoVariation
-          }), s.settings.content.logoImage = o, s.settings.content.logoImageBase64Url = void 0;
+      }), n.pages.forEach((i, r) => {
+        n.setPageContents({
+          pageIndex: r,
+          contents: i.contents.map((s) => {
+            if (s.type !== "logo")
+              return s;
+            const o = { ...s };
+            let a = e;
+            return t && (a = {
+              ...a,
+              logoVariation: o.settings.content.logoImage.logoVariation
+            }), o.settings.content.logoImage = a, o.settings.content.logoImageBase64Url = void 0, o;
+          })
         });
       });
     },
@@ -78821,7 +78823,7 @@ const eZ1 = /* @__PURE__ */ v(KF1, [["render", QF1], ["__scopeId", "data-v-8240b
       };
       g.setLogoImageToAllContentsAndSections({
         logoImage: N
-      }), g.setSelectedLogoImage(N), D.logoDesignAttributes && (console.log("Here? "), g.applyLogoDesignAttributes(D.logoDesignAttributes));
+      }), g.setSelectedLogoImage(N), D.logoDesignAttributes && g.applyLogoDesignAttributes(D.logoDesignAttributes), s.currentLogoIsByo = !0;
     }, R = () => {
       if (o.isPrePurchase) {
         c.setSelectedTabName({
@@ -89186,9 +89188,9 @@ const L6e = /* @__PURE__ */ v(T6e, [["render", H6e], ["__scopeId", "data-v-99257
         logoVariation: 0,
         logoLastUpdate: Date.now().toString()
       };
-      this.logoSettingsStore.setLogoImageToAllContentsAndSections({
+      this.logoSettingStore.setLogoImageToAllContentsAndSections({
         logoImage: t
-      }), this.logoSettingsStore.setSelectedLogoImage(t), e.logoDesignAttributes && this.logoSettingsStore.applyLogoDesignAttributes(
+      }), this.logoSettingStore.setSelectedLogoImage(t), e.logoDesignAttributes && this.logoSettingStore.applyLogoDesignAttributes(
         e.logoDesignAttributes
       );
     }

package/lib/src/shared/content-settings/store/content-settings-store.js

@@ -8,7 +8,6 @@ import { useUiSideBarStore } from '../../side-bar/store';
 import { createDefaultContentItemGroupState, createDefaultContentItemState, } from '../../navigation-style-settings/store';
 import { adminValidatorsDict, dummyValidator, validatorDict, } from '../../../brand-page-maker/validators';
 import { vueDeepMerge } from '../../../helpers/vue.helper';
-import cloneDeep from 'lodash.clonedeep';
 const DEFAULT_TEXT_COLOR_DEPENDENT_TYPES = [
     'profile',
     'text',
@@ -40,7 +39,6 @@ export const useUiContentSettingsStore = defineStore('uiContentSettings', {
             uiStore.onContentChanged();
         },
         _addItem({ item, index, }) {
-            console.log('Adding item:', item);
             this.items.splice(index ?? this.items.length, 0, item);
             this.initialiseItemState({ item });
         },
@@ -49,12 +47,7 @@ export const useUiContentSettingsStore = defineStore('uiContentSettings', {
             await this.updateIsDefaultTextColorRequired();
         },
         _deleteItem({ id: id }) {
-            console.log('Deleting item with id:', id, this.items);
-            const idx = this.items.findIndex((i) => {
-                console.log('Checking items ', i, 'againsts:', id);
-                return i.id === id;
-            });
-            console.log('Item index:', idx);
+            const idx = this.items.findIndex((i) => i.id === id);
             if (idx < 0) {
                 console.error(`Unable to find content item by id '${id}'`);
                 return;
@@ -249,9 +242,7 @@ export const useUiContentSettingsStore = defineStore('uiContentSettings', {
             this.activeCategoryTab = activeCategoryTab;
         },
         setItemState({ id, itemState, }) {
-            console.log('======= before setItemState =======', this.itemStates);
             this.itemStates[id] = itemState;
-            console.log('======= after setItemState =======', this.itemStates);
         },
         setItemGroupState({ id, groupId, groupState, }) {
             if (!this.itemStates[id]) {

package/lib/src/shared/logo-settings/components/LogoSettings.mixin.js

@@ -39,12 +39,12 @@ export default defineComponent({
                 logoVariation: 0,
                 logoLastUpdate: Date.now().toString(),
             };
-            this.logoSettingsStore.setLogoImageToAllContentsAndSections({
+            this.logoSettingStore.setLogoImageToAllContentsAndSections({
                 logoImage,
             });
-            this.logoSettingsStore.setSelectedLogoImage(logoImage);
+            this.logoSettingStore.setSelectedLogoImage(logoImage);
             if (response.logoDesignAttributes) {
-                this.logoSettingsStore.applyLogoDesignAttributes(response.logoDesignAttributes);
+                this.logoSettingStore.applyLogoDesignAttributes(response.logoDesignAttributes);
             }
         },
     },

package/lib/src/shared/logo-settings/store/logo-settings-store.js

@@ -69,23 +69,25 @@ export const useUiLogoSettingsStore = defineStore('uiLogoSettings', {
                 });
             });
             // TODO: test me
-            pageSettingsStore.pages.forEach((p) => {
-                // This is modifying the p.contents in memory. Calling map (over forEach) will create a new array
-                // causing the content in the page and contents settings store to be out of sync
-                p.contents.forEach((c) => {
-                    if (c.type !== 'logo') {
-                        return c;
-                    }
-                    const logoContentItem = { ...c };
-                    let thisLogoImage = logoImage;
-                    if (keepLogoVariation) {
-                        thisLogoImage = {
-                            ...thisLogoImage,
-                            logoVariation: logoContentItem.settings.content.logoImage.logoVariation,
-                        };
-                    }
-                    logoContentItem.settings.content.logoImage = thisLogoImage;
-                    logoContentItem.settings.content.logoImageBase64Url = undefined;
+            pageSettingsStore.pages.forEach((p, i) => {
+                pageSettingsStore.setPageContents({
+                    pageIndex: i,
+                    contents: p.contents.map((c) => {
+                        if (c.type !== 'logo') {
+                            return c;
+                        }
+                        const logoContentItem = { ...c };
+                        let thisLogoImage = logoImage;
+                        if (keepLogoVariation) {
+                            thisLogoImage = {
+                                ...thisLogoImage,
+                                logoVariation: logoContentItem.settings.content.logoImage.logoVariation,
+                            };
+                        }
+                        logoContentItem.settings.content.logoImage = thisLogoImage;
+                        logoContentItem.settings.content.logoImageBase64Url = undefined;
+                        return logoContentItem;
+                    }),
                 });
             });
         },

package/lib/src/shared/page-settings/store/page-settings-store.js

@@ -70,9 +70,7 @@ export const useUiPageSettingsStore = defineStore('uiPageSettings', {
             if (pageIndex >= this.pages.length) {
                 return;
             }
-            console.log('before', this.pages[pageIndex].contents);
-            this.pages[pageIndex].contents = [...contents];
-            console.log('after', this.pages[pageIndex].contents);
+            this.pages[pageIndex].contents = contents;
         },
         setPages({ pages }) {
             const contentSettingsStore = useUiContentSettingsStore();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@designcrowd/library.brand-page",
   "description": "A collection of Maker/Designer applications",
-  "version": "5.10.15-sync-fix-1",
+  "version": "5.10.15",
   "author": "Design.com Eng",
   "license": "UNLICENSED",
   "type": "module",

package/src/shared/content-settings/components/logo-selection-field/LogoSelection.vue

@@ -357,9 +357,10 @@ const onLogoUpload = (response: CreateWebsiteByoUploadResult) => {
   logoSettingStore.setSelectedLogoImage(logoImage);
 
   if (response.logoDesignAttributes) {
-    console.log('Here? ');
     logoSettingStore.applyLogoDesignAttributes(response.logoDesignAttributes);
   }
+
+  data.currentLogoIsByo = true;
 };
 
 const onEditLogoButtonClicked = () => {

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

@@ -50,7 +50,6 @@ import {
   validatorDict,
 } from '../../../brand-page-maker/validators';
 import { vueDeepMerge } from '../../../helpers/vue.helper';
-import cloneDeep from 'lodash.clonedeep';
 
 const DEFAULT_TEXT_COLOR_DEPENDENT_TYPES: readonly ContentType[] = [
   'profile',
@@ -115,7 +114,6 @@ export const useUiContentSettingsStore = defineStore('uiContentSettings', {
       item: ContentItem<any>;
       index?: number;
     }): void {
-      console.log('Adding item:', item);
       this.items.splice(index ?? this.items.length, 0, item);
       this.initialiseItemState({ item });
     },
@@ -127,15 +125,7 @@ export const useUiContentSettingsStore = defineStore('uiContentSettings', {
       await this.updateIsDefaultTextColorRequired();
     },
     _deleteItem({ id: id }: { id: string }): void {
-      console.log('Deleting item with id:', id, this.items);
-
-      const idx = this.items.findIndex((i) => {
-        console.log('Checking items ', i, 'againsts:', id);
-
-        return i.id === id;
-      });
-
-      console.log('Item index:', idx);
+      const idx = this.items.findIndex((i) => i.id === id);
 
       if (idx < 0) {
         console.error(`Unable to find content item by id '${id}'`);
@@ -466,9 +456,7 @@ export const useUiContentSettingsStore = defineStore('uiContentSettings', {
       id: string;
       itemState: ContentSettingsItemState;
     }): void {
-      console.log('======= before setItemState =======', this.itemStates);
       this.itemStates[id] = itemState;
-      console.log('======= after setItemState =======', this.itemStates);
     },
     setItemGroupState({
       id,

package/src/shared/logo-settings/components/LogoSettings.mixin.ts

@@ -55,14 +55,14 @@ export default defineComponent({
         logoLastUpdate: Date.now().toString(),
       };
 
-      this.logoSettingsStore.setLogoImageToAllContentsAndSections({
+      this.logoSettingStore.setLogoImageToAllContentsAndSections({
         logoImage,
       });
 
-      this.logoSettingsStore.setSelectedLogoImage(logoImage);
+      this.logoSettingStore.setSelectedLogoImage(logoImage);
 
       if (response.logoDesignAttributes) {
-        this.logoSettingsStore.applyLogoDesignAttributes(
+        this.logoSettingStore.applyLogoDesignAttributes(
           response.logoDesignAttributes,
         );
       }

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

@@ -134,29 +134,32 @@ export const useUiLogoSettingsStore = defineStore('uiLogoSettings', {
       });
 
       // TODO: test me
-      pageSettingsStore.pages.forEach((p) => {
-        // This is modifying the p.contents in memory. Calling map (over forEach) will create a new array
-        // causing the content in the page and contents settings store to be out of sync
-        p.contents.forEach((c) => {
-          if (c.type !== 'logo') {
-            return c;
-          }
+      pageSettingsStore.pages.forEach((p, i) => {
+        pageSettingsStore.setPageContents({
+          pageIndex: i,
+          contents: p.contents.map((c) => {
+            if (c.type !== 'logo') {
+              return c;
+            }
 
-          const logoContentItem = { ...c } as ContentItem<LogoContent>;
+            const logoContentItem = { ...c } as ContentItem<LogoContent>;
 
-          let thisLogoImage = logoImage;
+            let thisLogoImage = logoImage;
 
-          if (keepLogoVariation) {
-            thisLogoImage = {
-              ...thisLogoImage,
-              logoVariation:
-                logoContentItem.settings.content.logoImage.logoVariation,
-            };
-          }
+            if (keepLogoVariation) {
+              thisLogoImage = {
+                ...thisLogoImage,
+                logoVariation:
+                  logoContentItem.settings.content.logoImage.logoVariation,
+              };
+            }
 
-          logoContentItem.settings.content.logoImage = thisLogoImage;
+            logoContentItem.settings.content.logoImage = thisLogoImage;
 
-          logoContentItem.settings.content.logoImageBase64Url = undefined;
+            logoContentItem.settings.content.logoImageBase64Url = undefined;
+
+            return logoContentItem;
+          }),
         });
       });
     },

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

@@ -146,11 +146,7 @@ export const useUiPageSettingsStore = defineStore('uiPageSettings', {
         return;
       }
 
-      console.log('before', this.pages[pageIndex].contents);
-
-      this.pages[pageIndex].contents = [...contents];
-
-      console.log('after', this.pages[pageIndex].contents);
+      this.pages[pageIndex].contents = contents;
     },
     setPages({ pages }: { pages: ContentPage[] }): void {
       const contentSettingsStore = useUiContentSettingsStore();

package/lib/src/brand-page-maker/stores/route/localised-route-store.js

@@ -1 +0,0 @@
-"use strict";