@designcrowd/library.brand-page 5.17.21-ast-bugs → 5.17.21

package/lib/src/shared/content-settings/components/GenericTextInput.mixin.js

@@ -1,7 +1,7 @@
 import { defineComponent } from 'vue';
 import debounce from 'lodash.debounce';
 import { TextInput, Textarea } from '@designcrowd/fe-shared-lib';
-import { encodeContentText, escapeContentText, unescapeContentText, } from '@brand-page/utils';
+import { escapeContentText, unescapeContentText } from '@brand-page/utils';
 import { genericTextInputTr } from '@src/composables/useTranslate';
 const DEBOUNCE_WAIT_MS = 100;
 export default defineComponent({
@@ -119,13 +119,7 @@ export default defineComponent({
                 if (this.value === false) {
                     return false;
                 }
-                if (!this.value) {
-                    return '';
-                }
-                if (this.showRichTextEditor) {
-                    return this.value;
-                }
-                return unescapeContentText(this.value);
+                return this.value ? unescapeContentText(this.value) : '';
             },
             set(newVal) {
                 if (newVal === false) {
@@ -133,10 +127,11 @@ export default defineComponent({
                 }
                 else {
                     if (this.showRichTextEditor) {
+                        // Todo: re-visit this while working on content senatization
                         this._value = newVal;
                     }
                     else {
-                        this._value = encodeContentText(newVal);
+                        this._value = escapeContentText(newVal);
                     }
                 }
                 this.emitChangeDebounce && this.emitChangeDebounce();
@@ -166,7 +161,7 @@ export default defineComponent({
         },
         showRichTextEditor(newVal) {
             if (!newVal && this._value && typeof this._value === 'string') {
-                this._value = encodeContentText(this._value);
+                this._value = escapeContentText(this._value);
                 this.emitChange();
             }
         },

package/lib/src/shared/content-settings/components/text-items-field/TextItemsField.mixin.js

@@ -2,7 +2,7 @@ import { defineComponent, computed } from 'vue';
 import { FONT_SIZE_BODY, MAX_LENGTH_ERROR_MESSAGE, MAX_TEXT_LENGTH, TEXT_EMPTY, TEXT_STYLE_TYPES, } from '@brand-page';
 import debounce from 'lodash.debounce';
 import cloneDeep from 'lodash.clonedeep';
-import { decodeHtmlEntities, escapeContentText } from '@brand-page/utils';
+import { escapeContentText } from '@brand-page/utils';
 import { useSnapshotStore } from '@brand-page-maker/stores';
 import { getPlainTextFromRTE, replaceTextInRTE } from '@brand-page-maker/utils';
 import { isDefaultContentText } from '../../utils';
@@ -102,9 +102,9 @@ export default defineComponent({
         },
         getItemTextPreview(text) {
             if (this.showRichTextEditor) {
-                return decodeHtmlEntities(escapeContentText(text) ?? '');
+                return escapeContentText(text) ?? '';
             }
-            return decodeHtmlEntities(text);
+            return text;
         },
         emitChange() {
             const payload = {

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

@@ -989,7 +989,6 @@ declare const _default: import("vue").DefineComponent<{}, {
     colorPickerValue(): (option: ButtonStyleConfigOption) => any;
     isRenderedInStorybook(): boolean;
     isWidthToggled(): boolean;
-    filteredButtonStyleOptions(): ButtonStyleConfigOption[];
     brandName(): "Design.com" | "BrandCrowd";
     hideText(): any;
 }, {

package/lib/src/shared/style-settings/components/StyleSettings.mixin.js

@@ -78,14 +78,6 @@ export default defineComponent({
         isWidthToggled() {
             return this.brandPageType === 'brandSite';
         },
-        filteredButtonStyleOptions() {
-            if (!this.selectedButtonStyleConfig)
-                return [];
-            if (this.brandPageType === 'brandSite') {
-                return this.selectedButtonStyleConfig.options.filter((o) => o !== 'buttonIconColor');
-            }
-            return this.selectedButtonStyleConfig.options;
-        },
         brandName() {
             return this.isDesignCom ? 'Design.com' : 'BrandCrowd';
         },

package/package.json

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

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

@@ -20,30 +20,5 @@ export const escapeContentText = (
 };
 
 export const unescapeContentText = (text: string): string => {
-  return text
-    .replace(new RegExp(`${ESCAPED_NEWLINE_CHARACTER}`, 'g'), '\n')
-    .replace(/&lt;/g, '<')
-    .replace(/&gt;/g, '>')
-    .replace(/&amp;/g, '&');
-};
-
-export const encodeContentText = (
-  text: string | undefined,
-): string | undefined => {
-  if (!text) {
-    return text;
-  }
-
-  return text
-    .replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/(\r\n|\r|\n)/g, ESCAPED_NEWLINE_CHARACTER);
-};
-
-export const decodeHtmlEntities = (text: string): string => {
-  return text
-    .replace(/&lt;/g, '<')
-    .replace(/&gt;/g, '>')
-    .replace(/&amp;/g, '&');
+  return text.replace(new RegExp(`${ESCAPED_NEWLINE_CHARACTER}`, 'g'), '\n');
 };

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

@@ -4,11 +4,7 @@ import debounce from 'lodash.debounce';
 import type { PropType } from 'vue';
 import { TextInput, Textarea } from '@designcrowd/fe-shared-lib';
 import type { ContentItemFieldSettings } from '../models';
-import {
-  encodeContentText,
-  escapeContentText,
-  unescapeContentText,
-} from '@brand-page/utils';
+import { escapeContentText, unescapeContentText } from '@brand-page/utils';
 import { genericTextInputTr } from '@src/composables/useTranslate';
 
 const DEBOUNCE_WAIT_MS = 100;
@@ -133,24 +129,17 @@ export default defineComponent({
           return false;
         }
 
-        if (!this.value) {
-          return '';
-        }
-
-        if (this.showRichTextEditor) {
-          return this.value;
-        }
-
-        return unescapeContentText(this.value);
+        return this.value ? unescapeContentText(this.value) : '';
       },
       set(newVal: string | false): void {
         if (newVal === false) {
           this._value = false;
         } else {
           if (this.showRichTextEditor) {
+            // Todo: re-visit this while working on content senatization
             this._value = newVal;
           } else {
-            this._value = encodeContentText(newVal);
+            this._value = escapeContentText(newVal);
           }
         }
 
@@ -184,7 +173,7 @@ export default defineComponent({
 
     showRichTextEditor(newVal: boolean) {
       if (!newVal && this._value && typeof this._value === 'string') {
-        this._value = encodeContentText(this._value);
+        this._value = escapeContentText(this._value);
         this.emitChange();
       }
     },

package/src/shared/content-settings/components/testimonial-items-field/TestimonialItemsField.vue

@@ -9,7 +9,7 @@
     >
       <template #preview="option">
         <p class="tw-w-full testimonial-preview">
-          {{ decodeHtmlEntities(option.item.testimonials) }}
+          {{ option.item.testimonials }}
         </p>
       </template>
       <template #form="option">
@@ -209,7 +209,6 @@ import GenerateAiButton from '../generate-ai-button/GenerateAiButton.vue';
 import { testimonialItemsFieldTr } from '@src/composables/useTranslate';
 import { getCtaLocationFromFieldType } from '@brand-page-maker/utils/mixpanel.util';
 import PersonalisationOverrideField from '../../../content-settings/components/personalisation-override-field/PersonalisationOverrideField.vue';
-import { decodeHtmlEntities } from '@brand-page/utils';
 
 export default {
   components: {
@@ -227,7 +226,6 @@ export default {
     return {
       testimonialItemsFieldTr,
       getCtaLocationFromFieldType,
-      decodeHtmlEntities,
     };
   },
 };

package/src/shared/content-settings/components/text-items-field/TextItemsField.mixin.ts

@@ -17,7 +17,7 @@ import type { DebounceHandle } from 'lodash.debounce';
 import debounce from 'lodash.debounce';
 import type { UpdateItemValuePayload } from '../../models';
 import cloneDeep from 'lodash.clonedeep';
-import { decodeHtmlEntities, escapeContentText } from '@brand-page/utils';
+import { escapeContentText } from '@brand-page/utils';
 import { useSnapshotStore } from '@brand-page-maker/stores';
 import { getPlainTextFromRTE, replaceTextInRTE } from '@brand-page-maker/utils';
 import { isDefaultContentText } from '../../utils';
@@ -125,10 +125,10 @@ export default defineComponent({
     },
     getItemTextPreview(text: string): string {
       if (this.showRichTextEditor) {
-        return decodeHtmlEntities(escapeContentText(text) ?? '');
+        return escapeContentText(text) ?? '';
       }
 
-      return decodeHtmlEntities(text);
+      return text;
     },
     emitChange(): void {
       const payload: UpdateItemValuePayload<TextItem[]> = {

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

@@ -114,17 +114,6 @@ export default defineComponent({
     isWidthToggled() {
       return this.brandPageType === 'brandSite';
     },
-    filteredButtonStyleOptions(): ButtonStyleConfigOption[] {
-      if (!this.selectedButtonStyleConfig) return [];
-
-      if (this.brandPageType === 'brandSite') {
-        return this.selectedButtonStyleConfig.options.filter(
-          (o) => o !== 'buttonIconColor',
-        );
-      }
-
-      return this.selectedButtonStyleConfig.options;
-    },
     brandName() {
       return this.isDesignCom ? 'Design.com' : 'BrandCrowd';
     },

package/src/shared/style-settings/components/StyleSettings.vue

@@ -195,7 +195,7 @@
         <!-- Start Button options -->
         <div v-if="selectedButtonStyleConfig">
           <div
-            v-for="(option, optionIndex) in filteredButtonStyleOptions"
+            v-for="(option, optionIndex) in selectedButtonStyleConfig.options"
             :key="optionIndex"
             class="tw-mb-4 tw-flex tw-justify-between"
             :class="{