@licklist/design 0.69.6-dev.0 → 0.69.6-dev.1

package/dist/events/event-card/EventCard.js

@@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next';
 import * as Config from '@licklist/core/dist/Config';
 import { FaEye, FaExternalLinkAlt, FaEdit, FaCopy, FaTrashAlt } from 'react-icons/fa';
 import { TipTapEditor } from '../../tiptap-editor/TipTapEditor.js';
-import { getStatisticInfo, formatContentWithoutTags, EVENT_DESCRIPTION_SIZE } from './utils.js';
+import { getStatisticInfo, formatContent, EVENT_DESCRIPTION_SIZE } from './utils.js';
 import { ReactComponent as SvgChartBar } from '../../assets/dashboard/chartBar.svg.js';
 
 function _object_without_properties(source, excluded) {
@@ -45,7 +45,7 @@ function EventCard(param) {
         "totalViews"
     ]);
     var memoedContent = useMemo(function() {
-        return formatContentWithoutTags(description, EVENT_DESCRIPTION_SIZE);
+        return formatContent(description, EVENT_DESCRIPTION_SIZE);
     }, [
         description
     ]);

package/dist/events/event-card/utils.d.ts

@@ -1,8 +1,8 @@
 import { EventStatistic } from '@licklist/core/dist/DataMapper/Provider/EventStatisticDataMapper';
-export declare function formatContent(content: any, maxSymbols: any): any;
-export declare const formatContentWithoutTags: (content: any, maxLength?: number) => any;
 export declare const MIN_EVENT_DESCRIPTION_SIZE = 150;
 export declare const EVENT_DESCRIPTION_SIZE = 350;
+export declare const EMOJI_REGEX: RegExp;
+export declare const formatContent: (content: any, maxLength?: number) => any;
 /**
  * Calculate the total number of views from the given dates and event statistic.
  *

package/dist/events/event-card/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/events/event-card/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAA;AAGjG,wBAAgB,aAAa,CAAC,OAAO,KAAA,EAAE,UAAU,KAAA,OAIhD;AAED,eAAO,MAAM,wBAAwB,2CAkBpC,CAAA;AAED,eAAO,MAAM,0BAA0B,MAAM,CAAA;AAC7C,eAAO,MAAM,sBAAsB,MAAM,CAAA;AAEzC;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,UACvB,MAAM,EAAE,kBACC,cAAc,KAC7B,MAIA,CAAA;AAEH;;;;;;;GAOG;AACH,eAAO,MAAM,2BAA2B,UAC/B,MAAM,EAAE,kBACC,cAAc,KAC7B,CAAC,MAAM,EAAE,MAAM,CAejB,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,mBACX,cAAc,GAAG,IAAI,QAC/B,MAAM,KACX;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;CA4BpB,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/events/event-card/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAA;AAGjG,eAAO,MAAM,0BAA0B,MAAM,CAAC;AAC9C,eAAO,MAAM,sBAAsB,MAAM,CAAC;AAC1C,eAAO,MAAM,WAAW,QAAuE,CAAC;AAEhG,eAAO,MAAM,aAAa,2CAUzB,CAAC;AAMF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,UACvB,MAAM,EAAE,kBACC,cAAc,KAC7B,MAIA,CAAA;AAEH;;;;;;;GAOG;AACH,eAAO,MAAM,2BAA2B,UAC/B,MAAM,EAAE,kBACC,cAAc,KAC7B,CAAC,MAAM,EAAE,MAAM,CAejB,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,mBACX,cAAc,GAAG,IAAI,QAC/B,MAAM,KACX;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;CA4BpB,CAAA"}

package/dist/events/event-card/utils.js

@@ -47,26 +47,22 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Map" || n === "Set") return Array.from(n);
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
-function formatContent(content, maxSymbols) {
-    if (!content) return '';
-    if (content.length > maxSymbols) return "".concat(content.slice(0, maxSymbols), "...");
-    return content;
-}
-var formatContentWithoutTags = function(content) {
+var EVENT_DESCRIPTION_SIZE = 350;
+var EMOJI_REGEX = /<span data-emoji-replacer=""><img[^>]*alt="([^"]+)"[^>]*><\/span>/g;
+var formatContent = function(content) {
     var maxLength = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : EVENT_DESCRIPTION_SIZE;
     if (!content) return '';
-    if (content < maxLength) return content;
-    var text = content.replace(/<[^>]*>/g, '');
-    var trimmedText = text.trim().replace(/&nbsp;|[^a-zA-Z0-9\s]/g, '').replace(/\s\s+/g, ' ');
-    var words = trimmedText.slice(0, maxLength).split(' ');
-    var contentWithMinLength = content.slice(0, MIN_EVENT_DESCRIPTION_SIZE);
-    var index = String(content).indexOf(words[words.length - 2]);
-    var slicedContent = content.slice(0, index);
-    var contentWithMinSize = contentWithMinLength.length > slicedContent.length ? contentWithMinLength : slicedContent;
-    return contentWithMinSize.concat('...');
+    var replacedContent = replaceEmojiImagesWithText(content);
+    if (replacedContent.length <= maxLength) {
+        return replacedContent;
+    }
+    return replacedContent.slice(0, maxLength).concat('...');
 };
-var MIN_EVENT_DESCRIPTION_SIZE = 150;
-var EVENT_DESCRIPTION_SIZE = 350;
+function replaceEmojiImagesWithText(text) {
+    return text.replace(EMOJI_REGEX, function(_, emojiText) {
+        return emojiText;
+    });
+}
 /**
  * Calculate the total number of views from the given dates and event statistic.
  *
@@ -140,4 +136,4 @@ var EVENT_DESCRIPTION_SIZE = 350;
     };
 };
 
-export { EVENT_DESCRIPTION_SIZE, MIN_EVENT_DESCRIPTION_SIZE, calculateTotalSoldAndAmount, calculateTotalViews, formatContent, formatContentWithoutTags, getStatisticInfo };
+export { EMOJI_REGEX, EVENT_DESCRIPTION_SIZE, calculateTotalSoldAndAmount, calculateTotalViews, formatContent, getStatisticInfo };

package/dist/product-set/control/DateInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DateInput.d.ts","sourceRoot":"","sources":["../../../src/product-set/control/DateInput.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAOzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,uEAAuE,CAAA;AAG5G,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAA;AAiBrF,MAAM,WAAW,4BAA4B;IAC3C,eAAe,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAA;CAClD;AAED,UAAU,2BAA2B;IACnC,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAA;IACtB,4BAA4B,EAAE,OAAO,CAAA;IACrC,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAED,eAAO,MAAM,SAAS,mFAKnB,2BAA2B,4CAuP7B,CAAA;AAED,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAC5C,WAAW,EACX,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsBxB,CAAA"}
+{"version":3,"file":"DateInput.d.ts","sourceRoot":"","sources":["../../../src/product-set/control/DateInput.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAOzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,uEAAuE,CAAA;AAG5G,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAA;AAiBrF,MAAM,WAAW,4BAA4B;IAC3C,eAAe,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAA;CAClD;AAED,UAAU,2BAA2B;IACnC,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAA;IACtB,4BAA4B,EAAE,OAAO,CAAA;IACrC,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAED,eAAO,MAAM,SAAS,mFAKnB,2BAA2B,4CAyP7B,CAAA;AAED,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAC5C,WAAW,EACX,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsBxB,CAAA"}

package/dist/product-set/control/DateInput.js

@@ -216,7 +216,7 @@ function _ts_generator(thisArg, body) {
 }
 var DateInput = function(param) {
     var isEventEditProductSet = param.isEventEditProductSet, isLoading = param.isLoading, workHours = param.workHours, providerHasBookingManagement = param.providerHasBookingManagement;
-    var _errors_menuRecurrences__availableTimes, _errors_menuRecurrences_, _errors_menuRecurrences, _errors_menuRecurrences1;
+    var _errors_menuRecurrences, _errors_menuRecurrences_root, _errors_menuRecurrences1, _errors_menuRecurrences__availableTimes, _errors_menuRecurrences_, _errors_menuRecurrences2;
     var _useFormContext = useFormContext(), control = _useFormContext.control, register = _useFormContext.register, errors = _useFormContext.formState.errors, getValues = _useFormContext.getValues, setValue = _useFormContext.setValue, clearErrors = _useFormContext.clearErrors;
     var _useFieldArray = useFieldArray({
         name: 'menuRecurrences',
@@ -359,6 +359,7 @@ var DateInput = function(param) {
             }));
         }, 100);
     };
+    var errorMessage = ((_errors_menuRecurrences = errors.menuRecurrences) === null || _errors_menuRecurrences === void 0 ? void 0 : _errors_menuRecurrences.message) || ((_errors_menuRecurrences1 = errors.menuRecurrences) === null || _errors_menuRecurrences1 === void 0 ? void 0 : (_errors_menuRecurrences_root = _errors_menuRecurrences1.root) === null || _errors_menuRecurrences_root === void 0 ? void 0 : _errors_menuRecurrences_root.message);
     return /*#__PURE__*/ jsxs(Form.Group, {
         children: [
             /*#__PURE__*/ jsx(Form.Label, {
@@ -381,7 +382,7 @@ var DateInput = function(param) {
                                 isLoading: isLoading,
                                 ref: availableTimesFormRef,
                                 defaultValues: availableTimes,
-                                errorMessage: errors === null || errors === void 0 ? void 0 : (_errors_menuRecurrences = errors.menuRecurrences) === null || _errors_menuRecurrences === void 0 ? void 0 : (_errors_menuRecurrences_ = _errors_menuRecurrences["".concat(editState === null || editState === void 0 ? void 0 : editState.index)]) === null || _errors_menuRecurrences_ === void 0 ? void 0 : (_errors_menuRecurrences__availableTimes = _errors_menuRecurrences_.availableTimes) === null || _errors_menuRecurrences__availableTimes === void 0 ? void 0 : _errors_menuRecurrences__availableTimes.message,
+                                errorMessage: errors === null || errors === void 0 ? void 0 : (_errors_menuRecurrences2 = errors.menuRecurrences) === null || _errors_menuRecurrences2 === void 0 ? void 0 : (_errors_menuRecurrences_ = _errors_menuRecurrences2["".concat(editState === null || editState === void 0 ? void 0 : editState.index)]) === null || _errors_menuRecurrences_ === void 0 ? void 0 : (_errors_menuRecurrences__availableTimes = _errors_menuRecurrences_.availableTimes) === null || _errors_menuRecurrences__availableTimes === void 0 ? void 0 : _errors_menuRecurrences__availableTimes.message,
                                 clearErrorMessage: function() {
                                     return clearErrors("menuRecurrences.".concat(editState === null || editState === void 0 ? void 0 : editState.index, ".availableTimes"));
                                 }
@@ -436,7 +437,7 @@ var DateInput = function(param) {
                         }))),
                         /*#__PURE__*/ jsx("div", {
                             className: "manual-form-error",
-                            children: (_errors_menuRecurrences1 = errors.menuRecurrences) === null || _errors_menuRecurrences1 === void 0 ? void 0 : _errors_menuRecurrences1.message
+                            children: errorMessage
                         })
                     ]
                 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@licklist/design",
-  "version": "0.69.6-dev.0",
+  "version": "0.69.6-dev.1",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"

package/src/events/event-card/EventCard.tsx

@@ -23,7 +23,7 @@ import { Sale } from '../../types/bookings'
 import { TipTapEditor } from '../../tiptap-editor/TipTapEditor'
 import {
   EVENT_DESCRIPTION_SIZE,
-  formatContentWithoutTags,
+  formatContent,
   getStatisticInfo,
 } from './utils'
 import { ReactComponent as ChartBarIcon } from '../../assets/dashboard/chartBar.svg'
@@ -66,7 +66,7 @@ export function EventCard({
   const { formatNumber, formatDate } = useIntl()
   const { totalViews, ...statistics } = getStatisticInfo(eventStatistic, date)
   const memoedContent = useMemo(
-    () => formatContentWithoutTags(description, EVENT_DESCRIPTION_SIZE),
+    () => formatContent(description, EVENT_DESCRIPTION_SIZE),
     [description],
   )
 

package/src/events/event-card/utils.ts

@@ -2,34 +2,25 @@ import { DATE_FORMAT, DATE_TIME_FULL_FORMAT } from '@licklist/core/dist/Config'
 import { EventStatistic } from '@licklist/core/dist/DataMapper/Provider/EventStatisticDataMapper'
 import { DateTime } from 'luxon'
 
-export function formatContent(content, maxSymbols) {
-  if (!content) return ''
-  if (content.length > maxSymbols) return `${content.slice(0, maxSymbols)}...`
-  return content
-}
+export const MIN_EVENT_DESCRIPTION_SIZE = 150;
+export const EVENT_DESCRIPTION_SIZE = 350;
+export const EMOJI_REGEX = /<span data-emoji-replacer=""><img[^>]*alt="([^"]+)"[^>]*><\/span>/g;
 
-export const formatContentWithoutTags = (
-  content,
-  maxLength = EVENT_DESCRIPTION_SIZE,
-) => {
-  if (!content) return ''
-  if (content < maxLength) return content
-  const text = content.replace(/<[^>]*>/g, '')
-  const trimmedText = text
-    .trim()
-    .replace(/&nbsp;|[^a-zA-Z0-9\s]/g, '')
-    .replace(/\s\s+/g, ' ')
+export const formatContent = (content, maxLength = EVENT_DESCRIPTION_SIZE) => {
+  if (!content) return '';
 
-  const words = trimmedText.slice(0, maxLength).split(' ')
-  const contentWithMinLength = content.slice(0, MIN_EVENT_DESCRIPTION_SIZE)
-  const index = String(content).indexOf(words[words.length - 2])
-  const slicedContent = content.slice(0, index)
-  const contentWithMinSize = contentWithMinLength.length > slicedContent.length ? contentWithMinLength : slicedContent
-  return contentWithMinSize.concat('...')
-}
+  const replacedContent = replaceEmojiImagesWithText(content);
+
+  if (replacedContent.length <= maxLength) {
+    return replacedContent;
+  }
 
-export const MIN_EVENT_DESCRIPTION_SIZE = 150
-export const EVENT_DESCRIPTION_SIZE = 350
+  return replacedContent.slice(0, maxLength).concat('...');
+};
+
+function replaceEmojiImagesWithText(text) {
+  return text.replace(EMOJI_REGEX, (_, emojiText) => emojiText);
+}
 
 /**
  * Calculate the total number of views from the given dates and event statistic.

package/src/product-set/control/DateInput.tsx

@@ -195,6 +195,8 @@ export const DateInput = ({
     }, 100)
   }
 
+  const errorMessage = errors.menuRecurrences?.message || errors.menuRecurrences?.root?.message 
+
   return (
     <Form.Group>
       <Form.Label>
@@ -283,7 +285,7 @@ export const DateInput = ({
           />
 
           <div className='manual-form-error'>
-            {errors.menuRecurrences?.message}
+            {errorMessage}
           </div>
         </div>
       </OverlayTrigger>

package/yarn.lock

@@ -5640,11 +5640,11 @@ __metadata:
   linkType: hard
 
 "@types/node@npm:*":
-  version: 22.7.6
-  resolution: "@types/node@npm:22.7.6"
+  version: 22.7.7
+  resolution: "@types/node@npm:22.7.7"
   dependencies:
     undici-types: "npm:~6.19.2"
-  checksum: 10c0/d4406a63afce981c363fb1d1954aaf1759ad2d487c0833ebf667565ea4e45ff217d6fab4b5343badbdeccdf9d2e4a0841d633e0c929ceabcb33c288663dd0c73
+  checksum: 10c0/07268a1e990ad9d9b1865092881317ea679a46eb6706d83a8874eec75fdddae6cfd6452e4e68b651561183e2a8f8548276f3155744bc402c2545978c19b70d65
   languageName: node
   linkType: hard
 
@@ -14824,13 +14824,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"negotiator@npm:0.6.3, negotiator@npm:^0.6.3":
+"negotiator@npm:0.6.3":
   version: 0.6.3
   resolution: "negotiator@npm:0.6.3"
   checksum: 10c0/3ec9fd413e7bf071c937ae60d572bc67155262068ed522cf4b3be5edbe6ddf67d095ec03a3a14ebf8fc8e95f8e1d61be4869db0dbb0de696f6b837358bd43fc2
   languageName: node
   linkType: hard
 
+"negotiator@npm:^0.6.3":
+  version: 0.6.4
+  resolution: "negotiator@npm:0.6.4"
+  checksum: 10c0/3e677139c7fb7628a6f36335bf11a885a62c21d5390204590a1a214a5631fcbe5ea74ef6a610b60afe84b4d975cbe0566a23f20ee17c77c73e74b80032108dea
+  languageName: node
+  linkType: hard
+
 "neo-async@npm:^2.5.0, neo-async@npm:^2.6.1, neo-async@npm:^2.6.2":
   version: 2.6.2
   resolution: "neo-async@npm:2.6.2"