@redneckz/wildless-cms-uni-blocks 0.14.1017 → 0.14.1019

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

@@ -7,7 +7,6 @@ import { AmountField } from './Fields/AmountField';
 import { AnnualRevenueField } from './Fields/AnnualRevenueField';
 import { ApplicationDateField } from './Fields/ApplicationDateField';
 import { ApplierTypeField } from './Fields/ApplierTypeField';
-import { AverageGradeField } from './Fields/AverageGradeField';
 import { BankEmpoleeField } from './Fields/BankEmpoleeField';
 import { BirthdayField } from './Fields/BirthdayField';
 import { CallbackTimeField } from './Fields/CallbackTimeField';
@@ -27,6 +26,7 @@ import { IsClientField } from './Fields/IsClientField';
 import { LocalitiesField } from './Fields/LocalitiesField';
 import { MiddleNameField } from './Fields/MiddleNameField';
 import { NameField } from './Fields/NameField';
+import { NumbersField } from './Fields/NumbersField';
 import { OnlineCheckoutField } from './Fields/OnlineCheckoutField';
 import { PartnerCommentsField } from './Fields/PartnerCommentsField';
 import { PartnerNameField } from './Fields/PartnerNameField';
@@ -113,13 +113,15 @@ export const InputsMap = {
   internshipStartDate: InternshipStartDateField,
   internshipEndDate: InternshipEndDateField,
   university: (props: CustomFieldProps) => <TextField {...props} label="ВУЗ" />,
-  courseYear: (props: CustomFieldProps) => <TextField {...props} label="Курс" />,
-  graduationYear: (props: CustomFieldProps) => <TextField {...props} label="Год окончания" />,
+  courseYear: (props: CustomFieldProps) => <NumbersField {...props} label="Курс" />,
+  graduationYear: (props: CustomFieldProps) => <NumbersField {...props} label="Год окончания" />,
   fieldOfStudy: (props: CustomFieldProps) => <TextField {...props} label="Направление обучения" />,
   educationLevel: (props: SelectFieldProps) => (
     <SelectField {...props} label="Ступень обучения" options={EDUCATION_LEVEL} />
   ),
-  averageGrade: AverageGradeField,
+  averageGrade: (props: CustomFieldProps) => (
+    <NumbersField {...props} label="Средний балл обучения" />
+  ),
   skillsAndKnowledge: CommentField,
   workExperience: CommentField,
   motivationForInternship: CommentField,

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

@@ -4,9 +4,11 @@ import { type BaseFieldDef } from './BaseFieldDef';
 import {
   agreementValidator,
   birthdayValidator,
+  cyrillicWithNumbersValidator,
   defaultSelectValidator,
   defaultValidator,
   emailValidator,
+  fullNameValidator,
   innDadataValidator,
   innValidator,
   nameValidator,
@@ -15,7 +17,7 @@ import {
 } from './validators';
 
 export const validatorObj: Record<string, Validator> = {
-  fullName: defaultValidator(),
+  fullName: fullNameValidator('Укажите полное ФИО на кириллице (без сокращений)'),
   addressBranch: defaultSelectValidator(),
   desiredMeetingDate: defaultValidator(),
   product: defaultValidator(),
@@ -49,20 +51,20 @@ export const validatorObj: Record<string, Validator> = {
   callbackTime: defaultValidator(),
   questionProduct: defaultValidator(),
   russianPhone: russianPhoneValidator('Укажите номер телефона'),
-  cityOfResidence: defaultValidator(),
+  cityOfResidence: cyrillicWithNumbersValidator('Укажите город проживания на кириллице'),
   internshipStartDate: defaultValidator(),
   internshipEndDate: defaultValidator(),
-  university: defaultValidator(),
-  fieldOfStudy: defaultValidator(),
-  courseYear: defaultValidator(),
-  graduationYear: defaultValidator(),
+  university: defaultValidator('Укажите ВУЗ'),
+  fieldOfStudy: defaultValidator('Укажите направление обучения'),
+  courseYear: defaultValidator('Укажите курс'),
+  graduationYear: defaultValidator('Укажите год окончания'),
   averageGrade: defaultValidator(),
-  skillsAndKnowledge: defaultValidator(),
+  skillsAndKnowledge: defaultValidator(''),
   educationLevel: defaultSelectValidator(),
-  motivationForInternship: defaultValidator(),
-  workExperience: defaultValidator(),
+  motivationForInternship: defaultValidator(''),
+  workExperience: defaultValidator(''),
   internshipDirection: defaultValidator(),
-  workingHours: defaultValidator(),
+  workingHours: defaultSelectValidator(),
 };
 
 export const getFormValidator = <FormState extends Record<string, any>, F extends BaseFieldDef>(

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

@@ -1,4 +1,5 @@
 import { isCyrillic } from '../../utils/isCyrilic';
+import { isCyrillicWithNumbers } from '../../utils/isCyrillicWithNumbers';
 import { isDateValid } from '../../utils/isDateValid';
 import { required } from '../../validation/required';
 import { validator } from '../../validation/validator';
@@ -10,28 +11,34 @@ interface DadataItem {
 }
 
 const ERROR_MESSAGE = 'Некорректно заполненное поле';
+const ERROR_SELECT_MESSAGE = 'Выберите вариант ответа';
 
 export const defaultValidator = (errorMsg?: string) => required(errorMsg ?? ERROR_MESSAGE);
 
 export const defaultSelectValidator = (errorMsg?: string) =>
-  validator((_) => _?.key && _?.key !== '')(errorMsg ?? ERROR_MESSAGE);
+  validator((_) => _?.key && _?.key !== '')(errorMsg ?? ERROR_SELECT_MESSAGE);
 
 export const nameValidator = (errorMsg?: string) =>
   validator((_) => typeof _ === 'string' && _.length > 1 && isCyrillic(_))(
     errorMsg ?? ERROR_MESSAGE,
   );
 
+export const fullNameValidator = (errorMsg?: string) =>
+  validator((_) => typeof _ === 'string' && _.length > 1 && isFullName(_))(
+    errorMsg ?? ERROR_MESSAGE,
+  );
+
 export const innValidator = (errorMsg: string) =>
   validator((_: string) => isValidInnLength(_))(errorMsg);
 
 export const innDadataValidator = (errorMsg: string) =>
   validator((_: DadataItem) => Boolean(_?.text) && isValidInnLength(_.text))(errorMsg);
 
-const phoneValidate = (email: string) =>
-  /^(\+7)?[\s-]?\(?[0-9]{3}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/.test(email);
+const phoneValidate = (phone: string) =>
+  /^(\+7)?[\s-]?\(?[0-9]{3}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/.test(phone);
 
-const russianPhoneValidate = (email: string) =>
-  /^(\+7)?[\s-]?\(?[3489][0-9]{2}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/.test(email);
+const russianPhoneValidate = (phone: string) =>
+  /^(\+7)?[\s-]?\(?[3489][0-9]{2}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/.test(phone);
 
 export const phoneValidator = (errorMsg: string) => validator(phoneValidate)(errorMsg);
 
@@ -50,8 +57,16 @@ const emailValidate = (email: string) => /^[^\s@]+@[^\s@]+\.[a-zA-Z]{2,4}$/.test
 export const emailValidator = (errorMsg: string) =>
   validator((_: string) => emailValidate(_))(errorMsg);
 
+export const birthdayValidator = (errorMsg: string) =>
+  validator((_: Date) => isDateValid(_, { maxLimit: new Date() }))(errorMsg);
+
+export const cyrillicWithNumbersValidator = (errorMsg?: string) =>
+  validator((_) => typeof _ === 'string' && _.length > 0 && isCyrillicWithNumbers(_))(
+    errorMsg ?? ERROR_MESSAGE,
+  );
+
 export const isValidInnLength = (value: string | undefined): boolean =>
   typeof value === 'string' && (value.length === 10 || value.length === 12);
 
-export const birthdayValidator = (errorMsg: string) =>
-  validator((_: Date) => isDateValid(_, { maxLimit: new Date() }))(errorMsg);
+export const isFullName = (value: string): boolean =>
+  /^[а-яА-ЯёЁ]+(?:-[а-яА-ЯёЁ]+)*(?:\s+[а-яА-ЯёЁ]+(?:-[а-яА-ЯёЁ]+)*)+$/.test(value);

package/src/ui-kit/Input/InputFile.tsx

@@ -32,6 +32,7 @@ export const InputFile = JSX<InputProps>(
     onBlur,
     maxSizeMB,
     error,
+    isReset,
     onFileChanged = noop,
   }) => {
     const inputRef = useRef<HTMLInputElement | null>(null);
@@ -53,6 +54,12 @@ export const InputFile = JSX<InputProps>(
       }
     }, [autoFocus, inputRef]);
 
+    useEffect(() => {
+      if (isReset) {
+        handleResetFile();
+      }
+    }, [isReset]);
+
     const handleFileChange = async (file?: File) => {
       handleResetFile();
       if (file) {

package/src/ui-kit/Input/InputProps.ts

@@ -7,6 +7,7 @@ export type FileInputProps = {
   extensions?: string[];
   maxSizeMB?: number;
   onFileChanged?: (value: string) => void;
+  isReset?: boolean;
 };
 
 export interface InputProps<V = string>

package/src/ui-kit/UserSurveyDialog/SecondStep.tsx

@@ -2,8 +2,8 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import { SubmitButton } from '../../ui-kit/Button/SubmitButton';
 import { Heading } from '../../ui-kit/Heading/Heading';
-import { Input } from '../../ui-kit/Input/Input';
 import { RadioButtonGroup } from '../../ui-kit/RadioButtonGroup/RadioButtonGroup';
+import { InputControl } from '../Input/InputControl';
 import { Star } from './Star';
 import { type StepProps } from './UserSurveyDialogContent';
 
@@ -36,7 +36,7 @@ export const SecondStep = JSX<StepProps>(
           onChange={handleReasonChange}
         />
         {currentReason?.text === 'Другое' ? (
-          <Input
+          <InputControl
             className="w-full"
             placeholder="Напишите, пожалуйста, свой вариант ответа"
             isTextarea

package/src/utils/isCyrillicWithNumbers.ts

@@ -0,0 +1,3 @@
+const cyrillicWithNumbersPattern = /^(?!\s*$)(?:[\p{Script=Cyrillic}]|\P{L})*$/u;
+
+export const isCyrillicWithNumbers = (_ = '') => cyrillicWithNumbersPattern.test(_);

package/bundle/ui-kit/FormField/Fields/AverageGradeField.d.ts

@@ -1,2 +0,0 @@
-import { type CustomFieldProps } from '../CustomFieldProps';
-export declare const AverageGradeField: import("@redneckz/uni-jsx").UNIComponent<CustomFieldProps, any, any>;

package/dist/ui-kit/FormField/Fields/AverageGradeField.d.ts

@@ -1,2 +0,0 @@
-import { type CustomFieldProps } from '../CustomFieldProps';
-export declare const AverageGradeField: import("@redneckz/uni-jsx").UNIComponent<CustomFieldProps, any, any>;

package/dist/ui-kit/FormField/Fields/AverageGradeField.js

@@ -1,9 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AverageGradeField = void 0;
-const jsx_runtime_1 = require("@redneckz/uni-jsx/jsx-runtime");
-const uni_jsx_1 = require("@redneckz/uni-jsx");
-const InputControl_1 = require("../../Input/InputControl");
-exports.AverageGradeField = (0, uni_jsx_1.JSX)(({ field, input }) => {
-    return ((0, jsx_runtime_1.jsx)(InputControl_1.InputControl, { label: "\u0421\u0440\u0435\u0434\u043D\u0438\u0439 \u0431\u0430\u043B\u043B \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F", type: "number", ...field(input?.name ?? ''), ...input }));
-});
-//# sourceMappingURL=AverageGradeField.js.map

package/dist/ui-kit/FormField/Fields/AverageGradeField.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AverageGradeField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/AverageGradeField.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,2DAAwD;AAG3C,QAAA,iBAAiB,GAAG,IAAA,aAAG,EAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IAC1E,OAAO,CACL,uBAAC,2BAAY,IACX,KAAK,EAAC,sHAAuB,EAC7B,IAAI,EAAC,QAAQ,KACT,KAAK,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,KACxB,KAAK,GACT,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/lib/ui-kit/FormField/Fields/AverageGradeField.d.ts

@@ -1,2 +0,0 @@
-import { type CustomFieldProps } from '../CustomFieldProps';
-export declare const AverageGradeField: import("@redneckz/uni-jsx").UNIComponent<CustomFieldProps, any, any>;

package/lib/ui-kit/FormField/Fields/AverageGradeField.js

@@ -1,7 +0,0 @@
-import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
-import { JSX } from '@redneckz/uni-jsx';
-import { InputControl } from '../../Input/InputControl.js';
-export const AverageGradeField = JSX(({ field, input }) => {
-    return (_jsx(InputControl, { label: "\u0421\u0440\u0435\u0434\u043D\u0438\u0439 \u0431\u0430\u043B\u043B \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F", type: "number", ...field(input?.name ?? ''), ...input }));
-});
-//# sourceMappingURL=AverageGradeField.js.map

package/lib/ui-kit/FormField/Fields/AverageGradeField.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AverageGradeField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/AverageGradeField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAGxD,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IAC1E,OAAO,CACL,KAAC,YAAY,IACX,KAAK,EAAC,sHAAuB,EAC7B,IAAI,EAAC,QAAQ,KACT,KAAK,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,KACxB,KAAK,GACT,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/mobile/bundle/ui-kit/FormField/Fields/AverageGradeField.d.ts

@@ -1,2 +0,0 @@
-import { type CustomFieldProps } from '../CustomFieldProps';
-export declare const AverageGradeField: import("@redneckz/uni-jsx").UNIComponent<CustomFieldProps, any, any>;

package/mobile/dist/ui-kit/FormField/Fields/AverageGradeField.d.ts

@@ -1,2 +0,0 @@
-import { type CustomFieldProps } from '../CustomFieldProps';
-export declare const AverageGradeField: import("@redneckz/uni-jsx").UNIComponent<CustomFieldProps, any, any>;

package/mobile/dist/ui-kit/FormField/Fields/AverageGradeField.js

@@ -1,9 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AverageGradeField = void 0;
-const jsx_runtime_1 = require("@redneckz/uni-jsx/jsx-runtime");
-const uni_jsx_1 = require("@redneckz/uni-jsx");
-const InputControl_1 = require("../../Input/InputControl");
-exports.AverageGradeField = (0, uni_jsx_1.JSX)(({ field, input }) => {
-    return ((0, jsx_runtime_1.jsx)(InputControl_1.InputControl, { label: "\u0421\u0440\u0435\u0434\u043D\u0438\u0439 \u0431\u0430\u043B\u043B \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F", type: "number", ...field(input?.name ?? ''), ...input }));
-});
-//# sourceMappingURL=AverageGradeField.js.map

package/mobile/dist/ui-kit/FormField/Fields/AverageGradeField.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AverageGradeField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/AverageGradeField.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,2DAAwD;AAG3C,QAAA,iBAAiB,GAAG,IAAA,aAAG,EAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IAC1E,OAAO,CACL,uBAAC,2BAAY,IACX,KAAK,EAAC,sHAAuB,EAC7B,IAAI,EAAC,QAAQ,KACT,KAAK,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,KACxB,KAAK,GACT,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/mobile/lib/ui-kit/FormField/Fields/AverageGradeField.d.ts

@@ -1,2 +0,0 @@
-import { type CustomFieldProps } from '../CustomFieldProps';
-export declare const AverageGradeField: import("@redneckz/uni-jsx").UNIComponent<CustomFieldProps, any, any>;

package/mobile/lib/ui-kit/FormField/Fields/AverageGradeField.js

@@ -1,7 +0,0 @@
-import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
-import { JSX } from '@redneckz/uni-jsx';
-import { InputControl } from '../../Input/InputControl.js';
-export const AverageGradeField = JSX(({ field, input }) => {
-    return (_jsx(InputControl, { label: "\u0421\u0440\u0435\u0434\u043D\u0438\u0439 \u0431\u0430\u043B\u043B \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F", type: "number", ...field(input?.name ?? ''), ...input }));
-});
-//# sourceMappingURL=AverageGradeField.js.map

package/mobile/lib/ui-kit/FormField/Fields/AverageGradeField.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AverageGradeField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/AverageGradeField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAGxD,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IAC1E,OAAO,CACL,KAAC,YAAY,IACX,KAAK,EAAC,sHAAuB,EAC7B,IAAI,EAAC,QAAQ,KACT,KAAK,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,KACxB,KAAK,GACT,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/mobile/src/ui-kit/FormField/Fields/AverageGradeField.tsx

@@ -1,14 +0,0 @@
-import { JSX } from '@redneckz/uni-jsx';
-import { InputControl } from '../../Input/InputControl';
-import { type CustomFieldProps } from '../CustomFieldProps';
-
-export const AverageGradeField = JSX<CustomFieldProps>(({ field, input }) => {
-  return (
-    <InputControl
-      label="Средний балл обучения"
-      type="number"
-      {...field(input?.name ?? '')}
-      {...input}
-    />
-  );
-});

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

@@ -1,14 +0,0 @@
-import { JSX } from '@redneckz/uni-jsx';
-import { InputControl } from '../../Input/InputControl';
-import { type CustomFieldProps } from '../CustomFieldProps';
-
-export const AverageGradeField = JSX<CustomFieldProps>(({ field, input }) => {
-  return (
-    <InputControl
-      label="Средний балл обучения"
-      type="number"
-      {...field(input?.name ?? '')}
-      {...input}
-    />
-  );
-});