@redneckz/wildless-cms-uni-blocks 0.14.844 → 0.14.846

package/src/retail/validator/validatorObj.ts

@@ -13,6 +13,7 @@ import {
   jobNumberValidator,
   lengthStringValidator,
   nameRetailValidator,
+  notLaterDateValidator,
   numberValidator,
   serieValidator,
   snilsValidator,
@@ -48,7 +49,7 @@ const validatorRetailObj: Record<string, Validator> = {
   lastJobExperience: jobNumberValidator('Укажите стаж на последнем месте работы'),
   experience5Years: jobNumberValidator('Укажите общий стаж за последние 5 лет'),
   jobsNumber: jobNumberValidator('Укажите количество мест работы за последние 5 лет'),
-  beginDate: defaultValidator('Укажите дату заключения трудового договора'),
+  beginDate: notLaterDateValidator('Укажите дату заключения трудового договора'),
   addressFact: addressDaDataValidator(),
   addressRegistration: addressDaDataValidator(),
   addressRetail: defaultSelectValidator('Выберите адрес банка'),
@@ -75,7 +76,7 @@ const validatorRetailObj: Record<string, Validator> = {
   dulNumber: numberValidator('Укажите номер паспорта'),
   dulSubdivisionCode: numberValidator('Укажите код подразделения'),
   dulIssuedBy: defaultValidator('Укажите организацию, выдавшую паспорт'),
-  participantDateRegistration: defaultValidator('Укажите дату регистрации'),
+  participantDateRegistration: notLaterDateValidator('Укажите дату регистрации'),
   retirementIncome: defaultValidator(),
   otherIncome: defaultValidator(),
   wages: defaultValidator(),

package/src/retail/validator/validators.ts

@@ -85,6 +85,9 @@ export const passportValidator = (birthDate?: Date) =>
 export const deliveryDateValidator = (errorMsg: string) =>
   validator((_) => _?.getTime() >= new Date().getTime())(errorMsg);
 
+export const notLaterDateValidator = (errorMsg: string) =>
+  validator((_) => _?.getTime() <= new Date().getTime())(errorMsg);
+
 export const numberValidator = (errorMsg: string) =>
   validator((_) => typeof _ === 'string' && _.length === 6)(errorMsg);
 

package/src/services/search/useSearch.ts

@@ -1,6 +1,8 @@
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { useDebouncedEffect } from '@redneckz/uni-jsx/lib/hooks/useDebouncedEffect';
+import { useRouter, type Router } from '../../external/useRouter';
+import { adjustHref } from '../../utils/adjustHref';
 import { fetchJSON } from '../../utils/fetchJSON';
 import { type Nullable } from '../../utils/Nullable';
 import { joinPath } from '../../utils/url';
@@ -28,13 +30,18 @@ export const useSearch = ({
 }: SearchParams): [SearchResult | null, SearchInputProps] => {
   const [query, setQuery] = useState(initialQuery || '');
 
+  const router = useRouter();
+
   useEffect(() => {
     if (initialQuery !== undefined && initialQuery !== null) {
       setQuery(initialQuery);
     }
   }, [initialQuery]);
 
-  const { data } = useAsyncData(basePathList?.length ? basePathList : null, fetchSearchIndex);
+  const { data } = useAsyncData(
+    basePathList?.length ? basePathList : null,
+    fetchSearchIndex(router),
+  );
 
   const [result, setResult] = useState<SearchResult | null>(null);
 
@@ -47,28 +54,32 @@ export const useSearch = ({
   return [result, { value: query, onChange: setQuery }];
 };
 
-const fetchSearchIndex = async (...basePathList: (string | null)[]): Promise<SearchIndex[]> =>
-  (
-    await Promise.allSettled(
-      basePathList.map(async (basePath) => [
-        basePath,
-        await fetchJSON(joinPath(basePath, SEARCH_INDEX_FILENAME)),
-      ]),
+const fetchSearchIndex =
+  (router: Router) =>
+  async (...basePathList: (string | null)[]): Promise<SearchIndex[]> =>
+    (
+      await Promise.allSettled(
+        basePathList.map(async (basePath) => [
+          basePath,
+          await fetchJSON(joinPath(basePath, SEARCH_INDEX_FILENAME)),
+        ]),
+      )
     )
-  )
-    .map((_) => (_.status === 'fulfilled' ? _.value : []) as FetchSearchIndexResult)
-    .map(getSearchIndex);
+      .map((_) => (_.status === 'fulfilled' ? _.value : []) as FetchSearchIndexResult)
+      .map(getSearchIndex(router));
 
-const getSearchIndex = ([basePath, result]: FetchSearchIndexResult): SearchIndex => {
-  if (!result) {
-    return {};
-  }
+const getSearchIndex =
+  (router: Router) =>
+  ([basePath, result]: FetchSearchIndexResult): SearchIndex => {
+    if (!result) {
+      return {};
+    }
 
-  return {
-    ...result,
-    corpus: result.corpus?.map((_) => ({
-      ..._,
-      uri: _.uri === 'index' ? basePath : joinPath(basePath, _.uri),
-    })),
+    return {
+      ...result,
+      corpus: result.corpus?.map((_) => ({
+        ..._,
+        uri: _.uri === 'index' ? basePath : adjustHref(router)(_.uri, basePath),
+      })),
+    };
   };
-};

package/src/ui-kit/DatePicker/DatePickerControl.tsx

@@ -8,6 +8,7 @@ import { DatePicker } from './DatePicker';
 
 export interface DatePickerControlProps extends DefaultControlType, ControlProps<Date> {
   minDate?: Date;
+  maxDate?: Date;
 }
 
 export const DatePickerControl = JSX<DatePickerControlProps>(