@licklist/design 0.44.486-dev.2 → 0.44.486-dev.21

package/src/zone/form/components/ZoneRecurrencesControl.tsx

@@ -12,11 +12,8 @@ import {
 import { DndContext } from "@dnd-kit/core";
 import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper";
 import { DateTime } from "luxon";
-import { TIME_FORMAT, TIME_FULL_FORMAT } from "@licklist/core/dist/Config";
-import {
-  calculateTimeWithOffset,
-  DIRECTION_TO_LOCAL,
-} from "@licklist/plugins/dist/utils/time";
+import { TIME_FORMAT } from "@licklist/core/dist/Config";
+
 import { CONFIRM_MODAL_ACTIONS } from "../../../modals/confirmation/ConfirmModal";
 import { Icon } from "../../../static";
 import {
@@ -67,7 +64,6 @@ export const ZoneRecurrencesControl = ({
   });
   const clearEditState = () => setEditState({ index: null, values: null });
   const [availableTimes, setAvailableTimes] = useState<string[]>([]);
-
   const popoverRef = useRef<HTMLDivElement>();
   const availableTimesFormRef = useRef<AvailableTimesControlRef>();
 
@@ -97,30 +93,29 @@ export const ZoneRecurrencesControl = ({
     if (!isAvailableTimesFormValid) {
       return;
     }
-    const startTime = DateTime.fromFormat(next.startTime, TIME_FULL_FORMAT);
-    const endTime = DateTime.fromFormat(next.endTime, TIME_FULL_FORMAT);
-    const { availableTimes } = availableTimesFormRef.current.getValues();
-    const validAvalilableTimes = availableTimes.every((time) => {
-      const currentAvailableTime = DateTime.fromFormat(
-        calculateTimeWithOffset(time, DIRECTION_TO_LOCAL),
-        TIME_FORMAT
-      );
-
-      return (
-        currentAvailableTime.diff(startTime, "minutes").minutes >= 0 &&
-        currentAvailableTime.diff(endTime, "minutes").minutes <= 0
-      );
-    });
-    if (!validAvalilableTimes) {
-      availableTimesFormRef.current.setError("availableTimes", {
-        message: t("Validation:fieldTimeBetween", {
-          attribute: t("Design:startTimesSmall"),
-          min: startTime.toFormat(TIME_FORMAT),
-          max: endTime.toFormat(TIME_FORMAT),
-        }),
+    if (next?.startTime && next?.endTime) {
+      const startTime = DateTime.fromISO(next.startTime);
+      const endTime = DateTime.fromISO(next.endTime);
+      const { availableTimes } = availableTimesFormRef.current.getValues();
+      const validAvalilableTimes = availableTimes.every((time) => {
+        const currentAvailableTime = DateTime.fromFormat(time, TIME_FORMAT);
+
+        return (
+          currentAvailableTime.diff(startTime, "minutes").minutes >= 0 &&
+          currentAvailableTime.diff(endTime, "minutes").minutes <= 0
+        );
       });
-
-      return;
+      if (!validAvalilableTimes) {
+        availableTimesFormRef.current.setError("availableTimes", {
+          message: t("Validation:fieldTimeBetween", {
+            attribute: t("Design:startTimesSmall"),
+            min: startTime.toFormat(TIME_FORMAT),
+            max: endTime.toFormat(TIME_FORMAT),
+          }),
+        });
+
+        return;
+      }
     }
     const values = {
       rrule: next.rrule,
@@ -148,12 +143,9 @@ export const ZoneRecurrencesControl = ({
   const handleOnEdit = (next: Partial<ZoneRecurrence>, index) => {
     clearEditState();
 
-    // Hotfix for an issue with Popover close & open actions
-    setTimeout(() => {
-      setEditState({ index, values: next });
-      setAvailableTimes(next.availableTimes || []);
-      setIsDatePopoverVisible(() => true);
-    }, 100);
+    setEditState({ index, values: next });
+    setAvailableTimes(next.availableTimes || []);
+    setIsDatePopoverVisible(() => true);
   };
 
   const handleOnAdd = () => {

package/src/zone/form/utils/dates.ts

@@ -1,5 +1,7 @@
-import { datetime, TIME_SEPARATOR } from "@licklist/core/dist/Services/Date";
+import { TIME_SEPARATOR } from "@licklist/core/dist/Services/Date";
 import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper";
+import { DateTime } from "luxon";
+import { TIME_FORMAT } from "@licklist/core/dist/Config";
 
 const DEFAULT_START_DAY_TIME = "00:00";
 const DEFAULT_END_DAY_TIME = "23:59";
@@ -13,46 +15,37 @@ export const getTimeCheckboxRanges = (
   const [startHour, startMinutes] = startTime.split(TIME_SEPARATOR);
   const [endHour, endMinutes] = endTime.split(TIME_SEPARATOR);
 
-  let startDate = datetime(
-    today.getFullYear(),
-    today.getMonth() + 1,
-    today.getDate(),
-    Number(startHour),
-    Number(startMinutes)
-  );
-
-  const endDate = datetime(
-    today.getFullYear(),
-    today.getMonth() + 1,
-    today.getDate(),
-    Number(endHour),
-    Number(endMinutes)
-  );
-
-  const dateSlices: { [key: string]: Date } = {
-    0: startDate,
-  };
+  let startDate = DateTime.now()
+    .setZone("UTC")
+    .set({
+      year: today.getFullYear(),
+      month: today.getMonth() + 1,
+      day: today.getDate(),
+      hour: Number(startHour),
+      minute: Number(startMinutes),
+      second: 0,
+    });
+
+  const endDate = DateTime.now()
+    .setZone("UTC")
+    .set({
+      year: today.getFullYear(),
+      month: today.getMonth() + 1,
+      day: today.getDate(),
+      hour: Number(endHour),
+      minute: Number(endMinutes),
+      second: 0,
+    });
+
+  const checkboxes: string[] = [startDate.toFormat(TIME_FORMAT)];
   let count = 0;
 
-  while (endDate >= startDate) {
-    startDate = new Date(startDate.getTime() + range * 60 * 1000);
+  while (endDate.diff(startDate, ["minutes"]).minutes >= range) {
+    startDate = startDate.plus({ minutes: range });
     count += 1;
-    dateSlices[count] = startDate;
+    checkboxes[count] = startDate.toFormat(TIME_FORMAT);
   }
 
-  const checkboxes = Object.keys(dateSlices)
-    .map((key) => {
-      const date = dateSlices[key];
-      if (date < endDate) {
-        const [, time] = date.toISOString().split("T");
-        const [selectedHours, selectedMinutes] = time.split(TIME_SEPARATOR);
-
-        return [selectedHours, selectedMinutes].join(TIME_SEPARATOR);
-      }
-      return null;
-    })
-    .filter(Boolean);
-
   return checkboxes;
 };
 

package/dist/iframe/activity-cards/activity-card/ActivityCard.d.ts

@@ -1,12 +0,0 @@
-import { ReactNode } from "react";
-import { Image } from "@licklist/core/dist/DataMapper/Media/ImageDataMapper";
-export interface ActivityCardProps {
-    title: ReactNode;
-    duration: ReactNode;
-    price: ReactNode;
-    image?: Image | null;
-    onSelect: () => void;
-    isSelected: boolean;
-}
-export declare const ActivityCard: ({ title, duration, price, image, onSelect, isSelected, }: ActivityCardProps) => JSX.Element;
-//# sourceMappingURL=ActivityCard.d.ts.map

package/dist/iframe/activity-cards/activity-card/ActivityCard.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ActivityCard.d.ts","sourceRoot":"","sources":["../../../../src/iframe/activity-cards/activity-card/ActivityCard.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEzC,OAAO,EAAE,KAAK,EAAE,MAAM,sDAAsD,CAAC;AAE7E,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,SAAS,CAAC;IACjB,QAAQ,EAAE,SAAS,CAAC;IACpB,KAAK,EAAE,SAAS,CAAC;IACjB,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IACrB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,eAAO,MAAM,YAAY,6DAOtB,iBAAiB,gBAiBnB,CAAC"}

package/dist/iframe/activity-cards/activity-card/ActivityCard.js

@@ -1 +0,0 @@
-"use strict";function e(e){return e&&"object"==typeof e&&"default"in e?e.default:e}Object.defineProperty(exports,"__esModule",{value:!0});var t=e(require("react")),a=e(require("clsx"));exports.ActivityCard=function(e){var c=e.title,i=e.duration,r=e.price,l=e.image,n=e.onSelect,u=e.isSelected;return t.createElement("button",{type:"button",className:a("activity-card",u&&"active"),onClick:n},l&&t.createElement("img",{className:"activity-card-image",alt:"",src:l.url}),t.createElement("div",{className:a("d-flex","flex-column",!l&&"no-image")},t.createElement("div",{className:"activity-card-title"},c),i&&t.createElement("div",null,i),r&&t.createElement("div",null,r)))};

package/dist/iframe/activity-cards/index.d.ts

@@ -1,3 +0,0 @@
-export * from "./list-activity-card/ListActivityCard";
-export * from "./activity-card/ActivityCard";
-//# sourceMappingURL=index.d.ts.map

package/dist/iframe/activity-cards/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/iframe/activity-cards/index.ts"],"names":[],"mappings":"AAAA,cAAc,uCAAuC,CAAC;AACtD,cAAc,8BAA8B,CAAC"}

package/dist/iframe/activity-cards/list-activity-card/ListActivityCard.d.ts

@@ -1,12 +0,0 @@
-/// <reference types="react" />
-import { Image } from "@licklist/core/dist/DataMapper/Media/ImageDataMapper";
-export interface ListActivityCardProps {
-    title: string;
-    duration: string;
-    price: string;
-    image?: Image | null;
-    onSelect: () => void;
-    isSelected: boolean;
-}
-export declare const ListActivityCard: ({ title, duration, price, image, onSelect, isSelected, }: ListActivityCardProps) => JSX.Element;
-//# sourceMappingURL=ListActivityCard.d.ts.map

package/dist/iframe/activity-cards/list-activity-card/ListActivityCard.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ListActivityCard.d.ts","sourceRoot":"","sources":["../../../../src/iframe/activity-cards/list-activity-card/ListActivityCard.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,sDAAsD,CAAC;AAE7E,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IACrB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,eAAO,MAAM,gBAAgB,6DAO1B,qBAAqB,gBA4BvB,CAAC"}

package/dist/iframe/activity-cards/list-activity-card/ListActivityCard.js

@@ -1 +0,0 @@
-"use strict";function e(e){return e&&"object"==typeof e&&"default"in e?e.default:e}Object.defineProperty(exports,"__esModule",{value:!0});var t=e(require("react")),a=e(require("clsx"));exports.ListActivityCard=function(e){var r=e.title,i=e.duration,l=e.price,c=e.image,n=e.onSelect,s=e.isSelected;return t.createElement("div",{role:"button",onClick:n,onKeyPress:n,tabIndex:0},t.createElement("div",{className:a("list-activity-card",{active:s})},t.createElement("div",{className:"description"},t.createElement("div",{className:"title"},r),i&&t.createElement("div",null,t.createElement("p",null,i)),l&&t.createElement("div",null,l)),c&&t.createElement("div",{className:"image-container"},t.createElement("img",{className:"image",src:c.url,alt:""}))),t.createElement("hr",{className:"list-activity-card-hr"}))};

package/dist/styles/iframe-customers-journey/_index.scss

@@ -1,3 +0,0 @@
-@import "./ActivitiesSelectedCard.scss";
-@import "./ActivitiesCard.scss";
-@import "./DateTimeButton.scss";

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

@@ -1,38 +0,0 @@
-import React, { ReactNode } from "react";
-import clsx from "clsx";
-import { Image } from "@licklist/core/dist/DataMapper/Media/ImageDataMapper";
-
-export interface ActivityCardProps {
-  title: ReactNode;
-  duration: ReactNode;
-  price: ReactNode;
-  image?: Image | null;
-  onSelect: () => void;
-  isSelected: boolean;
-}
-
-export const ActivityCard = ({
-  title,
-  duration,
-  price,
-  image,
-  onSelect,
-  isSelected,
-}: ActivityCardProps) => {
-  return (
-    <button
-      type="button"
-      className={clsx("activity-card", isSelected && "active")}
-      onClick={onSelect}
-    >
-      {image && <img className="activity-card-image" alt="" src={image.url} />}
-      <div className={clsx("d-flex", "flex-column", !image && "no-image")}>
-        <div className="activity-card-title">{title}</div>
-
-        {duration && <div>{duration}</div>}
-
-        {price && <div>{price}</div>}
-      </div>
-    </button>
-  );
-};

package/src/iframe/activity-cards/index.ts

@@ -1,2 +0,0 @@
-export * from "./list-activity-card/ListActivityCard";
-export * from "./activity-card/ActivityCard";

package/src/iframe/activity-cards/list-activity-card/ListActivityCard.stories.tsx

@@ -1,52 +0,0 @@
-import React from "react";
-import { Meta, Story } from "@storybook/react";
-import { ListActivityCardProps, ListActivityCard } from "./ListActivityCard";
-
-export default {
-  title: "Iframe/ListActivityCard",
-  component: ListActivityCard,
-} as Meta;
-
-export const Default: Story<ListActivityCardProps> = (props) => {
-  return <ListActivityCard {...props} />;
-};
-
-Default.args = {
-  title: "Clay Pigeons & Axe Thowing",
-  duration: "60 mins",
-  price: "from £20",
-  image: {
-    hash: "0b37b130e22aa2d3",
-    id: 195,
-    imageType: "cover",
-    imageableId: 25,
-    imageableType: "zone",
-    path: "images/original/000/000/000/000/195-0b37b130e22aa2d3.jpeg",
-    // eslint-disable-next-line max-len
-    url: "https://cdn.lickli.st/doNktZRze1yuz3Uo2OPrLSvXVtUcdUsF/images/original/000/000/000/000/195-0b37b130e22aa2d3.jpeg",
-  },
-  onSelect: () => null,
-  isSelected: false,
-};
-
-export const Selected: Story<ListActivityCardProps> = (props) => {
-  return <ListActivityCard {...props} />;
-};
-
-Selected.args = {
-  title: "Clay Pigeons & Axe Thowing",
-  duration: "60 mins",
-  price: "from £20",
-  image: {
-    hash: "0b37b130e22aa2d3",
-    id: 195,
-    imageType: "cover",
-    imageableId: 25,
-    imageableType: "zone",
-    path: "images/original/000/000/000/000/195-0b37b130e22aa2d3.jpeg",
-    // eslint-disable-next-line max-len
-    url: "https://cdn.lickli.st/doNktZRze1yuz3Uo2OPrLSvXVtUcdUsF/images/original/000/000/000/000/195-0b37b130e22aa2d3.jpeg",
-  },
-  onSelect: () => null,
-  isSelected: true,
-};

package/src/iframe/activity-cards/list-activity-card/ListActivityCard.tsx

@@ -1,49 +0,0 @@
-import React from "react";
-import clsx from "clsx";
-import { Image } from "@licklist/core/dist/DataMapper/Media/ImageDataMapper";
-
-export interface ListActivityCardProps {
-  title: string;
-  duration: string;
-  price: string;
-  image?: Image | null;
-  onSelect: () => void;
-  isSelected: boolean;
-}
-
-export const ListActivityCard = ({
-  title,
-  duration,
-  price,
-  image,
-  onSelect,
-  isSelected,
-}: ListActivityCardProps) => {
-  return (
-    <div role="button" onClick={onSelect} onKeyPress={onSelect} tabIndex={0}>
-      <div
-        className={clsx("list-activity-card", {
-          active: isSelected,
-        })}
-      >
-        <div className="description">
-          <div className="title">{title}</div>
-          {duration && (
-            <div>
-              <p>{duration}</p>
-            </div>
-          )}
-
-          {price && <div>{price}</div>}
-        </div>
-
-        {image && (
-          <div className="image-container">
-            <img className="image" src={image.url} alt="" />
-          </div>
-        )}
-      </div>
-      <hr className="list-activity-card-hr" />
-    </div>
-  );
-};

package/src/styles/iframe-customers-journey/_index.scss

@@ -1,3 +0,0 @@
-@import "./ActivitiesSelectedCard.scss";
-@import "./ActivitiesCard.scss";
-@import "./DateTimeButton.scss";