@redneckz/wildless-cms-uni-blocks 0.14.912 → 0.14.914

package/src/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.tsx

@@ -1,18 +1,14 @@
 import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
-import { type LeadRequest } from '../../../api/LeadServiceAPI';
+import { getTimer } from '../../../utils/getTimer';
 import { checkCode } from '../../api/checkCode';
 
 export const TIME_TO_RESEND = 180;
-export const TIME_TO_MAIN_EXPIRE = 600;
 
 type useVerifyPhoneDialogSubmitProps = {
   values: string[];
   onSuccess?: (smsCode?: string) => void;
-  formatData?: LeadRequest;
-  reqId?: string;
-  isRetail?: boolean;
 };
 
 export interface SmsCodeStore {
@@ -25,9 +21,6 @@ export interface SmsCodeStore {
 export const useVerifyPhoneDialogSubmit = ({
   values,
   onSuccess,
-  formatData,
-  reqId,
-  isRetail = true,
 }: useVerifyPhoneDialogSubmitProps) => {
   const sessionStore = useSessionStore<SmsCodeStore>();
   const attempts = sessionStore.smsCode?.attempts || 0;
@@ -49,19 +42,14 @@ export const useVerifyPhoneDialogSubmit = ({
         attempts: attempts + 1,
       };
       startLoading();
-      await checkCode(
-        {
-          smsText: values.join(''),
-          smsCodesSetName: { key: 'AUTHENTICATION' },
-          body: isRetail ? undefined : formatData,
-          reqId: isRetail ? undefined : reqId,
-        },
-        isRetail,
-      );
+      await checkCode({
+        smsText: values.join(''),
+        smsCodesSetName: { key: 'AUTHENTICATION' },
+      });
       setTimeNextReq(0);
       resetError();
       sessionStore.smsCode = null;
-      await onSuccess?.(values.join(''));
+      onSuccess?.(values.join(''));
     } catch {
       setErrorText(attempts > 1 ? 'Исчерпан лимит ввода смс-кода' : 'Неверный код');
     } finally {
@@ -70,7 +58,7 @@ export const useVerifyPhoneDialogSubmit = ({
   }, [values, attempts]);
 
   useEffect(() => {
-    if (isTimeExpired && isRetail) {
+    if (isTimeExpired) {
       setErrorText('Код просрочен');
     } else if (attempts > 2) {
       setErrorText('Исчерпан лимит ввода смс-кода');
@@ -88,5 +76,3 @@ export const useVerifyPhoneDialogSubmit = ({
     setErrorText,
   };
 };
-
-const getTimer = (sendTime: number) => TIME_TO_RESEND - Math.floor((Date.now() - sendTime) / 1000);

package/src/retail/utils/mockLocalStorage.ts

@@ -13,21 +13,15 @@ export const mockLocalStorage = async () => {
     globalThis.localStorage.getItem('profileId') ??
     (await createUserProfile({ profile: { phone: PHONE } }));
 
-  await sendCode(
-    {
-      phoneNumber: PHONE,
-      smsCodesSetName: { key: 'AUTHENTICATION' },
-    },
-    true,
-  );
-
-  await checkCode(
-    {
-      smsCodesSetName: { key: 'AUTHENTICATION' },
-      smsText: '1234',
-    },
-    true,
-  );
+  await sendCode({
+    phoneNumber: PHONE,
+    smsCodesSetName: { key: 'AUTHENTICATION' },
+  });
+
+  await checkCode({
+    smsCodesSetName: { key: 'AUTHENTICATION' },
+    smsText: '1234',
+  });
 
   const task = {
     taskId: globalThis.localStorage.getItem('taskId'),

package/src/ui-kit/BaseTile/BaseTile.tsx

@@ -94,7 +94,7 @@ export const BaseTile = JSX<BaseTileProps>(
 
 const renderMiddleContent = (insetTitle: VNode, children: VNode) =>
   insetTitle || children ? (
-    <div className="grow space-y-lg w-fit">
+    <div className="space-y-lg">
       {insetTitle}
       {children}
     </div>

package/src/ui-kit/ResponseTypeDialog/ResponseTypeDialog.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { Headline } from '../../components/Headline/Headline';
-import { type OnCloseProps } from '../../model/onClose';
+import { type OnCloseProps } from '../../model/OnCloseProps';
 import { Button } from '../Button/Button';
 import { Dialog } from '../DialogManager/Dialog';
 import { Img } from '../Img/Img';

package/src/ui-kit/VerifyPhoneDialogLayout/VerfiyPhoneDialogLayout.tsx

@@ -0,0 +1,80 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { Headline } from '../../components/Headline/Headline';
+import { type OnCloseProps } from '../../model/OnCloseProps';
+import { type VNode } from '../../model/VNode';
+import { InputCode } from '../../retail/components/VerifyPhoneDialog/InputCode';
+import { SubmitButton } from '../../retail/components/VerifyPhoneDialog/SubmitButton';
+import { Button } from '../Button/Button';
+import { ButtonTitle } from '../Button/ButtonTitle';
+import { Dialog } from '../DialogManager/Dialog';
+import { Loader } from '../Loader/Loader';
+import { Timer } from '../TimerCircle/Timer';
+
+export interface VerifyPhoneDialogProps extends OnCloseProps {
+  isSubmitButtonDisabled: boolean;
+  onSubmit: () => Promise<void>;
+  onSendCode: () => Promise<void>;
+  timeNextReq: number;
+  values: string[];
+  onChange: (values: string[]) => void;
+  phone: string;
+  children?: VNode;
+  isLoading?: boolean;
+  errorText?: string;
+  hasError?: boolean;
+}
+
+export const VerifyPhoneDialogLayout = JSX<VerifyPhoneDialogProps>(
+  ({
+    children,
+    isLoading,
+    isSubmitButtonDisabled,
+    timeNextReq,
+    onSubmit,
+    onSendCode,
+    values,
+    onChange,
+    errorText,
+    hasError,
+    phone,
+    onClose,
+  }) => (
+    <Dialog maxWidth="lg" onClose={onClose}>
+      <div className="flex flex-col gap-xl items-center rounded-md">
+        {renderHeadline(phone)}
+        <InputCode values={values} setValues={onChange} errorText={errorText} hasError={hasError} />
+        {renderText(timeNextReq, onSendCode)}
+        {children}
+        {renderNextButton(isSubmitButtonDisabled, onSubmit)}
+        {isLoading ? <Loader blur={false} /> : null}
+      </div>
+    </Dialog>
+  ),
+);
+
+const renderHeadline = (phone: string) => (
+  <Headline
+    className="w-full"
+    title="Подтвердите номер телефона"
+    description={`Мы отправили код на ${phone}`}
+    headlineVersion="XS"
+    isEmbedded={true}
+    as="h6"
+  />
+);
+
+const renderNextButton = (disabled: boolean, onClick: () => void) => (
+  <SubmitButton text="Далее" disabled={disabled} onClick={onClick} />
+);
+
+const renderText = (timeNextReq: number, handleSendCode: () => void) =>
+  timeNextReq ? (
+    <div className="flex flex-row text-l font-light text-base gap-2xs">
+      <span> Получить новый код можно через</span>
+      <Timer seconds={timeNextReq} />
+    </div>
+  ) : (
+    <Button embedded onClick={handleSendCode}>
+      <ButtonTitle>Получить новый код</ButtonTitle>
+    </Button>
+  );

package/src/utils/getTimer.ts

@@ -0,0 +1,4 @@
+export const TIME_TO_RESEND = 180;
+
+export const getTimer = (sendTime: number) =>
+  TIME_TO_RESEND - Math.floor((Date.now() - sendTime) / 1000);

package/bundle/model/onClose.d.ts

@@ -1,3 +0,0 @@
-export interface OnCloseProps {
-    onClose?: () => void;
-}

package/dist/model/onClose.d.ts

@@ -1,3 +0,0 @@
-export interface OnCloseProps {
-    onClose?: () => void;
-}

package/dist/model/onClose.js

@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=onClose.js.map

package/dist/model/onClose.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"onClose.js","sourceRoot":"","sources":["../../src/model/onClose.ts"],"names":[],"mappings":""}

package/lib/model/onClose.d.ts

@@ -1,3 +0,0 @@
-export interface OnCloseProps {
-    onClose?: () => void;
-}

package/lib/model/onClose.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=onClose.js.map

package/lib/model/onClose.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"onClose.js","sourceRoot":"","sources":["../../src/model/onClose.ts"],"names":[],"mappings":""}

package/mobile/bundle/model/onClose.d.ts

@@ -1,3 +0,0 @@
-export interface OnCloseProps {
-    onClose?: () => void;
-}

package/mobile/dist/model/onClose.d.ts

@@ -1,3 +0,0 @@
-export interface OnCloseProps {
-    onClose?: () => void;
-}

package/mobile/dist/model/onClose.js

@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=onClose.js.map

package/mobile/dist/model/onClose.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"onClose.js","sourceRoot":"","sources":["../../src/model/onClose.ts"],"names":[],"mappings":""}

package/mobile/lib/model/onClose.d.ts

@@ -1,3 +0,0 @@
-export interface OnCloseProps {
-    onClose?: () => void;
-}

package/mobile/lib/model/onClose.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=onClose.js.map

package/mobile/lib/model/onClose.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"onClose.js","sourceRoot":"","sources":["../../src/model/onClose.ts"],"names":[],"mappings":""}

package/mobile/src/model/onClose.ts

@@ -1,3 +0,0 @@
-export interface OnCloseProps {
-  onClose?: () => void;
-}

package/src/model/onClose.ts

@@ -1,3 +0,0 @@
-export interface OnCloseProps {
-  onClose?: () => void;
-}