@redneckz/wildless-cms-uni-blocks 0.14.1066 → 0.14.1068

package/src/components/CreditForm/getYandexAspects.ts

@@ -0,0 +1,58 @@
+import { type AspectData } from '../../hooks/useAspects/useAspects';
+import { type AspectsDef } from '../../model/AspectsProps';
+import { getCreditInfo } from './getCreditInfo';
+
+interface YandexAspectsParams {
+  step: number;
+  programId?: string | null;
+  productType?: string;
+  paymentSystem?: string;
+  aspectsData: AspectsDef[][];
+}
+
+const getVisitParams = (
+  programId?: string | null,
+  productType?: string,
+  paymentSystem?: string,
+): Record<string, unknown> => {
+  const creditInfo = getCreditInfo(programId ?? null);
+  const productName = creditInfo?.name || '';
+  const productTypeValue = productType ?? '';
+
+  if (paymentSystem && productType !== 'credit') {
+    return {
+      [productTypeValue]: {
+        [productName]: paymentSystem,
+      },
+    };
+  } else {
+    return {
+      [productTypeValue]: productName,
+    };
+  }
+};
+
+export const getYandexAspects = ({
+  step,
+  programId,
+  productType,
+  paymentSystem,
+  aspectsData,
+}: YandexAspectsParams): AspectsDef[] => {
+  const aspects = aspectsData[step] || [];
+  const visitParams = getVisitParams(programId, productType, paymentSystem);
+
+  return aspects.map((aspect) => {
+    if (aspect.aspectName === 'ymReachGoal') {
+      return {
+        ...aspect,
+        params: {
+          ...aspect.params,
+          ...visitParams,
+        } as AspectData,
+      };
+    }
+
+    return aspect;
+  });
+};

package/src/retail/components/Fields/DeliveryTimeField.tsx

@@ -18,7 +18,7 @@ export const DeliveryTimeField = JSX<CustomFieldProps>(({ field, input }) => {
 
     return (data || [])
       .filter((item) => item.key && allowedTimes.includes(item.key))
-      .sort((a, b) => (a.displayOrder || 0) - (b.displayOrder || 0))
+      .sort((a, b) => (a?.displayOrder || 0) - (b?.displayOrder || 0))
       .map((item) => ({
         id: item.key as string,
         text: item.value,