@redneckz/wildless-cms-uni-blocks 0.14.698 → 0.14.699

package/src/ui-kit/FormField/Fields/OrganizationNameField.tsx

@@ -1,15 +1,19 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
+import { useCreditFormStore } from '../../../hooks/useCreditFormStore';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
+import { updateOrganizationFields } from '../updateOrganizationFields';
 
 export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) => {
+  const store = useCreditFormStore();
+
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
     field?.('inn')?.onChange?.(item.data?.inn);
-    field?.('legalForm')?.onChange?.(item.data?.opf?.short);
+    updateOrganizationFields(store, field, item);
   }, []);
 
   return (

package/src/ui-kit/FormField/SelectField.tsx

@@ -1,3 +1,4 @@
+import { type LeadProps } from '../../api/RetailAPI/model/LeadFormData';
 import { UniBlock } from '../../UniBlock/UniBlock';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { type Option } from '../Select/Option';
@@ -6,14 +7,6 @@ import { type CustomFieldProps } from './CustomFieldProps';
 import { validatorObj } from './getObjectValidator';
 import { getValidation } from './getValidation';
 
-export interface LeadProps {
-  type?: string;
-  key?: string;
-  value?: string;
-  displayOrder?: number;
-  description?: string;
-}
-
 export interface SelectFieldProps extends CustomFieldProps, UniBlockProps {
   source?: LeadProps[];
   label: string;

package/src/ui-kit/FormField/updateOrganizationFields.ts

@@ -0,0 +1,40 @@
+import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
+import {
+  getEmployeesNumberOption,
+  getOrganizationActivityType,
+  getOrganizationKind,
+  getOrganizationType,
+} from '../../api/RetailAPI/utils/getOrganizationParams';
+import { type CreditFormStore } from '../../hooks/useCreditFormStore';
+import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { getAddressFromDaDataItem } from './Fields/AddressField';
+
+export const updateOrganizationFields = (
+  store: CreditFormStore,
+  field: FormFieldRegisterer<any>,
+  item: DaDataSuggestion,
+) => {
+  const inn = item.data?.inn ?? '';
+  const okopf = Number(item.data?.opf?.code);
+  const okved = item.data?.okved ?? '';
+
+  field?.('legalForm')?.onChange?.(item.data?.opf?.short);
+
+  field?.('organizationAddress')?.onChange?.(
+    getAddressFromDaDataItem(item.data?.address as DaDataSuggestion),
+  );
+
+  field?.('amountWorkers')?.onChange?.(
+    getEmployeesNumberOption(store?.amountWorkers, item.data?.employee_count),
+  );
+
+  field?.('employerActivities')?.onChange?.(
+    getOrganizationActivityType(store?.employerActivities ?? [], okved),
+  );
+
+  field?.('organization')?.onChange?.(getOrganizationType(store?.organization ?? [], okopf, inn));
+
+  field?.('employerOrganization')?.onChange?.(
+    getOrganizationKind(store?.employerOrganization ?? [], okopf),
+  );
+};

package/src/ui-kit/FormField/validators.ts

@@ -1,4 +1,4 @@
-import { type Address } from '../../components/ApplicationLeadForm/getInitialFormState';
+import { type Address } from '../../components/ApplicationLeadForm/LeadFormState';
 import { pattern } from '../../validation/pattern';
 import { required } from '../../validation/required';
 import { validator } from '../../validation/validator';

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

@@ -1,26 +1,26 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { style } from '../../utils/style';
-import { getHtmlText } from './getHtmlText';
 import { type RichTextProps } from './RichTextProps';
 
-const EMPTY_HTML = '<p><br></p>';
+export const RichText = JSX<RichTextProps>(
+  ({ __html = '', richVersion = '', itemSize = 'list-m', isDotted = true, children }) => {
+    const dotStyle = isDotted ? '' : 'without-dots';
 
-export const RichText = JSX<RichTextProps>((props) => {
-  const { __html = '', richVersion = '', itemSize = 'list-m', isDotted = true } = props;
-  const dotStyle = isDotted ? '' : 'without-dots';
-
-  return __html && getHtmlText(__html) !== EMPTY_HTML ? (
-    /* Attribute [data-component] need for correct render in wcms editor. Do not remove. */
-    <div data-component="rich-text-container">
-      <div
-        className={style(
-          richVersion,
-          itemSize,
-          'md-container group-data-secondary:text-white group-data-gray:text-secondary-text',
-          dotStyle,
-        )}
-        dangerouslySetInnerHTML={{ __html }}
-      />
-    </div>
-  ) : null;
-});
+    return __html || children ? (
+      /* Attribute [data-component] need for correct render in wcms editor. Do not remove. */
+      <div data-component="rich-text-container">
+        <div
+          className={style(
+            richVersion,
+            itemSize,
+            'md-container group-data-secondary:text-white group-data-gray:text-secondary-text',
+            dotStyle,
+          )}
+          dangerouslySetInnerHTML={__html ? { __html } : undefined}
+        >
+          {children}
+        </div>
+      </div>
+    ) : null;
+  },
+);

package/src/ui-kit/VerifyPhoneDialog/VerifyPhoneDialog.fixture.tsx

@@ -3,20 +3,17 @@ import '../../setup-fixture';
 import { DialogManager } from '../../ui-kit/DialogManager/DialogManager';
 import { VerifyPhoneDialog } from './VerifyPhoneDialog';
 
-const title = 'Подтвердите номер телефона';
-
-const description = 'Мы отправили код на';
-
-const __html = `Вводя код, я подтверждаю, что ознакомлен и подписываю:
-<ul><li>соглашение о порядке использования простой электронной подписи,
-</li><li>согласие на обработку персональных данных,
-</li><li>предоставление и подписание прочих согласий Банка,
-</li><li>согласие на запрос в ПФР</li></ul>`;
+const consents = [
+  'соглашение о порядке использования простой электронной подписи,',
+  'согласие на обработку персональных данных,',
+  'предоставление и подписание прочих согласий Банка,',
+  'согласие на запрос в ПФР',
+];
 
 export default {
   default: (
     <div>
-      <VerifyPhoneDialog title={title} description={description} __html={__html} />
+      <VerifyPhoneDialog phone="+71234567890" consents={consents} />
       <DialogManager />
     </div>
   ),

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

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { sendCode } from '../../api/RetailAPI/sendCode';
 import { Headline } from '../../components/Headline/Headline';
+import { formatPhone } from '../../utils/formatPhone';
 import { noop } from '../../utils/noop';
 import { CaptchaDialog } from '../CaptchaDialog/CaptchaDialog';
 import { Dialog } from '../DialogManager/Dialog';
@@ -15,29 +16,16 @@ import { SubmitButton } from './SubmitButton';
 import { useVerifyPhoneDialogSubmit } from './useVerifyPhoneDialogSubmit';
 
 export interface VerifyPhoneDialogProps {
-  title?: string;
-  description?: string;
+  phone: string;
   code?: boolean;
-  __html?: string;
   codeLength?: number;
-  textButton?: string;
-  phoneNumber?: string;
+  consents?: string[];
   onSuccess?: (smsCode?: string) => void;
   onClose?: () => void;
 }
 
 export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
-  ({
-    title,
-    description,
-    __html,
-    code = true,
-    codeLength = 4,
-    textButton = 'Далее',
-    phoneNumber = '+79999999999',
-    onSuccess = noop,
-    onClose = noop,
-  }) => {
+  ({ phone, code = true, codeLength = 4, consents, onSuccess = noop, onClose = noop }) => {
     const [values, setValues] = useState(Array(codeLength).fill(''));
 
     const {
@@ -54,6 +42,8 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
 
     const captchaDialog = useDialog(CaptchaDialog);
 
+    const phoneNumber = formatPhone(phone);
+
     const handleSendCode = useCallback(async () => {
       const isSuccessSendCode = await sendCode({
         phoneNumber,
@@ -81,8 +71,8 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
         <div className="flex flex-col gap-xl items-center rounded-md">
           <Headline
             className="w-full"
-            title={title}
-            description={description}
+            title="Подтвердите номер телефона"
+            description={`Мы отправили код на ${phone}`}
             headlineVersion="XS"
             isEmbedded={true}
             as="h6"
@@ -97,10 +87,16 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
           ) : null}
           {renderText(timeNextReq, setTimeNextReq, handleSendCode)}
 
-          <RichText itemSize="list-s" __html={__html} />
-
-          {renderTextButton(textButton, isSubmitButtonDisabled, handleSubmit)}
+          <RichText itemSize="list-s">
+            <span>Вводя код, я подтверждаю, что ознакомлен и подписываю: </span>
+            <ul>
+              {consents?.map((_, i) => (
+                <li key={`${_}-${i}`}>{_}</li>
+              ))}
+            </ul>
+          </RichText>
 
+          {renderNextButton(isSubmitButtonDisabled, handleSubmit)}
           {isLoading ? <Loader blur={false} /> : null}
         </div>
       </Dialog>
@@ -108,10 +104,9 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
   },
 );
 
-const renderTextButton = (textButton: string, isDisabled: boolean, handleSubmit: () => void) =>
-  textButton ? (
-    <SubmitButton isDisabled={isDisabled} onClick={handleSubmit} text={textButton} />
-  ) : null;
+const renderNextButton = (isDisabled: boolean, onClick: () => void) => (
+  <SubmitButton text="Далее" isDisabled={isDisabled} onClick={onClick} />
+);
 
 const renderText = (
   timeNextReq: number,

package/bundle/ui-kit/RichText/getHtmlText.d.ts

@@ -1 +0,0 @@
-export declare const getHtmlText: (html: string) => string;

package/dist/ui-kit/RichText/getHtmlText.d.ts

@@ -1 +0,0 @@
-export declare const getHtmlText: (html: string) => string;

package/dist/ui-kit/RichText/getHtmlText.js

@@ -1,5 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHtmlText = void 0;
-const getHtmlText = (html) => html.replace(/<\/?[^>]+\/?>/g, '').trim();
-exports.getHtmlText = getHtmlText;
-//# sourceMappingURL=getHtmlText.js.map

package/dist/ui-kit/RichText/getHtmlText.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getHtmlText.js","sourceRoot":"","sources":["../../../src/ui-kit/RichText/getHtmlText.tsx"],"names":[],"mappings":";;AAAO,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AAA1E,QAAA,WAAW,eAA+D"}

package/lib/ui-kit/RichText/getHtmlText.d.ts

@@ -1 +0,0 @@
-export declare const getHtmlText: (html: string) => string;

package/lib/ui-kit/RichText/getHtmlText.js

@@ -1,2 +0,0 @@
-export const getHtmlText = (html) => html.replace(/<\/?[^>]+\/?>/g, '').trim();
-//# sourceMappingURL=getHtmlText.js.map

package/lib/ui-kit/RichText/getHtmlText.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getHtmlText.js","sourceRoot":"","sources":["../../../src/ui-kit/RichText/getHtmlText.tsx"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC"}

package/mobile/bundle/ui-kit/RichText/getHtmlText.d.ts

@@ -1 +0,0 @@
-export declare const getHtmlText: (html: string) => string;

package/mobile/dist/ui-kit/RichText/getHtmlText.d.ts

@@ -1 +0,0 @@
-export declare const getHtmlText: (html: string) => string;

package/mobile/dist/ui-kit/RichText/getHtmlText.js

@@ -1,5 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHtmlText = void 0;
-const getHtmlText = (html) => html.replace(/<\/?[^>]+\/?>/g, '').trim();
-exports.getHtmlText = getHtmlText;
-//# sourceMappingURL=getHtmlText.js.map

package/mobile/dist/ui-kit/RichText/getHtmlText.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getHtmlText.js","sourceRoot":"","sources":["../../../src/ui-kit/RichText/getHtmlText.tsx"],"names":[],"mappings":";;AAAO,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AAA1E,QAAA,WAAW,eAA+D"}

package/mobile/lib/ui-kit/RichText/getHtmlText.d.ts

@@ -1 +0,0 @@
-export declare const getHtmlText: (html: string) => string;

package/mobile/lib/ui-kit/RichText/getHtmlText.js

@@ -1,2 +0,0 @@
-export const getHtmlText = (html) => html.replace(/<\/?[^>]+\/?>/g, '').trim();
-//# sourceMappingURL=getHtmlText.js.map

package/mobile/lib/ui-kit/RichText/getHtmlText.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getHtmlText.js","sourceRoot":"","sources":["../../../src/ui-kit/RichText/getHtmlText.tsx"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC"}

package/mobile/src/ui-kit/RichText/getHtmlText.tsx

@@ -1 +0,0 @@
-export const getHtmlText = (html: string) => html.replace(/<\/?[^>]+\/?>/g, '').trim();

package/src/ui-kit/RichText/getHtmlText.tsx

@@ -1 +0,0 @@
-export const getHtmlText = (html: string) => html.replace(/<\/?[^>]+\/?>/g, '').trim();