@licklist/design 0.67.0 → 0.67.2-dev.0

package/src/recurring-date-picker-input/utils.ts

@@ -1,4 +1,9 @@
-import { DateTime } from "luxon";
+import { TIME_FORMAT, TIME_FULL_FORMAT } from "@licklist/core/dist/Config";
+import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper";
+import { fromFormat } from "@licklist/plugins/dist/utils/dateTime";
+import { DateTime, Interval } from "luxon";
+import { Validate } from "react-hook-form";
+import { useTranslation } from "react-i18next";
 import RRule, { Frequency, Weekday } from "rrule";
 
 export const getWeekdayForFrequency = ({
@@ -11,6 +16,7 @@ export const getWeekdayForFrequency = ({
   const parsedDate = DateTime.fromISO(date);
   return new Weekday(
     parsedDate.weekday - 1,
+    // eslint-disable-next-line no-nested-ternary
     frequency !== Frequency.MONTHLY
       ? undefined
       : parsedDate.day + 7 > parsedDate.daysInMonth
@@ -109,3 +115,87 @@ export const parseAndValidateRRule = ({
     until: options.until,
   } as ParsedRRuleOptions;
 };
+
+export const useWorkHoursValidation = (
+  byWeekDay: Weekday[] = [],
+  workHours: WorkHour[] | undefined,
+): {
+  /* @ts-expect-error 2314 */
+  validate?: Validate<string>;
+} => {
+  const { t } = useTranslation("Validation");
+  if (!workHours) return {};
+
+  const fromTimeFormat = fromFormat(TIME_FORMAT);
+  const fromTimeFullFormat = fromFormat(TIME_FULL_FORMAT);
+
+  // map every day to array of intervals describing workhours for that day
+  let intervalsByDay = workHours.map((workhour, index, self) => {
+    const res: Interval[] = [];
+
+    const startTime = fromTimeFormat(workhour.start);
+    const endTime = fromTimeFormat(workhour.end);
+
+    if (endTime > startTime) {
+      res.push(Interval.fromDateTimes(startTime, endTime));
+    } else {
+      // if end is before start, then it means that end is on the next day
+      // so count only to the end of current day
+      res.push(Interval.fromDateTimes(startTime, startTime.endOf("day")));
+    }
+
+    const prevIndex = index === 0 ? self.length - 1 : index - 1;
+
+    const prevStartTime = fromTimeFormat(self[prevIndex].start);
+    const prevEndTime = fromTimeFormat(self[prevIndex].end);
+
+    // if prevStartTime > prevEndTime then it means that prevEndTime is on the current day
+    // so we need to add interval from start of current day to prevEndTime
+    if (prevStartTime > prevEndTime) {
+      res.push(Interval.fromDateTimes(prevEndTime.startOf("day"), prevEndTime));
+    }
+
+    return res;
+  });
+
+  // if length === 0 or length === 7 then all workhours are selected, no need to filter
+  if (![0, 7].includes(byWeekDay.length)) {
+    intervalsByDay = intervalsByDay.filter((_, index) =>
+      byWeekDay.find(({ weekday }) => weekday === index),
+    );
+  }
+
+  return {
+    validate: (_time: string) => {
+      // workaround for issue with form values
+      // default values and entered values have different formats
+      const time = fromTimeFormat(_time).isValid
+        ? fromTimeFormat(_time)
+        : fromTimeFullFormat(_time);
+
+      const notFittingIntervalsByDay = intervalsByDay.reduce<Interval[][]>(
+        (acc, intervalsByDay) => {
+          if (!intervalsByDay.some((interval) => interval.contains(time))) {
+            acc.push(intervalsByDay);
+          }
+          return acc;
+        },
+        [],
+      );
+
+      const notFittingIntervals = notFittingIntervalsByDay
+        .flat()
+        .filter((interval) => !interval.contains(time));
+
+      const attribute = notFittingIntervals
+        .map((interval) => interval.toFormat("HH:mm"))
+        .join(", ");
+
+      if (notFittingIntervalsByDay.length !== 0) {
+        return t("outsideWorkingHours", { attribute }) as string;
+      }
+
+      return true;
+    },
+  };
+};

package/src/sales/booking/results/components/ResultCard.tsx

@@ -20,8 +20,6 @@ export type ResultCardProps = {
   onCardClick?: (id: number) => void;
 };
 
-// @TODO integrate when API will be available
-// activity and staff keys
 export const ResultCard = ({
   order,
   className,

package/src/setting/admin/AdminSetting.stories.tsx

@@ -19,6 +19,7 @@ export const SettingFormComponent: Story<AdminSettingFormProps> = (args) => (
   </Container>
 );
 
+
 export const PaymentFeeFormComponent: Story<PaymentFeeFormProps> = (args) => {
   const form = useForm<PaymentFeeFormFieldValues>({
     defaultValues: args.defaultValues,

package/src/setting/admin/AdminSettingForm.tsx

@@ -10,7 +10,7 @@ import Row from "react-bootstrap/Row";
 import Col from "react-bootstrap/Col";
 import { Link } from "react-router-dom";
 import HookFormService from "@licklist/plugins/dist/services/Form/HookFormService";
-import { ProviderType } from "@licklist/core/dist/DataMapper/Provider/ProvidableDataMapper";
+import { ProvidableType } from "@licklist/core/dist/DataMapper/Provider/ProvidableDataMapper";
 import { FaCommentAlt } from "react-icons/fa";
 import { PaymentFeeForm, PaymentFeeFormFieldValues } from "./PaymentFeeForm";
 import { Currency } from "../../types/currency";
@@ -32,7 +32,7 @@ export interface AdminSettingFormProps extends HasPermissionProp {
   providerMetadata: {
     country?: string;
     providableId?: number;
-    providerType?: ProviderType;
+    providerType?: ProvidableType;
   };
 }
 

package/src/setting/system/SystemSetting.stories.tsx

@@ -23,4 +23,4 @@ export function Default() {
       />
     </Container>
   );
-}
+}

package/src/snippet/snippet-template/preview/Preview.tsx

@@ -307,6 +307,7 @@ export function Preview({
                                   productCategoryId: 57,
                                   productGroupId: null,
                                   availableQuantity: 980,
+                                  zoneId: null,
                                   name: "Cofee",
                                   description: "",
                                   price: 15,
@@ -315,6 +316,8 @@ export function Preview({
                                   maxQuantity: 15,
                                   totalQuantity: 980,
                                   type: "sale" as const,
+                                  capacity: 0,
+                                  duration: 0,
                                   weight: 0,
                                   isAvailable: true,
                                   isSoldOut: false,
@@ -333,6 +336,7 @@ export function Preview({
                                   productCategoryId: 57,
                                   productGroupId: null,
                                   availableQuantity: 980,
+                                  zoneId: null,
                                   name: "Cofee 2",
                                   description: "",
                                   price: 15,
@@ -341,6 +345,8 @@ export function Preview({
                                   maxQuantity: 15,
                                   totalQuantity: 980,
                                   type: "sale" as const,
+                                  capacity: 0,
+                                  duration: 0,
                                   weight: 0,
                                   isAvailable: true,
                                   isSoldOut: false,

package/src/sortable-tree/SortableTreeItem.tsx

@@ -1,4 +1,10 @@
-import { ReactNode, useCallback, useEffect, useState } from "react";
+import {
+  ReactElement,
+  ReactNode,
+  useCallback,
+  useEffect,
+  useState,
+} from "react";
 import { DndContext, useDraggable } from "@dnd-kit/core";
 import {
   SortableContext,
@@ -33,6 +39,7 @@ export interface SortableTreeItemProps {
   body: ReactNode;
   children?: ReactNode;
   preItem?: ReactNode;
+  itemButton?: ReactNode;
   postItem?: ReactNode;
   sortableItems?: string[];
   isExpanded?: boolean;
@@ -82,6 +89,7 @@ export function SortableTreeItem({
   secondaryBadge,
   setIsExpanded,
   isOverride,
+  itemButton,
 }: SortableTreeItemProps) {
   const [expanded, setExpanded] = useState(isExpanded);
   const [isModalVisible, setIsModalVisible] = useState(isNewAdded);
@@ -287,9 +295,13 @@ export function SortableTreeItem({
                     className={clsx(
                       "sortable-tree-item-title",
                       modalLabel && "sortable-tree-product-set-element-title",
+                      "d-flex justify-content-between",
                     )}
                   >
                     {title}
+                    <div className="sortable-tree-item-subtitle">
+                      {itemButton}
+                    </div>
                   </span>
                   {!expanded && (
                     <span className="sortable-tree-item-subtitle">

package/src/styles/auth/AccessDenied.scss

@@ -8,4 +8,4 @@
   h6 {
     color: $gray-600;
   }
-}
+}

package/src/styles/back-button/BackButton.scss

@@ -1,32 +1,33 @@
 $base-height: 2.5rem;
 
 .button-wrapper {
-  background-color: $snippet-page-header-steps-close-button-background-color;
-  height: $base-height;
-  width: $base-height;
-  border-radius: $base-height;
-  transition: $color-transition;
-
-  .back-button {
-    font-size: 2rem;
-    width: $base-height;
+    background-color: $snippet-page-header-steps-close-button-background-color;
     height: $base-height;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-weight: lighter;
-    color: $snippet-page-header-steps-close-button-border-color;
+    width: $base-height;
+    border-radius: $base-height;
     transition: $color-transition;
 
-    &:hover {
-      cursor: pointer;
+
+    .back-button {
+      font-size: 2rem;
+      width: $base-height;
+      height: $base-height;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-weight: lighter;
+      color: $snippet-page-header-steps-close-button-border-color;
+      transition: $color-transition;
+
+      &:hover {
+        cursor: pointer;
+      }
     }
-  }
 
-  &.back-button {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-right: 1rem;
-  }
-}
+    &.back-button {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-right: 1rem;
+    }
+  }

package/src/styles/back-button/_index.scss

@@ -1 +1 @@
-@import "./BackButton.scss";
+@import "./BackButton.scss";

package/src/styles/company-user-form/UserForm.scss

@@ -33,15 +33,11 @@
         }
 
         &.active {
-          color: #0e8ce2;
-          background: linear-gradient(
-            149.72deg,
-            #d9efff 50.04%,
-            #e9f4fe 107.75%
-          );
+          color: #0E8CE2;
+          background: linear-gradient(149.72deg, #D9EFFF 50.04%, #E9F4FE 107.75%);
 
           svg path {
-            stroke: #0e8ce2;
+            stroke: #0E8CE2;
           }
         }
       }
@@ -66,3 +62,4 @@
     }
   }
 }
+

package/src/styles/company-user-form/_index.scss

@@ -1 +1 @@
-@import "./UserForm.scss";
+@import "./UserForm.scss";

package/src/styles/custom-fields/CreateSortableListItem.scss

@@ -1,3 +1,4 @@
+ 
 $sortable-list-item-hover-bg-color: #d9efff !default;
 
 .sortable-list-item-wrapper {
@@ -25,4 +26,4 @@ $sortable-list-item-hover-bg-color: #d9efff !default;
   &:hover {
     background-color: $sortable-list-item-hover-bg-color;
   }
-}
+}

package/src/styles/custom-fields/_index.scss

@@ -1,3 +1,3 @@
 @import "./FieldItem.scss";
 @import "./SelectFieldModal.scss";
-@import "./CreateSortableListItem.scss";
+@import "./CreateSortableListItem.scss";

package/src/styles/customers/Filter.scss

@@ -4,13 +4,13 @@
       font-size: 0.8rem;
     }
   }
-
+  
   @include media-breakpoint-up(md) {
     label {
       font-size: 0.9rem;
     }
   }
-
+  
   @include media-breakpoint-up(lg) {
     label {
       font-size: 1rem;
@@ -28,7 +28,7 @@
       flex: 0 0 33.33%;
       max-width: 33.33%;
     }
-
+  
     @include media-breakpoint-down(xs) {
       flex-direction: column;
 
@@ -43,11 +43,11 @@
         &:first-child {
           padding-left: 0;
         }
-
+  
         &:last-child {
           padding-right: 0;
         }
       }
     }
-  }
+  } 
 }

package/src/styles/events/EditEventModal.scss

@@ -5,9 +5,7 @@
   padding: 1rem 2rem;
   border-radius: 1rem;
   margin-bottom: 1.5rem;
-  transition:
-    color 0.2s ease-out,
-    background-color 0.2s ease-out;
+  transition: color 0.2s ease-out, background-color 0.2s ease-out;
   margin-left: 1rem;
 
   &:hover {

package/src/styles/events/EventVenueMap.scss

@@ -5,44 +5,44 @@
     overflow: hidden;
     background-color: $gray-600;
   }
-
+  
   .canvas-scrollbars {
     .scrollbar-wrapper {
       position: absolute;
       z-index: 5;
       overflow: hidden;
-
+      
       .scroll-element {
         position: absolute;
         display: block;
         border-radius: 0.375rem;
         background: rgba(0, 0, 0, 0.3);
         outline: 1px solid rgba(255, 255, 255, 0.3);
-
+  
         &:hover {
           background: rgba(0, 0, 0, 0.5);
           transition: background-color 500ms linear;
           cursor: pointer;
         }
       }
-
+  
       .horizontal-scroll {
         width: 100%;
         height: 0.375rem;
       }
-
+  
       .vertical-scroll {
         height: 100%;
         width: 0.375rem;
       }
-
+  
       &-vertical {
         right: 0.1rem;
         height: calc(100% - 1rem);
         margin: 0.5rem 0;
         width: 0.5rem;
       }
-
+  
       &-horizontal {
         bottom: 0.1rem;
         width: calc(100% - 1rem);

package/src/styles/form/Input.scss

@@ -33,4 +33,4 @@ input[type="date"].date-input-with-value::-webkit-datetime-edit-year-field {
 .invalid-feedback-message {
   font-size: 80%;
   color: #f94b25;
-}
+}

package/src/styles/header/Header.scss

@@ -5,7 +5,7 @@
     justify-content: space-between;
     display: flex;
     flex-direction: row;
-
+    
     @include media-breakpoint-down(sm) {
       width: 100%;
     }

package/src/styles/header/elements/CompanySelector.scss

@@ -1,4 +1,4 @@
-$company-selector-font-size: 0.85rem !default;
+$company-selector-font-size: .85rem !default;
 $company-selector-font-weight: $font-weight-semibold !default;
 
 .header-company-selector-container {
@@ -20,7 +20,7 @@ $company-selector-font-weight: $font-weight-semibold !default;
 .header-company-selector {
   border-color: transparent;
   background: transparent;
-  padding: 0 0.25rem;
+  padding: 0 .25rem;
   font-size: $company-selector-font-size;
   font-weight: $company-selector-font-weight;
 }

package/src/styles/iframe-events/Calendar.scss

@@ -48,7 +48,6 @@
         height: 2.25rem;
         width: 14.125rem;
         justify-content: space-between;
-        border: 1px solid $snippet-dropdown-border-color;
         border-radius: $iframe-border-radius;
         transition: $color-transition;
 

package/src/styles/iframe-events/CalendarSelect.scss

@@ -15,4 +15,4 @@
       box-shadow: 0 0 0 0;
     }
   }
-}
+}

package/src/styles/iframe-events/CategoryStepsForm.scss

@@ -44,15 +44,15 @@
         background-color: $snippet-canvas-background-color;
         transition: $color-transition;
       }
-
+  
       .zoom-buttons {
         bottom: 0;
         top: unset;
-
+  
         .buttons-wrapper {
           background-color: transparent;
-        }
-
+        }      
+  
         .icon-wrapper {
           display: none;
         }
@@ -65,8 +65,7 @@
           background-color: $snippet-elements-button-background-color;
           border-color: $snippet-elements-button-border-color;
 
-          &:hover,
-          &:focus {
+          &:hover, &:focus {
             box-shadow: none;
             transition: $color-transition;
             color: $snippet-elements-button-color;
@@ -92,4 +91,4 @@
       padding: 1rem;
     }
   }
-}
+}

package/src/styles/iframe-events/Event.scss

@@ -171,8 +171,7 @@
           color: $snippet-elements-button-color;
           border: none;
           background-color: $snippet-elements-button-background-color;
-          box-shadow: 0 0 0 $input-btn-focus-width
-            $snippet-elements-button-background-color;
+          box-shadow: 0 0 0 $input-btn-focus-width $snippet-elements-button-background-color;
         }
 
         &:disabled {
@@ -228,8 +227,7 @@
         color: $snippet-elements-button-color;
         border: none;
         background-color: $snippet-elements-button-background-color;
-        box-shadow: 0 0 0 $input-btn-focus-width
-          $snippet-elements-button-background-color;
+        box-shadow: 0 0 0 $input-btn-focus-width $snippet-elements-button-background-color;
       }
 
       &:disabled {

package/src/styles/iframe-events/EventForm.scss

@@ -1,69 +1,69 @@
 @import "../snippet-templates/snippetVariables";
 
 .iframe-event-form {
-  background-color: transparent;
-  border-color: transparent;
-  border-width: 1px;
-  border-style: solid;
-  transition: $color-transition;
-  padding: 1.5rem;
-  border-radius: $iframe-border-radius;
-  width: 100%;
-
-  &__title {
-    transition: $color-transition;
-    color: $snippet-elements-body-color;
-  }
-
-  .btn.btn-primary {
-    transition: $color-transition;
-    color: $snippet-elements-button-color;
     background-color: transparent;
-    border: none;
+    border-color: transparent;
+    border-width: 1px;
+    border-style: solid;
+    transition: $color-transition;
+    padding: 1.5rem;
     border-radius: $iframe-border-radius;
-
-    &:active,
-    &.active,
-    &:hover,
-    &.hover,
-    &:focus,
-    &.focus {
-      &:not(:disabled) {
-        color: $snippet-elements-button-color;
-        border: none;
-        background-color: transparent;
-        box-shadow: 0 0 0 $input-btn-focus-width transparent;
+    width: 100%;
+  
+    &__title {
+      transition: $color-transition;
+      color: $snippet-elements-body-color;
+    }
+  
+    .btn.btn-primary {
+      transition: $color-transition;
+      color: $snippet-elements-button-color;
+      background-color: transparent;
+      border: none;
+      border-radius: $iframe-border-radius;
+  
+      &:active,
+      &.active,
+      &:hover,
+      &.hover,
+      &:focus,
+      &.focus {
+        &:not(:disabled) {
+          color: $snippet-elements-button-color;
+          border: none;
+          background-color: transparent;
+          box-shadow: 0 0 0 $input-btn-focus-width transparent;
+        }
+  
+        &:disabled {
+          border: none;
+        }
       }
-
-      &:disabled {
-        border: none;
+  
+      &:hover,
+      &.hover,
+      &:focus,
+      &.focus {
+        &:not(:disabled) {
+          opacity: .7;
+        }
       }
-    }
-
-    &:hover,
-    &.hover,
-    &:focus,
-    &.focus {
-      &:not(:disabled) {
-        opacity: 0.7;
+  
+      &:active,
+      &.active {
+        &:not(:disabled) {
+          opacity: .8;
+        }
       }
     }
 
-    &:active,
-    &.active {
-      &:not(:disabled) {
-        opacity: 0.8;
-      }
+    input {
+      border-radius: $iframe-border-radius;
     }
-  }
-
-  input {
-    border-radius: $iframe-border-radius;
-  }
 }
 
 @include media-breakpoint-down(sm) {
-  .iframe-event-form {
-    margin-bottom: 5rem;
-  }
+    .iframe-event-form {
+      margin-bottom: 5rem;
+    }
 }

package/src/styles/iframe-events/EventNavigationFooter.scss

@@ -0,0 +1 @@
+