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

package/src/shared/background-settings/components/background-shapes/BackgroundShapeSettings.mixin.ts

@@ -5,7 +5,10 @@ import StyleSettingsSection from '../../../style-settings/components/StyleSettin
 import ColorPicker from '@brand-page-maker/components/color-palette/BpColorPicker.vue';
 import { hexToRGBA } from '@utils/helpers';
 import { isColorMatched } from '@brand-page-maker/utils';
-import { useBrandPageMakerUserStore } from '@brand-page-maker/stores';
+import {
+  useBrandPageMakerUserStore,
+  useBrandPageContainerStore,
+} from '@brand-page-maker/stores';
 
 export default defineComponent({
   components: {
@@ -27,10 +30,11 @@ export default defineComponent({
   },
   setup() {
     const userStore = useBrandPageMakerUserStore();
+    const containerStore = useBrandPageContainerStore();
     const backgroundSettingsStore = useUiBackgroundSettingsStore();
 
     return {
-      isAdmin: computed(() => userStore.isAdminMaker),
+      isAdmin: computed(() => containerStore.isAdminMaker),
       backgroundStyles: computed(
         () => backgroundSettingsStore.backgroundStyles,
       ),

package/src/shared/content-settings/components/content-settings/ContentSettings.mixin.ts

@@ -13,6 +13,7 @@ import { CONTENT_SETTINGS_MODES } from '../../store';
 import {
   useBrandPageMakerStore,
   useBrandPageMakerUserStore,
+  useBrandPageContainerStore,
 } from '@brand-page-maker/stores';
 import { SIDE_BAR_CONTENT_ID } from '../../constants';
 import type { ComponentPublicInstance } from '@vue/runtime-core';
@@ -44,6 +45,7 @@ export default defineComponent({
     const pageNavigationStore = usePageNavigationStore();
     const styleSettingsStore = useUiStyleSettingsStore();
     const userStore = useBrandPageMakerUserStore();
+    const containerStore = useBrandPageContainerStore();
     const eventTracker = useEventTracker();
     const historyStore = useHistoryStore();
     const { externalEditor } = useExternalRichTextEditor();
@@ -57,7 +59,7 @@ export default defineComponent({
       contentSettingsSelectedItemId: computed(
         () => contentSettingsStore.selectedItemId,
       ),
-      isAdmin: computed(() => userStore.isAdminMaker),
+      isAdmin: computed(() => containerStore.isAdminMaker),
       canUseRichTextEditor: computed(
         () => userStore.features.canUseRichTextEditor,
       ),

package/src/shared/content-settings/components/content-settings/ReplaceImageSettingsForContent.mixin.ts

@@ -13,6 +13,7 @@ import type {
 import { useUiContentSettingsStore } from '../../store';
 import {
   useBrandPageMakerUserStore,
+  useBrandPageContainerStore,
   useBrandPageMakerStore,
   useVideoStore,
   GETTY_VIDEO_LIMIT_FOR_SITE,
@@ -33,6 +34,7 @@ export default defineComponent({
     const brandPageMakerStore = useBrandPageMakerStore();
     const contentSettingsStore = useUiContentSettingsStore();
     const userStore = useBrandPageMakerUserStore();
+    const containerStore = useBrandPageContainerStore();
     const pageSettingsStore = useUiPageSettingsStore();
     const videoStore = useVideoStore();
     const bpEventTracker = useEventTracker();
@@ -52,7 +54,7 @@ export default defineComponent({
         () => contentSettingsStore.selectedItemTemplate?.type,
       ),
       mode: computed(() => contentSettingsStore.mode),
-      isAdmin: computed(() => userStore.isAdminMaker),
+      isAdmin: computed(() => containerStore.isAdminMaker),
       contentSettingsStore,
       userStore,
       pageSettingsStore,

package/src/shared/content-settings/components/content-settings-item/ContentSettingsItem.mixin.ts

@@ -14,7 +14,7 @@ import { useUiContentSettingsStore, CONTENT_SETTINGS_MODES } from '../../store';
 import { SIDE_BAR_CONTENT_ID } from '../../constants';
 import {
   useBrandPageMakerStore,
-  useBrandPageMakerUserStore,
+  useBrandPageContainerStore,
   useRouteStore,
   useUiStore,
 } from '@brand-page-maker/stores';
@@ -59,7 +59,7 @@ export default defineComponent({
     const sideBarStore = useUiSideBarStore();
     const brandPageMakerStore = useBrandPageMakerStore();
     const uiStore = useUiStore();
-    const userStore = useBrandPageMakerUserStore();
+    const containerStore = useBrandPageContainerStore();
     const routeStore = useRouteStore();
     const eventTracker = useEventTracker();
 
@@ -72,7 +72,7 @@ export default defineComponent({
       isPersonalisationEnabled: computed(
         () => uiStore.isPersonalisationEnabled,
       ),
-      isAdmin: computed(() => userStore.isAdminMaker),
+      isAdmin: computed(() => containerStore.isAdminMaker),
       contentSettingsStore,
       sideBarStore,
       eventTracker,

package/src/shared/content-settings/components/content-settings-item/ContentSettingsItemField.mixin.ts

@@ -68,7 +68,7 @@ export default defineComponent({
       getContent: computed(() => contentSettingsStore.getContent),
       getValue: computed(() => contentSettingsStore.getValue),
       brandPageData: computed(() => brandPageMakerStore.brandPageData),
-      isAdmin: computed(() => userStore.isAdminMaker),
+      isAdmin: computed(() => brandPageContainerStore.isAdminMaker),
       isDesignCom: computed(() => brandPageContainerStore.isDesignCom),
       canUseRichTextEditor: computed(
         () => userStore.features.canUseRichTextEditor,

package/src/shared/content-settings/components/focused-content-item-settings/FocusedContentItemSettings.mixin.ts

@@ -15,6 +15,7 @@ import { useUiContentSettingsStore } from '../../store';
 import {
   useBrandPageMakerStore,
   useBrandPageMakerUserStore,
+  useBrandPageContainerStore,
   useRouteStore,
   useUiStore,
 } from '@brand-page-maker/stores';
@@ -39,6 +40,8 @@ export default defineComponent({
     const _styleSettingsStore = useUiStyleSettingsStore();
 
     const userStore = useBrandPageMakerUserStore();
+
+    const containerStore = useBrandPageContainerStore();
     const uiStore = useUiStore();
     const routeStore = useRouteStore();
     const { externalEditor } = useExternalRichTextEditor();
@@ -54,7 +57,7 @@ export default defineComponent({
       isPersonalisationEnabled: computed(
         () => uiStore.isPersonalisationEnabled,
       ),
-      isAdmin: computed(() => userStore.isAdminMaker),
+      isAdmin: computed(() => containerStore.isAdminMaker),
       canUseRichTextEditor: computed(
         () => userStore.features.canUseRichTextEditor,
       ),

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

@@ -18,7 +18,7 @@
       @on-click.stop="onEditLogoButtonClicked"
     />
   </div>
-  <div v-if="userStore.isAdminMaker">
+  <div v-if="containerStore.isAdminMaker">
     <LogoField
       :value="selectedLogo"
       button-label="Change Logo"
@@ -119,7 +119,6 @@ import LogoVersions from '@shared/logo-versions/LogoVersions.vue';
 import LogoVariations from '@shared/logo-settings/components/LogoVariations.vue';
 import {
   useBrandPageContainerStore,
-  useBrandPageMakerUserStore,
   useLogoStore,
 } from '@brand-page-maker/stores/index';
 import { computed, onMounted, reactive, watch } from 'vue';
@@ -200,7 +199,6 @@ const containerStore = useBrandPageContainerStore();
 const logoStore = useLogoStore();
 const editableLogoStore = useUiEditableLogoStore();
 const sideBarStore = useUiSideBarStore();
-const userStore = useBrandPageMakerUserStore();
 
 const currentLogoIsByo = computed(() => {
   const logoDraftAsset = logoStore.getLogoDraftAssetByToken(

package/src/shared/content-settings/components/personalisation-override-field/PersonalisationOverrideField.vue

@@ -1,5 +1,8 @@
 <template>
-  <div v-if="userStore.isAdminMaker && getDefaultAiProperty" class="tw-mt-2">
+  <div
+    v-if="containerStore.isAdminMaker && getDefaultAiProperty"
+    class="tw-mt-2"
+  >
     <div class="tw-border tw-border-solid tw-rounded tw-p-2">
       <div
         class="tw-relative tw-flex"
@@ -52,12 +55,12 @@ import {
 } from '@brand-page/utils/personalisation.util';
 import {
   useBrandPageMakerStore,
-  useBrandPageMakerUserStore,
+  useBrandPageContainerStore,
 } from '@brand-page-maker/stores';
 import type { PersonalisationMappingType } from '@brand-page/models/user-personalisation.model';
 import { personalisationOverrideTr } from '@src/composables/useTranslate';
 
-const userStore = useBrandPageMakerUserStore();
+const containerStore = useBrandPageContainerStore();
 const brandPageMakerStore = useBrandPageMakerStore();
 
 const emit = defineEmits(['update:modelValue']);

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

@@ -34,6 +34,7 @@ import {
   useUiStore,
   useBrandPageMakerUserStore,
   useBrandPageMakerStore,
+  useBrandPageContainerStore,
   useVideoStore,
 } from '@brand-page-maker/stores';
 import { useHistoryStore } from '@brand-page-maker/stores/history/history-store';
@@ -918,7 +919,7 @@ export const useUiContentSettingsStore = defineStore('uiContentSettings', {
     },
 
     validateItem(payload: ValidateItemPayload): void {
-      const userStore = useBrandPageMakerUserStore();
+      const containerStore = useBrandPageContainerStore();
 
       const item = this.items.find((i) => i.id === payload.id);
 
@@ -951,7 +952,7 @@ export const useUiContentSettingsStore = defineStore('uiContentSettings', {
         return;
       }
 
-      let genericValidator: Validator = userStore.isAdminMaker
+      let genericValidator: Validator = containerStore.isAdminMaker
         ? adminValidatorsDict[
             fieldTypeAssessor !== undefined ? fieldType : fieldConfig.type
           ]

package/src/shared/models.ts

@@ -3,7 +3,6 @@ import type { UIUserFeatures } from '../constants/ui';
 
 export interface UIUserState {
   isAdmin: boolean;
-  isAdminMaker: boolean;
   features: UIUserFeatures;
 }
 

package/src/shared/my-uploads/MyUploads.mixin.ts

@@ -7,6 +7,7 @@ import type { MediaFile } from '../../clients/models';
 import { DEFAULT_UPLOAD_FILE_LIMIT } from '../../constants/ui';
 import {
   useBrandPageMakerUserStore,
+  useBrandPageContainerStore,
   useUiStore,
 } from '@brand-page-maker/stores';
 import { formatKilobytes } from '@brand-page-maker/utils/file-size.util';
@@ -58,6 +59,7 @@ export default defineComponent({
   setup() {
     const uiStore = useUiStore();
     const userStore = useBrandPageMakerUserStore();
+    const containerStore = useBrandPageContainerStore();
 
     const dropzoneImageUploaderRef = ref<InstanceType<
       typeof DropzoneImageUploader
@@ -67,7 +69,7 @@ export default defineComponent({
       dropzoneImageUploaderRef,
       endpoints: computed(() => uiStore.endpoints),
       uiStore,
-      isAdmin: computed(() => !!userStore.isAdminMaker),
+      isAdmin: computed(() => !!containerStore.isAdminMaker),
       isLoggedIn: computed(() => !!userStore.emailAddress),
     };
   },

package/src/shared/page-settings/components/page-settings/PageSettings.mixin.ts

@@ -231,7 +231,7 @@ export default defineComponent({
       ),
       sections: computed(() => pageSettingsStore.sections),
       features: computed(() => userStore.features),
-      isAdmin: computed(() => userStore.isAdminMaker),
+      isAdmin: computed(() => brandPageContainerStore.isAdminMaker),
       isBrandSite: computed(() => brandPageMakerStore.isBrandSite),
       navigationStyleTypeConfigs: computed(
         () => navigationSettingsStore.navigationStyleTypeConfigs,

package/src/shared/shape-library/ShapeLibrary.vue

@@ -176,7 +176,6 @@ import {
 import {
   useBrandPageContainerStore,
   useBrandPageMakerStore,
-  useBrandPageMakerUserStore,
   useUiStore,
 } from '@brand-page-maker/stores';
 import { useUiSideBarStore } from '@shared/side-bar/store/side-bar-store';
@@ -191,15 +190,14 @@ import debounce from 'lodash.debounce';
 const uiStore = useUiStore();
 const containerStore = useBrandPageContainerStore();
 const makerStore = useBrandPageMakerStore();
-const makerUserStore = useBrandPageMakerUserStore();
 const sidebarStore = useUiSideBarStore();
 
-const isAdmin = computed(() => makerUserStore.isAdminMaker);
+const isAdmin = computed(() => containerStore.isAdminMaker);
 const isBackgroundTab = computed(
   () => sidebarStore.selectedTabName === 'BackgroundSettings',
 );
 const makerMode = computed(() =>
-  makerUserStore.isAdminMaker
+  containerStore.isAdminMaker
     ? `admin_${makerStore.brandPageType.toLocaleLowerCase()}`
     : makerStore.brandPageType.toLocaleLowerCase(),
 );

package/src/shared/side-bar/components/SideBar.mixin.ts

@@ -38,7 +38,7 @@ export default defineComponent({
       brandPageContainerStore,
       tabs: computed(() => sideBarStore.tabs),
       selectedTabName: computed(() => sideBarStore.selectedTabName),
-      isAdmin: computed(() => userStore.isAdminMaker),
+      isAdmin: computed(() => brandPageContainerStore.isAdminMaker),
       contentSettingsMode: computed(() => contentSettingsStore.mode),
       contentSettingsSelectedItemId: computed(
         () => contentSettingsStore.selectedItemId,

package/src/shared/style-settings/components/StyleSettings.mixin.ts

@@ -69,7 +69,7 @@ export default defineComponent({
       isDefaultTextColorRequired: computed(
         () => uiStore.isDefaultTextColorRequired,
       ),
-      isAdmin: computed(() => userStore.isAdminMaker),
+      isAdmin: computed(() => brandPageContainerStore.isAdminMaker),
       brandPageType: computed(() => brandPageMakerStore.brandPageType),
       showBrandCrowdLogo: computed(
         () => brandPageMakerStore.showBrandCrowdLogo,

package/src/shared/style-settings/components/text-style-options-settings-with-state/TextStyleOptionsSettingsWithState.vue

@@ -26,6 +26,7 @@ import TextStyleField from '../../../content-settings/components/text-style-fiel
 import { useUiStyleSettingsStore } from '../../store';
 import {
   useBrandPageMakerUserStore,
+  useBrandPageContainerStore,
   useUiStore,
 } from '@brand-page-maker/stores';
 import { useUiPageSettingsStore } from '@shared/page-settings/store';
@@ -37,6 +38,7 @@ import { transformToRTE } from '@brand-page-maker/utils';
 
 const styleSettingsStore = useUiStyleSettingsStore();
 const userStore = useBrandPageMakerUserStore();
+const containerStore = useBrandPageContainerStore();
 const uiStore = useUiStore();
 const uiPageSettingStore = useUiPageSettingsStore();
 
@@ -48,7 +50,7 @@ const textStyleOptions = computed(
   () => styleSettingsStore.textStyles.textStyleOptions,
 );
 
-const isAdmin = computed(() => userStore.isAdminMaker);
+const isAdmin = computed(() => containerStore.isAdminMaker);
 const canUseRichTextEditor = computed(
   () => userStore.features.canUseRichTextEditor,
 );

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

@@ -21,7 +21,6 @@ import { defineStore, storeToRefs } from 'pinia';
 import {
   useBrandPageContainerStore,
   useBrandPageMakerStore,
-  useBrandPageMakerUserStore,
   useLogoStore,
   useUiStore,
 } from '@brand-page-maker/stores';
@@ -129,10 +128,10 @@ export const useUiTemplateSettingsStore = defineStore('uiTemplateSettings', {
   },
   getters: {
     renderAsImage(): boolean {
-      const brandPageMakerUserStore = useBrandPageMakerUserStore();
+      const brandPageContainerStore = useBrandPageContainerStore();
 
       // Admin users get live previews, non-admin users get images
-      return !brandPageMakerUserStore.isAdminMaker;
+      return !brandPageContainerStore.isAdminMaker;
     },
   },
   actions: {
@@ -262,7 +261,6 @@ export const useUiTemplateSettingsStore = defineStore('uiTemplateSettings', {
     async loadPageNo({ pageNo }: { pageNo: number }) {
       const brandPageMakerStore = useBrandPageMakerStore();
       const brandPageContainerStore = useBrandPageContainerStore();
-      const brandPageMakerUserStore = useBrandPageMakerUserStore();
       const logoSettingsStore = useUiLogoSettingsStore();
       const logoStore = useLogoStore();
       const editableLogoStore = useUiEditableLogoStore();
@@ -431,7 +429,7 @@ export const useUiTemplateSettingsStore = defineStore('uiTemplateSettings', {
         const templates = await Promise.all(
           result.paginatedItems.map(async (item) => {
             try {
-              if (brandPageMakerUserStore.isAdminMaker) {
+              if (brandPageContainerStore.isAdminMaker) {
                 const template =
                   await designTemplateClient.getTemplateByTemplateToken(
                     item.designTemplateToken,
@@ -652,7 +650,7 @@ export const useUiTemplateSettingsStore = defineStore('uiTemplateSettings', {
     setupLogoChangeWatcher() {
       const logoSettingsStore = useUiLogoSettingsStore();
       const editableLogoStore = useUiEditableLogoStore();
-      const brandPageMakerUserStore = useBrandPageMakerUserStore();
+      const brandPageContainerStore = useBrandPageContainerStore();
       const { selectedLogoImage } = storeToRefs(logoSettingsStore);
       const { editableLogoVariations } = storeToRefs(editableLogoStore);
 
@@ -674,12 +672,12 @@ export const useUiTemplateSettingsStore = defineStore('uiTemplateSettings', {
             newLogoImage.logoVariation !== oldLogoImage.logoVariation;
 
           if (
-            !brandPageMakerUserStore.isAdminMaker &&
+            !brandPageContainerStore.isAdminMaker &&
             newLogoImage.logoDraftToken &&
             hasLogoChanged
           ) {
             const uiStore = useUiStore();
-            const isPrePurchase = useBrandPageContainerStore().isPrePurchase;
+            const isPrePurchase = brandPageContainerStore.isPrePurchase;
 
             uiStore.setUserPersonalisationData({
               personalisationData: undefined,
@@ -723,7 +721,7 @@ export const useUiTemplateSettingsStore = defineStore('uiTemplateSettings', {
             return;
           }
 
-          if (brandPageMakerUserStore.isAdminMaker) {
+          if (brandPageContainerStore.isAdminMaker) {
             return;
           }