@licklist/design 0.69.4 → 0.69.6-dev.0

package/dist/typeahead/Typeahead.js

@@ -31,7 +31,7 @@ function _object_spread(target) {
     return target;
 }
 function Typeahead(param) {
-    var options = param.options, placeholder = param.placeholder, _param_isRequired = param.isRequired, isRequired = _param_isRequired === void 0 ? false : _param_isRequired, isMultipleChoise = param.isMultipleChoise, _param_name = param.name, name = _param_name === void 0 ? '' : _param_name, _param_isCouponForm = param.isCouponForm, isCouponForm = _param_isCouponForm === void 0 ? false : _param_isCouponForm, _param_noOptionsMessage = param.noOptionsMessage, noOptionsMessage = _param_noOptionsMessage === void 0 ? '' : _param_noOptionsMessage, isInvalid = param.isInvalid;
+    var options = param.options, placeholder = param.placeholder, _param_isRequired = param.isRequired, isRequired = _param_isRequired === void 0 ? false : _param_isRequired, isMultipleChoise = param.isMultipleChoise, _param_name = param.name, name = _param_name === void 0 ? '' : _param_name, value = param.value, onChangeValue = param.onChangeValue, containerStyles = param.containerStyles, _param_isCouponForm = param.isCouponForm, isCouponForm = _param_isCouponForm === void 0 ? false : _param_isCouponForm, _param_noOptionsMessage = param.noOptionsMessage, noOptionsMessage = _param_noOptionsMessage === void 0 ? '' : _param_noOptionsMessage, isInvalid = param.isInvalid;
     var control = useFormContext().control;
     var getStyle = function() {
         var couponFormStyle = isCouponForm ? {
@@ -53,14 +53,21 @@ function Typeahead(param) {
                 var field = param.field;
                 return /*#__PURE__*/ jsx(Select, {
                     placeholder: placeholder,
-                    value: field.value,
+                    value: value !== null && value !== void 0 ? value : field.value,
                     isMulti: isMultipleChoise,
                     styles: {
+                        container: function(base) {
+                            return _object_spread({}, base, containerStyles);
+                        },
                         control: function(base) {
                             return _object_spread({}, base, getStyle());
                         }
                     },
                     onChange: function(value) {
+                        if (onChangeValue) {
+                            onChangeValue(value);
+                            return;
+                        }
                         field.onChange(value);
                     },
                     options: options,

package/dist/zone/form/components/GameDurationControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GameDurationControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/GameDurationControl.tsx"],"names":[],"mappings":"AAOA,KAAK,wBAAwB,GAAG;IAC9B,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,mBAAmB,mBAE7B,wBAAwB,4CA+B1B,CAAA"}
+{"version":3,"file":"GameDurationControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/GameDurationControl.tsx"],"names":[],"mappings":"AAOA,KAAK,wBAAwB,GAAG;IAC9B,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,mBAAmB,mBAE7B,wBAAwB,4CAgC1B,CAAA"}

package/dist/zone/form/components/GameDurationControl.js

@@ -77,6 +77,9 @@ var GameDurationControl = function(param) {
                 required: false,
                 min: 1
             })), {
+                onWheel: function(event) {
+                    return event.currentTarget.blur();
+                },
                 placeholder: t('Design:duration'),
                 isInvalid: Boolean(errors.defaultDuration),
                 disabled: isLoading

package/dist/zone/form/components/SortControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SortControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/SortControl.tsx"],"names":[],"mappings":"AAOA,KAAK,gBAAgB,GAAG;IACtB,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,WAAW,kBAAmB,gBAAgB,4CAmC1D,CAAA"}
+{"version":3,"file":"SortControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/SortControl.tsx"],"names":[],"mappings":"AAOA,KAAK,gBAAgB,GAAG;IACtB,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,WAAW,kBAAmB,gBAAgB,4CAoC1D,CAAA"}

package/dist/zone/form/components/SortControl.js

@@ -77,6 +77,9 @@ var SortControl = function(param) {
                 required: false,
                 min: 1
             })), {
+                onWheel: function(event) {
+                    return event.currentTarget.blur();
+                },
                 placeholder: t('Design:ordering'),
                 isInvalid: Boolean(errors.sort),
                 disabled: isLoading

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@licklist/design",
-  "version": "0.69.4",
+  "version": "0.69.6-dev.0",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"
@@ -42,9 +42,9 @@
     ]
   },
   "peerDependencies": {
-    "@licklist/core": "0.30.3",
+    "@licklist/core": "0.30.5-dev.0",
     "@licklist/eslint-config": "0.5.6",
-    "@licklist/plugins": "0.33.1",
+    "@licklist/plugins": "0.33.4-dev.0",
     "lodash": "4.17.21",
     "luxon": "3.5.0",
     "react": "17.0.2",
@@ -61,9 +61,9 @@
     "@dnd-kit/utilities": "2.0.0",
     "@fortawesome/fontawesome-svg-core": "1.2.34",
     "@fortawesome/free-solid-svg-icons": "5.15.2",
-    "@licklist/core": "0.30.3",
+    "@licklist/core": "0.30.5-dev.0",
     "@licklist/eslint-config": "0.5.6",
-    "@licklist/plugins": "0.33.1",
+    "@licklist/plugins": "0.33.4-dev.0",
     "@mantine/core": "6.0.22",
     "@mantine/hooks": "6.0.22",
     "@mdx-js/react": "1.6.22",
@@ -95,7 +95,6 @@
     "bootstrap": "4.6.0",
     "bootstrap-social": "5.1.1",
     "clsx": "1.1.1",
-    "date-fns": "2.29.3",
     "emojibase": "6.1.0",
     "emojibase-data": "7.0.1",
     "emojibase-regex": "6.0.1",
@@ -202,8 +201,10 @@
       "yarn tsc"
     ]
   },
+  "packageManager": "yarn@4.4.0",
   "volta": {
     "node": "20.9.0",
     "yarn": "4.4.0"
-  }
+  },
+  "stableVersion": "0.69.1-dev.3"
 }

package/src/affiliate/form/AffiliateForm.tsx

@@ -76,6 +76,7 @@ export const AffiliateForm = ({
   const copyToClipboard = () =>
     // eslint-disable-next-line consistent-return
     window.navigator.clipboard.writeText(formValues.link)
+
   return (
     <FormProvider {...form}>
       <Form onSubmit={form.handleSubmit(handleSubmit)}>

package/src/auth/Login/LoginComponent.tsx

@@ -44,7 +44,7 @@ const LoginComponent = ({
   const handleError = (error: any) => {
     notification.danger({
       title: 'Error',
-      message: error.message,
+      message: error?.response?.data?.message || error.message,
     })
   }
 

package/src/calendar/utils/index.ts

@@ -1,40 +1,31 @@
+import { TimeZone } from '@licklist/core/dist/DataMapper/Common/TimeZoneDataMapper'
 import { DateTime, Interval } from 'luxon'
 
-export const getMonthCalendarDates = (
-  initialDate: DateTime,
-  timeZone?: string,
-): DateTime[] => {
+type Builder = (args: {
+  initialDate?: DateTime
+  timeZone: TimeZone['name']
+}) => DateTime[]
+
+export const getMonthCalendarDates: Builder = ({
+  initialDate: _initialDate,
+  timeZone,
+}): DateTime[] => {
+  const initialDate = _initialDate || DateTime.now().setZone(timeZone)
+
   const startOfMonth = initialDate.startOf('month')
   const endOfMonth = initialDate.endOf('month')
 
-  const dateTimes = Interval.fromDateTimes(startOfMonth, endOfMonth)
+  return Interval.fromDateTimes(startOfMonth, endOfMonth)
     .splitBy({ day: 1 })
     .map((d) => d.start)
-
-  if (timeZone) {
-    return dateTimes.map((date) =>
-      date.setZone(timeZone, { keepLocalTime: true }),
-    )
-  }
-
-  return dateTimes
 }
 
-export const getWeekCalendarDates = (
-  initialDate: DateTime,
-  timeZone?: string,
-): DateTime[] => {
+export const getWeekCalendarDates: Builder = ({ timeZone }): DateTime[] => {
+  const initialDate = DateTime.now().setZone(timeZone)
+
   const lastDay = initialDate.plus({ days: 7 })
 
-  const dateTimes = Interval.fromDateTimes(initialDate, lastDay)
+  return Interval.fromDateTimes(initialDate, lastDay)
     .splitBy({ day: 1 })
     .map((d) => d.start)
-
-  if (timeZone) {
-    return dateTimes.map((date) =>
-      date.setZone(timeZone, { keepLocalTime: true }),
-    )
-  }
-
-  return dateTimes
 }

package/src/date-time-button/DateContent.tsx

@@ -6,9 +6,9 @@ import {
 } from '@licklist/core/dist/Config'
 import { getDayWithOrdinal } from '@licklist/plugins/dist/utils/formatDate'
 import clsx from 'clsx'
-import { isToday, isTomorrow } from 'date-fns'
 import { DateTime } from 'luxon'
 import { useTranslation } from 'react-i18next'
+import { isToday, isTomorrow } from '@licklist/plugins/dist'
 import { DateTimeButtonProps, Variant } from './DateTimeButton'
 
 type DateContentProps = Pick<
@@ -55,9 +55,9 @@ export const DateContent = ({
 }
 
 const getDate = (date: DateTime): string => {
-  if (isToday(date.toJSDate())) return 'today'
+  if (isToday(date)) return 'today'
 
-  if (isTomorrow(date.toJSDate())) return 'tomorrow'
+  if (isTomorrow(date)) return 'tomorrow'
 
   return date.toFormat(DAY_OF_WEEK)
 }

package/src/events/edit-event-modal/component/EditEventForm/EditEventForm.tsx

@@ -64,6 +64,7 @@ export interface EditEventFormProps extends HasPermissionProp {
   isExternalPaymentLinkEnabled?: boolean
   timeZone: string
   eventProductSet?: ProductSet
+  overrideNameError?: string
 }
 
 const eventImageTypes = {
@@ -85,6 +86,7 @@ export const EditEventForm = ({
   isExternalPaymentLinkEnabled,
   timeZone,
   eventProductSet,
+  overrideNameError,
 }: EditEventFormProps) => {
   const { t } = useTranslation(['Design', 'Validation'])
 
@@ -406,6 +408,7 @@ export const EditEventForm = ({
             showEditProductSet={showEditProductSet}
             timeZone={timeZone}
             eventProductSet={eventProductSet}
+            overrideNameError={overrideNameError}
           />
 
           {hasPermission && !showEditProductSet && (

package/src/events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.tsx

@@ -5,9 +5,12 @@ import { useId } from '@react-aria/utils'
 import { Controller, useFormContext } from 'react-hook-form'
 import { HasPermissionProp } from '@licklist/plugins/dist/types/permission/Permission'
 import { ProductSet } from '@licklist/core/dist/DataMapper/Product/ProductSetDataMapper'
+import { uniqBy } from 'lodash'
+import { getTypeHeadItemsFromMenus } from '../../../../product-set/utils'
 import { ConfirmModal } from '../../../../modals/confirmation/ConfirmModal'
 import { EditEventFormValues } from '../EditEventForm/EditEventForm'
 import { EditEventProductSet } from './component/EditEventProductSet'
+import { Typeahead } from '../../../../typeahead'
 
 interface SelectEventProductSetProps extends HasPermissionProp {
   productSets?: ProductSet[]
@@ -17,6 +20,7 @@ interface SelectEventProductSetProps extends HasPermissionProp {
   setEditProductSetId: (value: string) => void
   timeZone: string
   eventProductSet?: ProductSet
+  overrideNameError?: string
 }
 
 export const SelectEventProductSet = ({
@@ -27,6 +31,7 @@ export const SelectEventProductSet = ({
   setShowEditProductSet,
   timeZone,
   eventProductSet,
+  overrideNameError,
 }: SelectEventProductSetProps) => {
   const productSets = eventProductSet
     ? [..._productSets, eventProductSet]
@@ -48,6 +53,22 @@ export const SelectEventProductSet = ({
   const productSetId = watch('productSetId')
   const editedProductSet = watch('editedProductSet')
 
+  const typeheadValues = uniqBy(
+    getTypeHeadItemsFromMenus(
+      editedProductSet
+        ? productSets.map((productSet) =>
+            productSet.id === editedProductSet.id
+              ? editedProductSet
+              : productSet,
+          )
+        : productSets,
+    ),
+    (item) => item.id,
+  )
+  const selectedProductSetTypeheadValue = productSetId
+    ? typeheadValues?.find((typeheadValue) => typeheadValue.id === productSetId)
+    : undefined
+
   const onEditProductSet = useCallback(
     () => {
       setEditProductSetId(String(productSetId))
@@ -101,6 +122,7 @@ export const SelectEventProductSet = ({
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const onSubmit = (value: EditEventFormValues['editedProductSet']) => {
     setShowEditProductSet(false)
+    setValue('productSetId', value.id)
     setValue('editedProductSet', value)
   }
 
@@ -116,93 +138,73 @@ export const SelectEventProductSet = ({
           <Controller
             control={control}
             name='productSetId'
-            render={({ field }) => {
-              const fieldValue = String(field.value)
-              return (
-                <>
-                  <div className='d-flex align-items-center flex-row w-100'>
-                    <ConfirmModal>
-                      {(confirm) => (
-                        <Form.Control
-                          as='select'
-                          onChange={(e) =>
-                            onChangeProductSet(Number(e.target.value), confirm)
-                          }
-                          isInvalid={Boolean(errors.productSetId)}
-                          value={fieldValue}
-                        >
-                          <option value='' hidden>
-                            {t('Design:chooseProductSet')}
-                          </option>
-                          {productSets?.map((productSet) => {
-                            const isCurrentEditedProductSet =
-                              editedProductSet &&
-                              editedProductSet?.id === productSet?.id
-                            return (
-                              <option key={productSet.id} value={productSet.id}>
-                                {isCurrentEditedProductSet ||
-                                productSet.isOverride
-                                  ? `[${t('edited')}] ${
-                                      isCurrentEditedProductSet
-                                        ? editedProductSet?.name
-                                        : productSet.name
-                                    }`
-                                  : productSet.name}
-                              </option>
-                            )
-                          })}
-                        </Form.Control>
-                      )}
-                    </ConfirmModal>
-
-                    <div className='buttons-container'>
-                      {!showEditProductSet && !editedProductSet && (
-                        <Button
-                          variant=''
-                          className='btn product-set-button mr-4'
-                          onClick={handleCreateProductSet}
-                        >
-                          {t('addNewProductSet')}
-                        </Button>
-                      )}
-                      {showOverrideProductSet && (
-                        <Button
-                          variant=''
-                          className='btn product-set-button'
-                          onClick={onEditProductSet}
-                        >
-                          {isOverrideProductSet
-                            ? t('editOverrides')
-                            : t('editProductSet')}
-                        </Button>
-                      )}
-                      {showEditProductSet && (
-                        <Button
-                          variant=''
-                          className='btn product-set-button'
-                          onClick={revertEditProductSet}
-                        >
-                          {t('cancelAndRevert')}
-                        </Button>
-                      )}
-                      {!showEditProductSet && editedProductSet && (
-                        <Button
-                          variant=''
-                          className='btn product-set-button ml-4 text-danger'
-                          onClick={revertEditProductSet}
-                        >
-                          {t('undoChanges')}
-                        </Button>
-                      )}
-                    </div>
+            render={() => (
+              <>
+                <div className='d-flex align-items-center flex-row w-100'>
+                  <ConfirmModal>
+                    {(confirm) => (
+                      <Typeahead
+                        name='productSetId'
+                        value={selectedProductSetTypeheadValue}
+                        containerStyles={{ width: '100%' }}
+                        onChangeValue={(typeheadValue) => {
+                          onChangeProductSet(Number(typeheadValue.id), confirm)
+                        }}
+                        isInvalid={!!overrideNameError}
+                        options={typeheadValues}
+                        placeholder={t('Design:choose')}
+                        noOptionsMessage={t('Design:noAvailableProductSets')}
+                      />
+                    )}
+                  </ConfirmModal>
+
+                  <div className='buttons-container'>
+                    {!showEditProductSet && !editedProductSet && (
+                      <Button
+                        variant=''
+                        className='btn product-set-button mr-4'
+                        onClick={handleCreateProductSet}
+                      >
+                        {t('addNewProductSet')}
+                      </Button>
+                    )}
+                    {showOverrideProductSet && (
+                      <Button
+                        variant=''
+                        className='btn product-set-button'
+                        onClick={onEditProductSet}
+                      >
+                        {isOverrideProductSet
+                          ? t('editOverrides')
+                          : t('editProductSet')}
+                      </Button>
+                    )}
+                    {showEditProductSet && (
+                      <Button
+                        variant=''
+                        className='btn product-set-button'
+                        onClick={revertEditProductSet}
+                      >
+                        {t('cancelAndRevert')}
+                      </Button>
+                    )}
+                    {!showEditProductSet && editedProductSet && (
+                      <Button
+                        variant=''
+                        className='btn product-set-button ml-4 text-danger'
+                        onClick={revertEditProductSet}
+                      >
+                        {t('undoChanges')}
+                      </Button>
+                    )}
                   </div>
+                </div>
 
-                  <Form.Control.Feedback type='invalid'>
-                    {errors?.productSetId?.message}
-                  </Form.Control.Feedback>
-                </>
-              )
-            }}
+                <div className='manual-form-error'>
+                  {errors?.productSetId?.message || overrideNameError}
+                </div>
+              </>
+            )}
           />
         </Form.Group>
       </div>
@@ -213,6 +215,7 @@ export const SelectEventProductSet = ({
             productSetId === editedProductSet?.id && editedProductSet
           }
           timeZone={timeZone}
+          overrideNameError={overrideNameError}
         />
       )}
     </>

package/src/events/edit-event-modal/component/SelectEventProductSet/component/EditEventProductSet.tsx

@@ -23,12 +23,14 @@ interface EditEventProductSetProps {
   onSubmit: (value: EditEventFormValues['editedProductSet']) => void
   defaultValues?: EditEventFormValues['editedProductSet']
   timeZone: string
+  overrideNameError?: string
 }
 
 export const EditEventProductSet = ({
   onSubmit,
   defaultValues,
   timeZone,
+  overrideNameError,
 }: EditEventProductSetProps) => {
   const { companyId } = useParams<{
     companyId: string
@@ -64,7 +66,15 @@ export const EditEventProductSet = ({
     mode: 'onChange',
   })
 
-  const { reset, handleSubmit, watch } = form
+  const { reset, handleSubmit, watch, setError } = form
+
+  useEffect(() => {
+    if (!overrideNameError) {
+      return
+    }
+    setError('name', { message: overrideNameError })
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [overrideNameError])
 
   const formValues = watch()
 

package/src/events/edit-event-modal/utils/getDefaultProductSet.ts

@@ -39,7 +39,6 @@ export const getDefaultValues = (
               ...product,
               subProducts: subProducts?.map(({ ...subProducts }) => ({
                 ...subProducts,
-                originalProductId: null,
                 productCategoryId: undefined,
               })),
               productCategoryId: undefined,

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

@@ -21,10 +21,14 @@ export const formatContentWithoutTags = (
     .replace(/\s\s+/g, ' ')
 
   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])
-  return content.slice(0, index).concat('...')
+  const slicedContent = content.slice(0, index)
+  const contentWithMinSize = contentWithMinLength.length > slicedContent.length ? contentWithMinLength : slicedContent
+  return contentWithMinSize.concat('...')
 }
 
+export const MIN_EVENT_DESCRIPTION_SIZE = 150
 export const EVENT_DESCRIPTION_SIZE = 350
 
 /**

package/src/iframe/activity-card/ActivityCard.tsx

@@ -1,6 +1,8 @@
 import { ReactNode } from 'react'
 import clsx from 'clsx'
 import { Image } from '@licklist/core/dist/DataMapper/Media/ImageDataMapper'
+import { ZoneResourcesAvailability } from '@licklist/core/dist/DataMapper/Order/ZoneResourcesAvailabilityDataMapper'
+import { AvailabilityIndicator } from '../../availability-indicator'
 
 export const LAYOUT_GRID = 'grid'
 export const LAYOUT_LIST = 'list'
@@ -15,6 +17,7 @@ export type ActivityCardProps = {
   layout?: typeof LAYOUT_GRID | typeof LAYOUT_LIST
   availableTimes?: string | null
   image?: Image | null
+  resources?: ZoneResourcesAvailability
 }
 
 export const ActivityCard = ({
@@ -27,6 +30,7 @@ export const ActivityCard = ({
   onSelect,
   isSelected,
   layout = LAYOUT_GRID,
+  resources,
 }: ActivityCardProps) => {
   if (layout === LAYOUT_GRID) {
     return (
@@ -46,6 +50,7 @@ export const ActivityCard = ({
           {description && (
             <div className='mt-2 activity-card-description'>{description}</div>
           )}
+          {resources && <AvailabilityIndicator resources={resources} />}
         </div>
       </button>
     )
@@ -71,6 +76,7 @@ export const ActivityCard = ({
         {description && (
           <div className='mt-2 activity-card-description'>{description}</div>
         )}
+        {resources && <AvailabilityIndicator resources={resources} />}
       </div>
 
       <hr className='list-activity-card-hr' />

package/src/iframe/order-process/components/CategoryProduct/components/NumberInput/NumberInput.tsx

@@ -89,6 +89,7 @@ export const NumberInput = forwardRef<HTMLInputElement, NumberInputProps>(
         <FormControl
           type='number'
           onChange={(e) => handleChangeValue(Number(e.target.value))}
+          onWheel={(event) => event.currentTarget.blur()}
           value={value}
           min={0}
           max={max}
@@ -101,6 +102,14 @@ export const NumberInput = forwardRef<HTMLInputElement, NumberInputProps>(
         <button
           type='button'
           onClick={handleArrowUpClick}
+          onWheel={(event) => event.currentTarget.blur()}
+          onFocus={(event) =>
+            event.target.addEventListener(
+              'wheel',
+              (event) => event.preventDefault(),
+              { passive: false },
+            )
+          }
           className={`payment-number-input__btn-up ${
             plusButtonGreyedOut && 'disabled-number-input-button'
           }`}

package/src/iframe/order-process/components/CategoryProduct/components/ProductQuantityInput/ProductQuantityInput.tsx

@@ -51,6 +51,7 @@ export const ProductQuantityInput = ({
       hasDeposit: category.allowDeposits && product?.deposit < product.price,
       price: product.price,
       productCategoryId: category.id,
+      zoneId: category.zone?.id,
       quantity,
       capacity: product?.capacity,
     })

package/src/iframe/payment/order-items-table/utils/paymentSummary.tsx

@@ -61,6 +61,7 @@ const processedPaymentSummary = ({
   const total = calculateTotalPrice(order, externalPaymentDetail)
 
   const totalDiscount = calculateTotalDiscount(order.payments)
+
   let summaryItems: SummaryItem[] = [
     {
       translateKey: AMOUNT_TOTAL,