@licklist/design 0.58.4-dev.2 → 0.58.5

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

@@ -9,14 +9,10 @@ import { Icon, Image } from "../../static";
 
 export interface TutorialGifCardProps {
   tutorialAsset?: string;
-  isOverrides?: boolean;
 }
 
 // @TODO: Tutorial GIF asset should be passed as context, which is better
-const TutorialGifCard = ({
-  tutorialAsset,
-  isOverrides,
-}: TutorialGifCardProps) => {
+const TutorialGifCard = ({ tutorialAsset }: TutorialGifCardProps) => {
   const { pathname } = useLocation();
   const [isVisible, setIsVisible] = useState(pathname?.includes("/create"));
   const { t } = useTranslation(["Design"]);
@@ -50,12 +46,8 @@ const TutorialGifCard = ({
           </button>
         </Card.Header>
         <Card.Body className="tutorial-card-body">
-          <p>
-            {t(isOverrides ? "buildOverrideProductSet" : "buildProductSet")}
-          </p>
-          <span>
-            {t(isOverrides ? "buildOverrideRules" : "buildProductSetDesc")}
-          </span>
+          <p>{t("buildProductSet")}</p>
+          <span>{t("buildProductSetDesc")}</span>
           {tutorialAsset && <Image src={tutorialAsset} alt="Tutorial Gif" />}
         </Card.Body>
       </Card>

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

@@ -35,7 +35,6 @@ import { useSortableTreeFunctions } from "../hooks/useSortableTreeFunctions";
 
 interface ProductCategoriesControlProps extends WithIsLoading {
   stepIndex: number;
-  isOverrides?: boolean;
 }
 
 const getCategoryDefaultValue = (
@@ -66,7 +65,6 @@ const getCategoryDefaultValue = (
 export function ProductCategoriesControl({
   isLoading,
   stepIndex,
-  isOverrides,
 }: ProductCategoriesControlProps) {
   const { t } = useTranslation("Design");
   const {
@@ -107,7 +105,6 @@ export function ProductCategoriesControl({
   const { edit, saveValidField, cancelChanges } = useSortableTreeFunctions({
     fieldName: productCategoriesFieldName,
     remove,
-    isOverrides,
   });
 
   const productCategories: ProductCategory[] = useWatch({
@@ -132,7 +129,7 @@ export function ProductCategoriesControl({
   });
 
   const handleDragEnd = (event) => {
-    if (isOverrides) return;
+    // @TODO uncomment when will be fix for change sort index
     const { active, over } = event;
 
     if (!active || !over || !active?.id || !over?.id) return;
@@ -269,10 +266,8 @@ export function ProductCategoriesControl({
                       categoryName={value}
                       stepIndex={stepIndex}
                       productCategoryIndex={index}
-                      isOverride={isOverrides}
                     />
                   }
-                  isOverride={isOverrides}
                   onDelete={() => remove(index)}
                   validate={() =>
                     trigger(`steps.${stepIndex}.productCategories.${index}`)
@@ -295,7 +290,6 @@ export function ProductCategoriesControl({
                     zones={zones}
                     productCategoryIndex={index}
                     categoryType={productCategory.type}
-                    isOverrides={isOverrides}
                   />
                 </SortableTree.Item>
               )}
@@ -305,9 +299,7 @@ export function ProductCategoriesControl({
       </SortableTree>
       <CreateProductSetItem
         title={t("addCategory")}
-        isOverride={isOverrides}
         onClick={() => {
-           if (isOverrides) return;
           setIsSelectCategoryVisible(true);
         }}
       />
@@ -316,7 +308,6 @@ export function ProductCategoriesControl({
         isVisible={isSelectCategoryVisible}
         onHide={() => setIsSelectCategoryVisible(false)}
         onCategorySelect={(categoryType) => {
-          if (isOverrides) return;
           append(getCategoryDefaultValue(categoryType, fields.length));
           setShowCategoryModal(true);
           if (
@@ -330,9 +321,7 @@ export function ProductCategoriesControl({
         <>
           <CreateProductSetItem
             title={t("editMap")}
-            isOverride={isOverrides}
             onClick={() => {
-              if (isOverrides) return;
               setIsVenueMapSetModalVisible(true);
             }}
             className={clsx(

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

@@ -26,19 +26,14 @@ import { checkAvailableTimesErrors, getFilteredTemplates } from "../utils";
 export interface WithIsLoading {
   isLoading: boolean;
 }
-export interface WithIdOptional {
-  id?: number;
-}
-
 export interface WithId {
   id: number;
 }
 export interface ProductSetFormValues
   extends FormValues,
-    WithIdOptional,
+    WithId,
     ProductSetControlValues {
   steps: Step[];
-  isOverrides?: boolean;
 }
 
 export interface ProductSetFormProps
@@ -55,7 +50,6 @@ export interface ProductSetFormProps
   providerHasBookingManagement?: ProviderBookingManagementSetting["hasBookingManagement"];
   zones?: Zone[] | null;
   isCreateAction?: boolean;
-  isOverrides?: boolean;
   workHours?: WorkHour[];
 }
 
@@ -73,7 +67,6 @@ export function ProductSetForm({
   zones,
   isCreateAction,
   workHours,
-  isOverrides,
   ...shared
 }: ProductSetFormProps) {
   const { t } = useTranslation("Design");
@@ -91,7 +84,6 @@ export function ProductSetForm({
   });
 
   const { setError, reset } = form;
-
   const formValues = form.watch();
 
   const submitHandler = (onSubmit: (values: ProductSetFormValues) => void) => {
@@ -169,7 +161,6 @@ export function ProductSetForm({
                     companyName={companyName}
                     workHours={workHours}
                     providerHasBookingManagement={providerHasBookingManagement}
-                    isOverrides={isOverrides}
                   />
                   <Row>
                     <Col md={6} sm={12} />

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

@@ -34,7 +34,6 @@ interface ProductsControlProps extends WithIsLoading {
   hasTicket?: boolean;
   categoryType: CategoryType;
   zones?: Zone[];
-  isOverrides?: boolean;
 }
 
 const getDefaultProductValue = (sort: number): Product => ({
@@ -78,7 +77,6 @@ export function ProductsControl({
   hasTicket,
   categoryType,
   zones,
-  isOverrides,
 }: ProductsControlProps) {
   const { t } = useTranslation("Design");
   const form = useFormContext<ProductSetFormValues>();
@@ -114,7 +112,6 @@ export function ProductsControl({
   const { edit, saveValidField, cancelChanges } = useSortableTreeFunctions({
     fieldName: productControlFieldName,
     remove,
-    isOverrides,
   });
 
   const allowDeposits = watch(
@@ -162,7 +159,6 @@ export function ProductsControl({
   });
 
   const handleDragEnd = (_event) => {
-    if (isOverrides) return;
     const { active, over } = _event;
 
     if (!active || !over || !active?.id || !over?.id) return;
@@ -180,7 +176,6 @@ export function ProductsControl({
   };
 
   const onProductRemove = (index: number) => {
-    if (isOverrides) return;
     const currentProduct = getValues(
       `${productControlFieldName}.${index}` as const
     );
@@ -220,12 +215,10 @@ export function ProductsControl({
                 isExpanded={isFirstProductAdded}
                 isInvalid={!!categoryProductErrors}
                 title={value}
-                isOverride={isOverrides}
                 badge={<Badge className="product-badge">{t("product")}</Badge>}
                 isIconInHeader={false}
                 cancelChanges={() => cancelChanges(index)}
                 edit={() => edit(index)}
-                isProduct
                 secondaryBadge={getBadgeConfig(categoryType, t(categoryType))}
                 subTitle={
                   <div className="product-set-badges-container">
@@ -262,7 +255,6 @@ export function ProductsControl({
                     hasTicket={hasTicket}
                     categoryType={categoryType}
                     zoneDuration={catergoryZone?.defaultDuration}
-                    isOverrides={isOverrides}
                   />
                 }
                 onDelete={() => onProductRemove(index)}
@@ -284,9 +276,7 @@ export function ProductsControl({
       </SortableTree>
       <CreateProductSetItem
         title={t("addProduct")}
-        isOverride={isOverrides}
         onClick={() => {
-          if (isOverrides) return;
           append(getDefaultProductValue(fields.length));
           setShowProductModal(true);
 

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

@@ -18,10 +18,9 @@ import { ProductSetFormValues } from "./ProductSetForm";
 
 interface StepsControlProps {
   isLoading: boolean;
-  isOverrides?: boolean;
 }
 
-export function StepsControl({ isLoading, isOverrides }: StepsControlProps) {
+export function StepsControl({ isLoading }: StepsControlProps) {
   const form = useFormContext<ProductSetFormValues>();
   const { t } = useTranslation("Design");
   const [showStepModal, setShowStepModal] = useState(false);
@@ -43,7 +42,6 @@ export function StepsControl({ isLoading, isOverrides }: StepsControlProps) {
   const { edit, saveValidField, cancelChanges } = useSortableTreeFunctions({
     fieldName: "steps",
     remove,
-    isOverrides,
   });
 
   useEffect(() => {
@@ -92,9 +90,8 @@ export function StepsControl({ isLoading, isOverrides }: StepsControlProps) {
                 modalLabel={t("addNewStep")}
                 modalClass={ProductSetModalClasses.step}
                 isNewAdded={showStepModal}
-                edit={() => !isOverrides && edit(index)}
+                edit={() => edit(index)}
                 cancelChanges={() => cancelChanges(index)}
-                isOverride={isOverrides}
                 subTitle={
                   <div className="product-set-badges-container">
                     <div className="product-set-subtitle-dot product-set-subtitle-step-dot" />
@@ -139,7 +136,6 @@ export function StepsControl({ isLoading, isOverrides }: StepsControlProps) {
                 <ProductCategoriesControl
                   isLoading={isLoading}
                   stepIndex={index}
-                  isOverrides={isOverrides}
                 />
               </SortableTree.Item>
             )}
@@ -149,9 +145,7 @@ export function StepsControl({ isLoading, isOverrides }: StepsControlProps) {
 
       <CreateProductSetItem
         title={t("addStep")}
-        isOverride={isOverrides}
         onClick={() => {
-          if (isOverrides) return;
           append(getDefaultStepsValues());
           setShowStepModal(true);
           if (errors.steps?.type === HookFormService.manualErrorType) {

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

@@ -15,7 +15,6 @@ interface SubProductsControlProps {
   productCategoryIndex: number;
   productIndex: number;
   isLoading: boolean;
-  isOverrides?: boolean;
 }
 
 export function SubProductsControl({
@@ -24,7 +23,6 @@ export function SubProductsControl({
   stepIndex,
   productCategoryIndex,
   productIndex,
-  isOverrides,
 }: SubProductsControlProps) {
   const form = useFormContext<ProductSetFormValues>();
   const { fields, append } = useFieldArray({
@@ -51,7 +49,6 @@ export function SubProductsControl({
             key={`sub-product-${subProduct.id}-${index}`}
             id={subProduct.id}
             title={subProduct.name}
-            isOverride={isOverrides}
             body={
               <ProductControl<ProductSetFormValues>
                 isLoading={isLoading}

package/src/product-set/hooks/useSortableTreeFunctions.ts

@@ -4,25 +4,21 @@ import { useFormContext } from "react-hook-form";
 interface useSortableTreeFunctionsProps {
   fieldName: string;
   remove: (index?: number | number[]) => void;
-  isOverrides?: boolean;
 }
 export const useSortableTreeFunctions = ({
   fieldName,
   remove,
-  isOverrides,
 }: useSortableTreeFunctionsProps) => {
   const { getValues, setValue } = useFormContext();
   const [previousValue, setEditValue] = useState(null);
 
   const edit = (index: number) => {
-    if (isOverrides) return;
     const currentCategoryProduct = getValues(`${fieldName}.${index}` as const);
     const cloneCategoryProduct = structuredClone(currentCategoryProduct);
     setEditValue(cloneCategoryProduct);
   };
 
   const cancelChanges = (index: number) => {
-    if (isOverrides) return;
     if (!previousValue) {
       return remove(index);
     }

package/src/product-set/item/CreateProductSetItem.tsx

@@ -6,21 +6,18 @@ interface CreateProductSetItemProps {
   onClick: () => void;
   title: string;
   className?: string;
-  isOverride?: boolean;
 }
 
 export function CreateProductSetItem({
   onClick,
   title,
   className,
-  isOverride,
 }: CreateProductSetItemProps) {
   return (
     <button
       className={clsx(
         "product-set-item-wrapper w-100",
         `product-set-item-wrapper-${title.toLowerCase().split(" ")[1]}`,
-        isOverride && "bg-light",
         className
       )}
       onClick={onClick}

package/src/product-set/product/ProductControl.tsx

@@ -113,7 +113,6 @@ export interface ProductControlProps<T>
   productName: string;
   hasTicket?: boolean;
   categoryType?: CategoryType;
-  isOverrides?: boolean;
   zoneDuration?: number;
 }
 
@@ -129,7 +128,6 @@ export function ProductControl<T extends FormValues>({
   hasTicket,
   categoryType,
   zoneDuration,
-  isOverrides = false,
 }: ProductControlProps<T>) {
   const {
     register,
@@ -262,7 +260,7 @@ export function ProductControl<T extends FormValues>({
                 `${fieldNamePrefix}.name` as Path<T>,
                 errors
               )}
-              disabled={isLoading || isOverrides}
+              disabled={isLoading}
               placeholder={t("name")}
             />
             <Form.Control.Feedback type="invalid">
@@ -282,7 +280,7 @@ export function ProductControl<T extends FormValues>({
                   viewMode={false}
                   onUpdate={onChange}
                   content={value as string}
-                  disabled={isLoading || isOverrides}
+                  disabled={isLoading}
                 />
               )}
               rules={{
@@ -328,7 +326,6 @@ export function ProductControl<T extends FormValues>({
             <ProductQuantityControl<T>
               isLoading={isLoading}
               fieldNamePrefix={fieldNamePrefix}
-              isOverrides={isOverrides}
               onFocus={onFocus}
             />
 
@@ -373,7 +370,7 @@ export function ProductControl<T extends FormValues>({
                 `${fieldNamePrefix}.quantitySelector` as Path<T>,
                 errors
               )}
-              disabled={isLoading || hasTicket || isOverrides}
+              disabled={isLoading || hasTicket}
             >
               {quantitySelectorList.map((selector) => (
                 <option value={selector.id} key={selector.id}>
@@ -395,14 +392,13 @@ export function ProductControl<T extends FormValues>({
         <Row className="align-items-start duration-capacity-container">
           <ProductDurationControl
             fieldNamePrefix={fieldNamePrefix}
-            disabled={disabledDuration || isOverrides}
+            disabled={disabledDuration}
           />
 
           <Col lg={4} md={4}>
             <FormNumberInput
               fieldName={`${fieldNamePrefix}.capacity`}
               label={t("capacity")}
-              disabled={isOverrides}
               rules={{
                 min: {
                   value: 0,
@@ -430,7 +426,6 @@ export function ProductControl<T extends FormValues>({
                 fieldName={`${fieldNamePrefix}.capacity`}
                 label={t("capacity")}
                 onChange={onChangeGameCapacity}
-                disabled={isOverrides}
                 rules={{
                   min: {
                     value: 0,
@@ -446,7 +441,7 @@ export function ProductControl<T extends FormValues>({
               <FormNumberInput
                 fieldName={`${fieldNamePrefix}.duration`}
                 label={t("durationMinutes")}
-                disabled={disabledDuration || isOverrides}
+                disabled={disabledDuration}
                 rules={{
                   min: {
                     value: 0,
@@ -492,7 +487,7 @@ export function ProductControl<T extends FormValues>({
                     `${fieldNamePrefix}.termsAndConditions` as Path<T>,
                     errors
                   )}
-                  disabled={isLoading || isOverrides}
+                  disabled={isLoading}
                   name={name}
                 />
               )}
@@ -518,7 +513,6 @@ export function ProductControl<T extends FormValues>({
             onFileRemove={onImageRemove}
             defaultFiles={images}
             isLoading={isImageUploading}
-            disabled={isOverrides}
             withIcon
             title={t("addImage")}
           />
@@ -539,7 +533,7 @@ export function ProductControl<T extends FormValues>({
                   name={name}
                   value={Boolean(value)}
                   onChange={onChange}
-                  disabled={isLoading || isOverrides}
+                  disabled={isLoading}
                 />
               );
             }}
@@ -574,7 +568,7 @@ export function ProductControl<T extends FormValues>({
             custom
             type="checkbox"
             name={advancedId}
-            disabled={isLoading || isOverrides}
+            disabled={isLoading}
           >
             <Form.Check.Input
               checked={expanded}
@@ -601,7 +595,7 @@ export function ProductControl<T extends FormValues>({
                     name={name}
                     value={Boolean(value)}
                     onChange={onChange}
-                    disabled={isLoading || isOverrides}
+                    disabled={isLoading}
                   />
                 )}
                 control={control}
@@ -621,7 +615,7 @@ export function ProductControl<T extends FormValues>({
                     name={name}
                     value={Boolean(value)}
                     onChange={onChange}
-                    disabled={isLoading || isOverrides}
+                    disabled={isLoading}
                   />
                 )}
                 control={control}
@@ -630,12 +624,7 @@ export function ProductControl<T extends FormValues>({
             </Form.Group>
             {[CATEGORY_TYPE_GAME, CATEGORY_TYPE_FIXED_DURATION].includes(
               categoryType
-            ) && (
-              <FixedDurationOptions
-                fieldNamePrefix={fieldNamePrefix}
-                isOverrides={isOverrides}
-              />
-            )}
+            ) && <FixedDurationOptions fieldNamePrefix={fieldNamePrefix} />}
             <Form.Group
               controlId={minSpendId}
               className="advanced-switch-container"
@@ -645,7 +634,7 @@ export function ProductControl<T extends FormValues>({
                 isRequired={false}
                 isMoreThanZero
                 allowDeposits={false}
-                isLoading={isLoading || isOverrides}
+                isLoading={isLoading}
                 fieldNamePrefix={`${fieldNamePrefix}.minSpend` as Path<T>}
               />
             </Form.Group>

package/src/product-set/product/fixed-duration-fields/FixedDurationOptions.tsx

@@ -5,15 +5,10 @@ import { FieldNamePrefixPath } from "@licklist/plugins/dist/types/services/Form/
 import { useWatch } from "react-hook-form";
 import { FormNumberInput } from "../../../static";
 
-
-
-interface FixedDurationOptionsProps<T> extends FieldNamePrefixPath<T> {
-  isOverrides?: boolean;
-}
+type FixedDurationOptionsProps<T> = FieldNamePrefixPath<T>;
 
 export const FixedDurationOptions = <T,>({
   fieldNamePrefix,
-  isOverrides,
 }: FixedDurationOptionsProps<T>) => {
   const { t } = useTranslation("Design");
 
@@ -26,7 +21,6 @@ export const FixedDurationOptions = <T,>({
           <FormNumberInput
             fieldName={`${fieldNamePrefix}.subSlots`}
             label={t("subSlotsInMin")}
-            disabled={isOverrides}
           />
         </Col>
 
@@ -34,7 +28,7 @@ export const FixedDurationOptions = <T,>({
           <FormNumberInput
             fieldName={`${fieldNamePrefix}.pause`}
             label={t("pauseInMin")}
-            disabled={!subSlotsFieldValue || isOverrides}
+            disabled={!subSlotsFieldValue}
           />
         </Col>
       </Row>
@@ -44,7 +38,6 @@ export const FixedDurationOptions = <T,>({
           <FormNumberInput
             fieldName={`${fieldNamePrefix}.offset`}
             label={t("offsetInMin")}
-            disabled={isOverrides}
           />
         </Col>
 
@@ -52,7 +45,6 @@ export const FixedDurationOptions = <T,>({
           <FormNumberInput
             fieldName={`${fieldNamePrefix}.serviceTime`}
             label={t("serviceTimeInMin")}
-            disabled={isOverrides}
           />
         </Col>
       </Row>

package/src/product-set/product/quantity/ProductQuantityControl.tsx

@@ -22,13 +22,12 @@ export interface ProductQuantityControlValues extends FormValues {
 export interface ProductQuantityControlProps<T> extends FieldNamePrefixPath<T> {
   isLoading: boolean;
   onFocus?: (e: React.SyntheticEvent) => void;
-  isOverrides?: boolean;
 }
 
 export function ProductQuantityControl<T extends FormValues>(
   props: ProductQuantityControlProps<T>
 ) {
-  const { isLoading = false, fieldNamePrefix, onFocus, isOverrides } = props;
+  const { isLoading = false, fieldNamePrefix, onFocus } = props;
   const {
     control,
     formState: { errors },
@@ -91,7 +90,7 @@ export function ProductQuantityControl<T extends FormValues>(
                   isInvalid={
                     Number(minQuantityValue) > Number(maxQuantityValue)
                   }
-                  disabled={isLoading || isOverrides}
+                  disabled={isLoading}
                 />
               )}
               control={control}
@@ -149,7 +148,7 @@ export function ProductQuantityControl<T extends FormValues>(
                   isInvalid={
                     Number(minQuantityValue) > Number(maxQuantityValue)
                   }
-                  disabled={isLoading || isOverrides}
+                  disabled={isLoading}
                 />
               )}
               control={control}