@redneckz/wildless-cms-uni-blocks 0.14.642 → 0.14.644

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -10,7 +11,11 @@ export const Experience5YearsField = JSX<CustomFieldProps>(({ field, input }) =>
     placeholder="За последние 5 лет"
     type="number"
     inputLength={2}
-    {...getValidation(field('experience5Years'), validatorObj.experience5Years, input?.required)}
+    {...getValidation(
+      field('experience5Years'),
+      validatorObj.experience5Years,
+      calculateIsRequired(field, input?.required),
+    )}
     {...input}
   />
 ));

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -10,7 +11,11 @@ export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) =>
     type="number"
     inputLength={2}
     placeholder="Количество лет"
-    {...getValidation(field('generalSeniority'), validatorObj.generalSeniority, input?.required)}
+    {...getValidation(
+      field('generalSeniority'),
+      validatorObj.generalSeniority,
+      calculateIsRequired(field, input?.required),
+    )}
     {...input}
   />
 ));

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

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
 import { InputControl } from '../../Input/InputControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -18,7 +19,11 @@ export const InnField = JSX<CustomFieldProps>(({ field, input }) => {
       type="number"
       inputLength={12}
       {...input}
-      {...getValidation(field('inn'), validatorObj.inn, input?.required)}
+      {...getValidation(
+        field('inn'),
+        validatorObj.inn,
+        calculateIsRequired(field, input?.required),
+      )}
       onDaDataChange={onDaDataChange}
     />
   );

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -10,7 +11,11 @@ export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
     placeholder="Количество мест"
     type="number"
     inputLength={2}
-    {...getValidation(field('jobsNumber'), validatorObj.jobsNumber, input?.required)}
+    {...getValidation(
+      field('jobsNumber'),
+      validatorObj.jobsNumber,
+      calculateIsRequired(field, input?.required),
+    )}
     {...input}
   />
 ));

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -10,7 +11,11 @@ export const LastJobExperienceField = JSX<CustomFieldProps>(({ field, input }) =
     placeholder="Количество лет"
     type="number"
     inputLength={2}
-    {...getValidation(field('lastJobExperience'), validatorObj.lastJobExperience, input?.required)}
+    {...getValidation(
+      field('lastJobExperience'),
+      validatorObj.lastJobExperience,
+      calculateIsRequired(field, input?.required),
+    )}
     {...input}
   />
 ));

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -8,7 +9,11 @@ export const LegalFormField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="ОПФ"
     placeholder="ООО, ПАО  и др."
-    {...getValidation(field('legalForm'), validatorObj.legalForm, input?.required)}
+    {...getValidation(
+      field('legalForm'),
+      validatorObj.legalForm,
+      calculateIsRequired(field, input?.required),
+    )}
     {...input}
   />
 ));

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

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
 import { InputControl } from '../../Input/InputControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -16,7 +17,11 @@ export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) =>
     <InputControl
       label="Наименование организации"
       {...input}
-      {...getValidation(field('organizationName'), validatorObj.organizationName, input?.required)}
+      {...getValidation(
+        field('organizationName'),
+        validatorObj.organizationName,
+        calculateIsRequired(field, input?.required),
+      )}
       onDaDataChange={onDaDataChange}
     />
   );

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -8,7 +9,11 @@ const MAX_PART = 100;
 
 export const PartInBusinessField = JSX<CustomFieldProps>(({ field, input }) => {
   const partInBusinessField = {
-    ...getValidation(field('partInBusiness'), validatorObj.partInBusiness, input?.required),
+    ...getValidation(
+      field('partInBusiness'),
+      validatorObj.partInBusiness,
+      calculateIsRequired(field, input?.required),
+    ),
   };
 
   const handleChange = (value: string) =>

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputPhoneControl } from '../../Input/InputPhoneControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -7,7 +8,13 @@ import { getValidation } from '../getValidation';
 export const PhoneField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputPhoneControl
     label="Телефон"
-    {...getValidation(field(input?.name || 'phone'), validatorObj.phone, input?.required)}
+    {...getValidation(
+      field(input?.name || 'phone'),
+      validatorObj.phone,
+      input?.name === 'organizationPhone'
+        ? calculateIsRequired(field, input?.required)
+        : input?.required,
+    )}
     {...input}
   />
 ));

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

@@ -0,0 +1,6 @@
+import { type FieldProps } from '../../hooks/useForm';
+
+export const calculateIsRequired = (
+  field: (fieldName: string) => FieldProps<any>,
+  initialRequired?: boolean,
+) => (field?.('employment')?.value?.key === 'RETIREE' ? false : initialRequired);

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

@@ -6,11 +6,12 @@ export interface ResponseTypeDialogProps {
   typeForm?: string;
 }
 
-export const useResponseTypeDialog = (props: ResponseTypeDialogProps) => {
+export const useResponseTypeDialog = (initialProps: ResponseTypeDialogProps) => {
   const { open, close } = useDialogManager();
 
   return {
-    open: (options: DialogOptions = {}) => open(<ResponseTypeDialog {...props} />, options),
+    open: (props?: ResponseTypeDialogProps, options: DialogOptions = {}) =>
+      open(<ResponseTypeDialog {...initialProps} {...props} />, options),
     close,
   };
 };

package/src/utils/url.ts

@@ -15,7 +15,11 @@ export const joinPath = (...path: (string | undefined | null)[]): string =>
     .filter(Boolean)
     .join('/')
     .replace(/\/+/g, '/')
-    .replace(/^(.+):\//, '$1://');
+    .replace(/^(.+):\//, '$1://')
+    .replace(/^file:/, 'file:/')
+    .replace(/\/(\?|&|#[^!])/g, '$1')
+    .replace(/\?/g, '&')
+    .replace('&', '?');
 
 export const hasPrefix = (href?: string, prefix?: string | undefined) => {
   if (!href || !prefix) {