@designcrowd/library.brand-page 6.1.6-use-isadminmaker-1 → 6.1.6-use-isadminmaker-3

package/lib/src/brand-page-maker/components/upgrade-to-premium-button/UpgradeToPremiumButton.mixin.d.ts

@@ -8,7 +8,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     brandPageContainerStore: import("pinia").Store<"brandPageContainer", import("@brand-page-maker/stores").BrandPageContainerState, {
         brandPageContentTypes(): string[];
         isAdmin(): boolean;
-        isAdminMaker(): boolean;
         isPublished: (state: {
             availableTaxes: any[];
             brandPageBaseUrl: string;
@@ -45,6 +44,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             isUpgradeModalVisible: boolean;
             isPublishing: boolean;
             isProduction: boolean;
+            isAdminMaker: boolean;
             isSellDomainNameEnabled: boolean;
             isStripeOnboardingModalVisible: boolean;
             isReactivationModal: boolean;
@@ -139,6 +139,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             isUpgradeModalVisible: boolean;
             isPublishing: boolean;
             isProduction: boolean;
+            isAdminMaker: boolean;
             isSellDomainNameEnabled: boolean;
             isStripeOnboardingModalVisible: boolean;
             isReactivationModal: boolean;
@@ -233,6 +234,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             isUpgradeModalVisible: boolean;
             isPublishing: boolean;
             isProduction: boolean;
+            isAdminMaker: boolean;
             isSellDomainNameEnabled: boolean;
             isStripeOnboardingModalVisible: boolean;
             isReactivationModal: boolean;

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

@@ -9,7 +9,7 @@ import { type ComputedRef } from 'vue';
  *      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.isAdminMaker`). The
+ *   2. The session is NOT in admin-maker mode (`containerStore.isAdminMaker`). The
  *      admin maker uses the same components but a different editing flow
  *      (template authoring) where undo/redo is out of scope.
  */

package/lib/src/brand-page-maker/composables/useUndoRedoFlag.js

@@ -1,5 +1,6 @@
 import { computed } from 'vue';
 import { useBrandPageMakerUserStore } from '@brand-page-maker/stores/user';
+import { useBrandPageContainerStore } from '@brand-page-maker/stores';
 /**
  * Returns whether undo/redo is active for the current maker session. Both
  * conditions must hold:
@@ -10,11 +11,12 @@ import { useBrandPageMakerUserStore } from '@brand-page-maker/stores/user';
  *      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.isAdminMaker`). The
+ *   2. The session is NOT in admin-maker mode (`containerStore.isAdminMaker`). The
  *      admin maker uses the same components but a different editing flow
  *      (template authoring) where undo/redo is out of scope.
  */
 export function useUndoRedoFlag() {
     const userStore = useBrandPageMakerUserStore();
-    return computed(() => userStore.features.canUseUndoRedo && !userStore.isAdminMaker);
+    const containerStore = useBrandPageContainerStore();
+    return computed(() => userStore.features.canUseUndoRedo && !containerStore.isAdminMaker);
 }

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

@@ -29,6 +29,7 @@ export interface BrandPageContainerState {
     isUpgradeModalVisible: boolean;
     isPublishing: boolean;
     isProduction: boolean;
+    isAdminMaker: boolean;
     isSellDomainNameEnabled: boolean;
     isStripeOnboardingModalVisible: boolean;
     isReactivationModal: boolean;
@@ -69,7 +70,7 @@ export type GettyVideoEditorViewModelResponse = {
         uri: string;
     };
 };
-export type InitialisePayload = Omit<BrandPageContainerState, 'customDomain' | 'customDomainConfig'> & {
+export type InitialisePayload = Omit<BrandPageContainerState, 'customDomain' | 'customDomainConfig' | 'isAdminMaker'> & {
     logoDraftToken?: string;
     isAdminMaker?: boolean;
     brandPageCustomDomain?: CustomDomainModel;
@@ -88,7 +89,6 @@ export declare const BRANDPAGE_STATUS: Readonly<{
 export declare const useBrandPageContainerStore: import("pinia").StoreDefinition<"brandPageContainer", BrandPageContainerState, {
     brandPageContentTypes(): string[];
     isAdmin(): boolean;
-    isAdminMaker(): boolean;
     isPublished: (state: {
         availableTaxes: any[];
         brandPageBaseUrl: string;
@@ -125,6 +125,7 @@ export declare const useBrandPageContainerStore: import("pinia").StoreDefinition
         isUpgradeModalVisible: boolean;
         isPublishing: boolean;
         isProduction: boolean;
+        isAdminMaker: boolean;
         isSellDomainNameEnabled: boolean;
         isStripeOnboardingModalVisible: boolean;
         isReactivationModal: boolean;
@@ -219,6 +220,7 @@ export declare const useBrandPageContainerStore: import("pinia").StoreDefinition
         isUpgradeModalVisible: boolean;
         isPublishing: boolean;
         isProduction: boolean;
+        isAdminMaker: boolean;
         isSellDomainNameEnabled: boolean;
         isStripeOnboardingModalVisible: boolean;
         isReactivationModal: boolean;
@@ -313,6 +315,7 @@ export declare const useBrandPageContainerStore: import("pinia").StoreDefinition
         isUpgradeModalVisible: boolean;
         isPublishing: boolean;
         isProduction: boolean;
+        isAdminMaker: boolean;
         isSellDomainNameEnabled: boolean;
         isStripeOnboardingModalVisible: boolean;
         isReactivationModal: boolean;

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

@@ -40,6 +40,7 @@ export const useBrandPageContainerStore = defineStore('brandPageContainer', {
             publishErrorMessage: '',
             isBrandPageSlugEditMode: false,
             isProduction: false,
+            isAdminMaker: false,
             isPublishModalVisible: false,
             isPublishing: false,
             isSaving: false,
@@ -94,8 +95,7 @@ export const useBrandPageContainerStore = defineStore('brandPageContainer', {
             }
             const brandPageMakerStore = useBrandPageMakerStore();
             const templateSettingsStore = useUiTemplateSettingsStore();
-            const userStore = useBrandPageMakerUserStore();
-            userStore.setIsAdminMaker(payload.isAdminMaker ?? false);
+            this.isAdminMaker = payload.isAdminMaker ?? false;
             this.brandPageBaseUrl = payload.brandPageBaseUrl;
             this.baseFabricRenderUrl = localisedRouteStore.baseFabricRenderDomain;
             this.brandPageDescription = payload.brandPageDescription;
@@ -587,10 +587,9 @@ export const useBrandPageContainerStore = defineStore('brandPageContainer', {
             };
         },
         async saveBrandPage(payload = {}) {
-            const userStore = useBrandPageMakerUserStore();
             const brandPageMakerStore = useBrandPageMakerStore();
             const _eventTracker = useEventTracker();
-            if (userStore.isAdminMaker) {
+            if (this.isAdminMaker) {
                 throw new Error('save brand page is not allowed in admin mode');
             }
             if (this.standalone) {
@@ -684,8 +683,7 @@ export const useBrandPageContainerStore = defineStore('brandPageContainer', {
             }
         },
         async saveAndPublishBrandPage(eventButtonLocation) {
-            const userStore = useBrandPageMakerUserStore();
-            if (userStore.isAdminMaker) {
+            if (this.isAdminMaker) {
                 throw new Error('save brand page is not allowed in admin mode');
             }
             const response = await this.saveBrandPage({
@@ -711,9 +709,8 @@ export const useBrandPageContainerStore = defineStore('brandPageContainer', {
             }
         },
         async saveTemplate() {
-            const userStore = useBrandPageMakerUserStore();
             const brandPageMakerStore = useBrandPageMakerStore();
-            if (!userStore.isAdminMaker) {
+            if (!this.isAdminMaker) {
                 throw new Error('saveTemplate is not allowed in non admin mode');
             }
             const dataObject = brandPageMakerStore.brandPageTemplate;
@@ -988,10 +985,6 @@ export const useBrandPageContainerStore = defineStore('brandPageContainer', {
             const userStore = useBrandPageMakerUserStore();
             return userStore.isAdmin;
         },
-        isAdminMaker() {
-            const userStore = useBrandPageMakerUserStore();
-            return userStore.isAdminMaker;
-        },
         isPublished: (state) => {
             return state.brandPageStatus === 'Published';
         },

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

@@ -185,14 +185,14 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
         },
         async recalculateLogoSizes(forceRecalculate = false) {
             const brandPageContainerStore = useBrandPageContainerStore();
-            const userStore = useBrandPageMakerUserStore();
             const pageSettingsStore = useUiPageSettingsStore();
             const logoSettingsStore = useUiLogoSettingsStore();
             const editableLogoStore = useUiEditableLogoStore();
-            if (!userStore.isAdminMaker && this.isBrandSite) {
+            if (!brandPageContainerStore.isAdminMaker && this.isBrandSite) {
                 await recalculateHeaderLogoSizes(pageSettingsStore, logoSettingsStore, editableLogoStore.editableLogoVariations, this.brandPageType, brandPageContainerStore.isPrePurchase, forceRecalculate);
             }
-            else if (!userStore.isAdminMaker && this.isBrandPageOrIsBrandContact) {
+            else if (!brandPageContainerStore.isAdminMaker &&
+                this.isBrandPageOrIsBrandContact) {
                 await recalculateLogoContentDimensions(pageSettingsStore, editableLogoStore.editableLogoVariations, logoSettingsStore.selectedLogoImage, brandPageContainerStore.isPrePurchase);
             }
         },
@@ -203,7 +203,6 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
             const templateSettingsStore = useUiTemplateSettingsStore();
             const navigationStyleSettingsStore = useUiNavigationStyleSettingsStore();
             const backgroundSettingsStore = useUiBackgroundSettingsStore();
-            const userStore = useBrandPageMakerUserStore();
             const containerStore = useBrandPageContainerStore();
             const uiContentSettings = useUiContentSettingsStore();
             const editableLogoStore = useUiEditableLogoStore();
@@ -230,7 +229,7 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
             let brandPageModel = cloneDeep(template.brandPageModel);
             // Apply selected logo image to logo contents
             const { logoImageUrl, logoImageBase64Url } = logoSettingsStore.selectedLogoImageUrl;
-            if (userStore.isAdminMaker) {
+            if (containerStore.isAdminMaker) {
                 const logoTemplateImage = logoUtil.safeGetLogoTemplateImageFromLogoTemplateImageUrl(logoImageUrl);
                 if (logoTemplateImage) {
                     brandPageModel = applyLogoTemplateImageToBrandPageTemplateModel(brandPageModel, logoTemplateImage);
@@ -334,7 +333,7 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
                 },
             });
             pageNavigationStore.setCurrentActivePage({});
-            if (userStore.isAdminMaker) {
+            if (containerStore.isAdminMaker) {
                 styleSettingsStore.setAdminStyleOptionDefaultValues();
                 backgroundSettingsStore.setAdminBackgroundOptionDefaultValues();
             }
@@ -342,7 +341,7 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
             styleSettingsStore.setButtonStyles(brandPageModel.styles.buttonStyles);
             styleSettingsStore.setTextStyles(brandPageModel.styles.textStyles);
             styleSettingsStore.setGalleryStyles(brandPageModel.styles.galleryStyles);
-            if (!userStore.isAdminMaker) {
+            if (!containerStore.isAdminMaker) {
                 containerStore.setDesignTemplateToken({
                     designTemplateToken: this.selectedTemplateId,
                 });
@@ -903,7 +902,7 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
                     brandPageModel.styles = model.styles;
                     brandPageModel.pages = model.pages;
                 }
-                if (!userStore.isAdminMaker) {
+                if (!brandPageContainerStore.isAdminMaker) {
                     const { model } = applyLogoThemeToBrandPageModel(logoTheme, new BrandPageModel(brandPageModel));
                     brandPageModel.styles = model.styles;
                     brandPageModel.pageHeaderMobile = model.pageHeaderMobile;
@@ -1133,10 +1132,9 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
             });
         },
         initialiseAdminMaker(payload) {
-            const userStore = useBrandPageMakerUserStore();
             const adminLogoSettingsStore = useAdminLogoSettingsStore();
             const uiContentSettings = useUiContentSettingsStore();
-            if (!userStore.isAdminMaker) {
+            if (!useBrandPageContainerStore().isAdminMaker) {
                 return;
             }
             adminLogoSettingsStore.setPreviewLogoTemplateModels({
@@ -1381,7 +1379,7 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
             const uiStore = useUiStore();
             const videoStore = useVideoStore();
             const brandPageContainerStore = useBrandPageContainerStore();
-            if (userStore.isAdminMaker && uiStore.logoTheme) {
+            if (brandPageContainerStore.isAdminMaker && uiStore.logoTheme) {
                 const themedBrandPage = applyLogoThemeToBrandPageModel(uiStore.logoTheme, this.brandPageData).model;
                 return getBrandPageViewModelFromBrandPageModel(themedBrandPage, this.brandPageToken, undefined, {
                     useOldLogoRenderSize: false,
@@ -1431,9 +1429,9 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
             return !this.isSaving;
         },
         isPublished() {
-            const userStore = useBrandPageMakerUserStore();
             const brandPageContainerStore = useBrandPageContainerStore();
-            return !userStore.isAdminMaker && brandPageContainerStore.isPublished;
+            return (!brandPageContainerStore.isAdminMaker &&
+                brandPageContainerStore.isPublished);
         },
         isPublishing() {
             const brandPageContainerStore = useBrandPageContainerStore();
@@ -1453,7 +1451,8 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
         },
         showBrandCrowdLogo() {
             const userStore = useBrandPageMakerUserStore();
-            return !userStore.isAdminMaker && userStore.features.showBrandCrowdLogo;
+            return (!useBrandPageContainerStore().isAdminMaker &&
+                userStore.features.showBrandCrowdLogo);
         },
     },
 });

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

@@ -2,7 +2,6 @@ import { defineStore } from 'pinia';
 import { UI_DEVICE_MODES, UI_SCREENSIZE_MODES } from '@shared/models';
 import { DEFAULT_LOGO_BACKGROUND_COLOR_RGB, DEFAULT_LOGO_TEXT_COLOR_RGB, } from '@brand-page/constants';
 import { useBrandPageMakerStore, } from '../brandpage-maker';
-import { useBrandPageMakerUserStore } from '../user';
 import { useBrandPageContainerStore, } from '../brandpage-container';
 import { DEFAULT_ADMIN_ENDPOINTS, DEFAULT_USER_ENDPOINTS, } from '@brand-page-maker/constants';
 import { getColorShades } from '@brand-page/utils';
@@ -79,9 +78,8 @@ export const useUiStore = defineStore('ui', {
             this.logoDraftToken = payload.logoDraftToken;
         },
         async triggerLockedContentClickedEvent(payload) {
-            const userStore = useBrandPageMakerUserStore();
             const brandPageContainerStore = useBrandPageContainerStore();
-            if (userStore.isAdminMaker) {
+            if (brandPageContainerStore.isAdminMaker) {
                 return;
             }
             await brandPageContainerStore.triggerLockedContentClickedEvent(payload.type);
@@ -103,8 +101,8 @@ export const useUiStore = defineStore('ui', {
     },
     getters: {
         endpoints: () => {
-            const userStore = useBrandPageMakerUserStore();
-            if (userStore.isAdminMaker) {
+            const brandPageContainerStore = useBrandPageContainerStore();
+            if (brandPageContainerStore.isAdminMaker) {
                 return DEFAULT_ADMIN_ENDPOINTS;
             }
             else {

package/lib/src/brand-page-maker/stores/user/user-store.d.ts

@@ -19,5 +19,4 @@ export declare const useBrandPageMakerUserStore: import("pinia").StoreDefinition
         brandPageCommissionPercentage?: number;
         features?: Partial<UserFeatures>;
     }): void;
-    setIsAdminMaker(isAdminMaker: boolean): void;
 }>;

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

@@ -24,12 +24,10 @@ export const useBrandPageMakerUserStore = defineStore('brandPageMakerUser', {
         emailAddress: '',
         hasPremiumSubscription: false,
         brandPageCommissionPercentage: undefined,
-        // Retained for backward-compat, superseded by `isAdminMaker`. Still populated by
-        // `setUserState`, but no longer read by library code — use `isAdminMaker` instead.
+        // Retained for backward-compat, superseded by the container store's `isAdminMaker`.
+        // Still populated by `setUserState`, but no longer read by library code — admin maker
+        // mode is a property of the editing container, not user identity.
         isAdmin: false,
-        // Identifies admin maker mode. Populated via the container store's `initialise`
-        // (see `setIsAdminMaker`), which is what library code now branches on.
-        isAdminMaker: false,
         userToken: undefined,
     }),
     actions: {
@@ -42,8 +40,5 @@ export const useBrandPageMakerUserStore = defineStore('brandPageMakerUser', {
             this.isAdmin = payload.isAdmin || false;
             this.features = Object.assign({}, this.features, payload.features);
         },
-        setIsAdminMaker(isAdminMaker) {
-            this.isAdminMaker = isAdminMaker;
-        },
     },
 });

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

@@ -53,7 +53,9 @@ export const useVideoStore = defineStore('video', {
             const isPrePurchase = brandPageContainerStore.isPrePurchase;
             const hasPremiumSubscription = userStore.hasPremiumSubscription;
             return (canUseGettyVideos &&
-                (userStore.isAdminMaker || isPrePurchase || hasPremiumSubscription));
+                (brandPageContainerStore.isAdminMaker ||
+                    isPrePurchase ||
+                    hasPremiumSubscription));
         },
     },
 });