@licklist/design 0.44.504 → 0.44.506

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

@@ -27,12 +27,19 @@ import {
 import TutorialGifCard from "./TutorialGifCard";
 import { Step } from "../types";
 import { StepsControl } from "../form/StepsControl";
+import { Typeahead } from "../../typeahead";
 
 const OPERATIONAL_COST_TITLES = {
   [OPERATIONAL_COST_PROVIDER]: "operationalCostProvider",
   [OPERATIONAL_COST_CUSTOMER]: "operationalCostCustomer",
 } as const;
 
+export interface TemplateItem {
+  id: string;
+  value: EmailTemplate | SmsTemplate;
+  label: string;
+}
+
 export interface ProductSetControlValues extends DateAndRecurrenceInputValues {
   name: string;
   type: ProductSetType;
@@ -43,8 +50,8 @@ export interface ProductSetControlValues extends DateAndRecurrenceInputValues {
   productGroups?: SelectItem[];
   fieldSetId?: number;
   steps?: Step[];
-  emailTemplateId?: number;
-  smsTemplateId?: number;
+  emailTemplates?: TemplateItem[];
+  smsTemplates?: TemplateItem[];
 }
 
 export interface ProductSetControlShared {
@@ -54,11 +61,17 @@ export interface ProductSetControlShared {
   smsTemplates?: SmsTemplate[];
 }
 
-export interface ProductSetControlProps extends ProductSetControlShared {
+export interface ProductSetControlProps {
   companyName: string;
   isLoading: boolean;
   isEventEditProductSet?: boolean;
   isCreateAction?: boolean;
+  emailTemplates?: TemplateItem[];
+  smsTemplates?: TemplateItem[];
+  fee?: string;
+  fieldSets?: FieldSet[];
+  showEmailTemplate?: boolean;
+  showSmsTemplate?: boolean;
 }
 
 export function ProductSetControl({
@@ -70,6 +83,8 @@ export function ProductSetControl({
   smsTemplates = [],
   isEventEditProductSet,
   isCreateAction,
+  showEmailTemplate,
+  showSmsTemplate,
 }: ProductSetControlProps) {
   const { t } = useTranslation(["Design", "Validation", "Notification"]);
   const {
@@ -82,8 +97,6 @@ export function ProductSetControl({
   } = useFormContext<ProductSetControlValues>();
 
   const steps = watch("steps");
-  const smsTemplateId = watch("smsTemplateId");
-  const emailTemplateId = watch("emailTemplateId");
 
   const nameId = useId();
   const termsAndConditionsId = useId();
@@ -221,20 +234,16 @@ export function ProductSetControl({
             <Form.Label className="mt-4">
               {t("Design:emailTemplate")}
             </Form.Label>
-            {emailTemplates.length > 0 ? (
-              <Form.Control {...register("emailTemplateId")} as="select">
-                <option value="" selected={String(emailTemplateId) === ""}>
-                  {t("Design:choose")}
-                </option>
-                {emailTemplates.map((emailTemplate) => (
-                  <option
-                    value={Number(emailTemplate.notification.id)}
-                    key={emailTemplate.id}
-                  >
-                    {emailTemplate.notification.name}
-                  </option>
-                ))}
-              </Form.Control>
+            {showEmailTemplate ? (
+              <Typeahead
+                name="emailTemplates"
+                options={emailTemplates}
+                isMultipleChoise
+                placeholder={t("Design:choose")}
+                noOptionsMessage={t("Design:noActiveTemplates", {
+                  notification: t("Design:email"),
+                })}
+              />
             ) : (
               <WarningMessage
                 message={t("Design:noActiveTemplates", {
@@ -248,20 +257,16 @@ export function ProductSetControl({
             >
               {t("Design:smsTemplate")}
             </Form.Label>
-            {smsTemplates.length > 0 ? (
-              <Form.Control {...register("smsTemplateId")} as="select">
-                <option value="" selected={String(smsTemplateId) === ""}>
-                  {t("Design:choose")}
-                </option>
-                {smsTemplates.map((smsTemplate) => (
-                  <option
-                    value={Number(smsTemplate.notification.id)}
-                    key={smsTemplate.id}
-                  >
-                    {smsTemplate.notification.name}
-                  </option>
-                ))}
-              </Form.Control>
+            {showSmsTemplate ? (
+              <Typeahead
+                name="smsTemplates"
+                options={smsTemplates}
+                isMultipleChoise
+                placeholder={t("Design:choose")}
+                noOptionsMessage={t("Design:noActiveTemplates", {
+                  notification: t("Design:sms"),
+                })}
+              />
             ) : (
               <WarningMessage
                 message={t("Design:noActiveTemplates", {

package/src/product-set/form/ProductSetForm.stories.tsx

@@ -3,6 +3,11 @@
 import React from "react";
 import { Meta, Story } from "@storybook/react";
 import { boolean } from "@storybook/addon-knobs";
+import {
+  CONFIRMATION_TYPE,
+  PAYMENT_LINK_TYPE,
+} from "@licklist/core/dist/DataMapper/Notification/NotificationTypeDataMapper";
+
 import {
   OPERATIONAL_COST_CUSTOMER,
   OPERATIONAL_COST_PROVIDER,
@@ -357,12 +362,14 @@ Default.args = {
       body: "",
       meta: "",
       notification: {
-        isActive: false,
+        id: 1,
+        isActive: true,
         isDefault: false,
         name: "Template name 1",
         companyId: 1,
         providerId: 1,
         fieldSetId: 1,
+        type: CONFIRMATION_TYPE,
       },
     },
     {
@@ -371,12 +378,44 @@ Default.args = {
       body: "",
       meta: "",
       notification: {
-        isActive: false,
+        id: 2,
+        isActive: true,
+        isDefault: false,
+        name: "Tempalte name 2",
+        companyId: 1,
+        providerId: 1,
+        fieldSetId: 1,
+        type: CONFIRMATION_TYPE,
+      },
+    },
+  ],
+  smsTemplates: [
+    {
+      id: "1",
+      body: "",
+      notification: {
+        id: 3,
+        isActive: true,
+        isDefault: false,
+        name: "Tempalte name 1",
+        companyId: 1,
+        providerId: 1,
+        fieldSetId: 1,
+        type: PAYMENT_LINK_TYPE,
+      },
+    },
+    {
+      id: "2",
+      body: "",
+      notification: {
+        id: 4,
+        isActive: true,
         isDefault: false,
         name: "Tempalte name 2",
         companyId: 1,
         providerId: 1,
         fieldSetId: 1,
+        type: PAYMENT_LINK_TYPE,
       },
     },
   ],

package/src/product-set/form/ProductSetForm.tsx

@@ -20,6 +20,7 @@ import {
 import { Step } from "../types";
 import { ProductSetContextProvider, ProductSetLoadingContext } from "./context";
 import { SelectItem } from "../../types/generic/SelectItem";
+import { getFilteredTemplates } from "../utils";
 
 export interface WithIsLoading {
   isLoading: boolean;
@@ -133,6 +134,16 @@ export function ProductSetForm({
                 <>
                   <ProductSetControl
                     {...shared}
+                    smsTemplates={getFilteredTemplates(
+                      shared?.smsTemplates,
+                      formValues?.smsTemplates
+                    )}
+                    emailTemplates={getFilteredTemplates(
+                      shared?.emailTemplates,
+                      formValues?.emailTemplates
+                    )}
+                    showEmailTemplate={!!shared?.emailTemplates}
+                    showSmsTemplate={!!shared?.smsTemplates}
                     isLoading={isLoading}
                     isCreateAction={isCreateAction}
                     companyName={companyName}

package/src/product-set/utils/index.ts

@@ -1,3 +1,7 @@
+import { EmailTemplate } from "@licklist/core/dist/DataMapper/Notification/EmailTemplateDataMapper";
+import { SmsTemplate } from "@licklist/core/dist/DataMapper/Notification/SmsTemplateDataMapper";
+import { TemplateItem } from "../control/ProductSetControl";
+
 export const moveArrayElements = <T>(
   array: T[],
   prevIndex: number,
@@ -14,3 +18,27 @@ export const moveArrayElements = <T>(
 export const sortArrayByIndex = <T>(array: T[]) => {
   return array.map((element: T, index) => ({ ...element, sort: index }));
 };
+
+export const getFilteredTemplates = (
+  templates?: EmailTemplate[] | SmsTemplate[],
+  formTemplates?: TemplateItem[]
+): TemplateItem[] | undefined => {
+  if (!templates) {
+    return undefined;
+  }
+
+  return templates
+    ?.filter(
+      (template) =>
+        template.notification.isActive &&
+        !formTemplates?.find(
+          (formTemplate) =>
+            formTemplate.value.notification.type === template.notification.type
+        )
+    )
+    ?.map((template) => ({
+      id: template?.id,
+      value: template,
+      label: template?.notification?.name,
+    }));
+};

package/src/provider/provider-details-input/ProviderDetailsInput.tsx

@@ -34,7 +34,6 @@ export function ProviderDetailsInput({
   const {
     register,
     formState: { errors },
-    setValue,
   } = useFormContext<ProviderDetailsInputValues>();
   const { t } = useTranslation(["App", "Design", "Validation"]);
 
@@ -149,7 +148,6 @@ export function ProviderDetailsInput({
           <Typeahead
             name="company"
             options={companiesOptions}
-            setValue={setValue}
             placeholder={t("App:select")}
             noOptionsMessage={t("App:noMatchesFound")}
           />

package/src/sales/manual-booking/select-menu/SelectMenu.tsx

@@ -39,7 +39,9 @@ export const SelectMenu = ({
       ) : (
         <>
           {!isLoading && (
-            <Form.Label className="bold-text">{t("Design:productSets")}</Form.Label>
+            <Form.Label className="bold-text">
+              {t("Design:productSets")}
+            </Form.Label>
           )}
 
           <div className="menu-list-manual-booking">

package/src/styles/snippet-templates/SnippetTemplateCard.scss

@@ -45,6 +45,22 @@ $snippet-template-card-button-transition: $product-set-card-transition !default;
     display: flex;
     justify-content: space-between;
     align-items: center;
+
+    a {
+      white-space: nowrap;
+      display: inline-block;
+      text-overflow: ellipsis;
+      width: 85%;
+      overflow: hidden;
+    }
+  }
+
+  .snippet-template-card-subject {
+    white-space: nowrap;
+    display: inline-block;
+    text-overflow: ellipsis;
+    width: 100%;
+    overflow: hidden;
   }
 
   .snippet-template-card-button {

package/src/typeahead/Typeahead.stories.tsx

@@ -1,20 +1,23 @@
 import React from "react";
 import { storiesOf } from "@storybook/react";
+import { FormProvider, useForm } from "react-hook-form";
 import { Typeahead } from "./Typeahead";
 
-storiesOf("Typeahead", module)
-  .add("Typeahead", () => (
-    <>
+storiesOf("Typeahead", module).add("Typeahead", () => {
+  const form = useForm();
+  return (
+    <FormProvider {...form}>
       <Typeahead
         name="user"
+        isMultipleChoise
         options={[
           { id: 1, value: "user1", label: "User1" },
           { id: 2, value: "user2", label: "User2" },
           { id: 3, value: "user3", label: "User3" },
         ]}
-        setValue={() => {}}
         placeholder="Select"
         noOptionsMessage="No Options Found"
       />
-    </>
-  ));
+    </FormProvider>
+  );
+});

package/src/typeahead/Typeahead.tsx

@@ -1,47 +1,44 @@
 import React from "react";
 import Select from "react-select";
-import { useForm, Controller } from "react-hook-form";
+import { Controller, useFormContext } from "react-hook-form";
 
 export type TypeaheadOptions = {
-  id: number;
-  value: string;
+  id: number | string;
+  value: any;
   label: string;
 };
 
 export interface TypeaheadProps {
   options: TypeaheadOptions[];
-  setValue: (value: string | any) => void;
   placeholder: string;
   isRequired?: boolean;
   name: string;
+  isMultipleChoise?: boolean;
   noOptionsMessage: string;
 }
 
 function Typeahead({
   options,
-  setValue,
   placeholder,
   isRequired = false,
+  isMultipleChoise,
   name = "",
   noOptionsMessage = "",
-}) {
-  const { control } = useForm({
-    mode: "onChange",
-  });
-  const prefix = "id";
+}: TypeaheadProps) {
+  const { control } = useFormContext();
 
   return (
     <>
       <Controller
-        name={`${name}.${prefix as string}` as const}
+        name={name}
         control={control}
         rules={{ required: isRequired }}
         render={({ field }) => (
           <Select
             placeholder={placeholder}
             value={field.value}
+            isMulti={isMultipleChoise}
             onChange={(value) => {
-              setValue(`${name}.${prefix}`, value.id);
               field.onChange(value);
             }}
             options={options}