@redneckz/wildless-cms-uni-blocks 0.14.1045 → 0.14.1047

package/src/retail/api/getLastTaskStatus.ts

@@ -14,8 +14,9 @@ type GetLastTaskStatusResponse = {
 
 export const getLastTaskStatus = async (body: GetLastTaskStatusBody): Promise<number | null> => {
   const isNewMicroservice = checkNewMicroservice();
-
-  const endpoint = isNewMicroservice ? '/public-data/getLastStatus' : '/user-data/getLastStatus';
+  const endpoint = isNewMicroservice
+    ? '/internal/entities/getLastStatus'
+    : '/user-data/getLastStatus';
 
   const res = await fetchRetailJSON<GetLastTaskStatusResponse>(endpoint, 'POST', body);
 

package/src/retail/api/getLink.ts

@@ -13,7 +13,7 @@ export const getLink = async (body: GetLinkBody) => {
   const isNewMicroservice = checkNewMicroservice();
 
   return await fetchRetailJSON<GetLinkResponse>(
-    `${isNewMicroservice ? '/user-data' : ''}/esia/getLink`,
+    `${isNewMicroservice ? '/external/user-data' : ''}/esia/getLink`,
     'POST',
     body,
   );

package/src/retail/api/getRegionsCardDelivery.ts

@@ -1,3 +1,4 @@
+import { checkNewMicroservice } from '../utils/checkNewMicroservice';
 import { fetchRetailJSON } from './doRequest';
 
 type RegionInfo = {
@@ -11,8 +12,9 @@ export type getRegionsCardDeliveryResponse = RegionInfo[];
 export const getRegionsCardDelivery = async (): Promise<
   getRegionsCardDeliveryResponse | undefined
 > => {
+  const isNewMicroservice = checkNewMicroservice();
   const res = await fetchRetailJSON<getRegionsCardDeliveryResponse>(
-    '/public-data/regionsCardDelivery',
+    `${isNewMicroservice ? '/external' : ''}/public-data/regionsCardDelivery`,
     'GET',
   );
 

package/src/retail/api/getTaskById.ts

@@ -9,7 +9,7 @@ type GetTaskByIdBody = {
 export const getTaskById = async (body: GetTaskByIdBody): Promise<Task | undefined> => {
   const isNewMicroservice = checkNewMicroservice();
 
-  const endpoint = isNewMicroservice ? '/public-data/getTaskById' : '/user-data/getTaskById';
+  const endpoint = isNewMicroservice ? '/internal/entities/getTaskById' : '/user-data/getTaskById';
 
   const res = await fetchRetailJSON<Task>(endpoint, 'POST', body);
 

package/src/retail/api/getTaskStatus.ts

@@ -1,3 +1,4 @@
+import { checkNewMicroservice } from '../utils/checkNewMicroservice';
 import { fetchRetailJSON } from './doRequest';
 
 export enum STATUS_TYPE {
@@ -22,5 +23,12 @@ export interface GetTaskStatusResponse {
   taskId: number;
 }
 
-export const getTaskStatus = (body: { taskId: number | null }) =>
-  fetchRetailJSON<GetTaskStatusResponse>('/user-data/getTaskStatus', 'POST', body);
+export const getTaskStatus = (body: { taskId: number | null }) => {
+  const isNewMicroservice = checkNewMicroservice();
+
+  return fetchRetailJSON<GetTaskStatusResponse>(
+    `${isNewMicroservice ? '/internal' : ''}/user-data/getTaskStatus`,
+    'POST',
+    body,
+  );
+};

package/src/retail/api/getUserTasksCredit.ts

@@ -2,7 +2,10 @@ import { fetchRetailJSON } from './doRequest';
 import { type GetUserTasksResponse } from './getUserTasksTypes';
 
 export const getUserTasksCredit = async (): Promise<GetUserTasksResponse | undefined> => {
-  const res = await fetchRetailJSON<GetUserTasksResponse>('/public-data/getUserTasksCredit', 'GET');
+  const res = await fetchRetailJSON<GetUserTasksResponse>(
+    '/internal/entities/getUserTasksCredit',
+    'GET',
+  );
 
   return res || undefined;
 };

package/src/retail/api/regionOffices.ts

@@ -1,4 +1,5 @@
 import { DEFAULT_CENTER_COORDS } from '../../ui-kit/YandexMap/YandexMap';
+import { checkNewMicroservice } from '../utils/checkNewMicroservice';
 import { fetchRetailJSON } from './doRequest';
 
 export type OfficeType = {
@@ -19,8 +20,9 @@ export interface RegionOfficesResponseType {
 }
 
 export const fetchRegionOffices = async (regionKey: string): Promise<OfficeType[]> => {
+  const isNewMicroservice = checkNewMicroservice();
   const response = await fetchRetailJSON<RegionOfficesResponseType>(
-    '/public-data/regionOffices',
+    `${isNewMicroservice ? '/external' : ''}/public-data/regionOffices`,
     'POST',
     {
       regionRfCd: {

package/src/retail/api/saveReferalInfo.ts

@@ -1,9 +1,13 @@
 import { type ReferalData } from '../model/ReferalData';
+import { checkNewMicroservice } from '../utils/checkNewMicroservice';
 import { doRequest } from './doRequest';
 
 export type SaveReferalInfo = ReferalData & {
   taskId: number;
 };
 
-export const saveReferalInfo = (body: SaveReferalInfo) =>
-  doRequest('/referal/saveReferalInfo', 'POST', body);
+export const saveReferalInfo = (body: SaveReferalInfo) => {
+  const isNewMicroservice = checkNewMicroservice();
+
+  return doRequest(`${isNewMicroservice ? '/internal' : ''}/referal/saveReferalInfo`, 'POST', body);
+};

package/src/retail/api/sendCode.ts

@@ -11,7 +11,7 @@ export type SendCodeBody = {
 export const sendCode = async (body: SendCodeBody) => {
   const isNewMicroservice = checkNewMicroservice();
 
-  return await doRequest(`${isNewMicroservice ? '/user-data' : ''}/sms/sendCode`, 'POST', {
+  return await doRequest(`${isNewMicroservice ? '/external/user-data' : ''}/sms/sendCode`, 'POST', {
     phoneNumber: body.phoneNumber,
     smsCodesSetName: isNewMicroservice ? body.smsCodesSetName.key : body.smsCodesSetName,
   });

package/src/retail/api/sendMessage.ts

@@ -11,5 +11,5 @@ interface SendMessage {
 }
 
 export const sendMessage = async (body: SendMessage) => {
-  await doRequest('/camunda/send/message', 'POST', body);
+  await doRequest('/internal/camunda/send/message', 'POST', body);
 };

package/src/retail/api/updateRefreshToken.ts

@@ -1,4 +1,5 @@
 import { locationNavigator } from '../../external/locationNavigator';
+import { checkNewMicroservice } from '../utils/checkNewMicroservice';
 import { doRequest } from './doRequest';
 
 interface UpdateRefreshTokenBody {
@@ -14,7 +15,7 @@ export const updateRefreshToken = (isFromLeadForm = false) => {
   const refreshToken = globalThis.sessionStorage?.getItem('refreshToken');
   const accessToken = globalThis.sessionStorage?.getItem('accessToken');
   const taskId = globalThis.localStorage.getItem('taskId');
-
+  const isNewMicroservice = checkNewMicroservice();
   const navigator = locationNavigator();
 
   if (!accessToken || !refreshToken || (!taskId && !isFromLeadForm)) {
@@ -26,7 +27,7 @@ export const updateRefreshToken = (isFromLeadForm = false) => {
   }
 
   const updateTokenRequest = async () => {
-    const res = await doRequest('/auth/refresh', 'POST', {
+    const res = await doRequest(`${isNewMicroservice ? '/external' : ''}/auth/refresh`, 'POST', {
       // eslint-disable-next-line camelcase
       refresh_token: refreshToken,
       // eslint-disable-next-line camelcase

package/src/retail/api/updateUserTask.ts

@@ -2,6 +2,7 @@
 import { type Nullable } from '@redneckz/uni-jsx/lib/utils/ts/Nullable';
 import { type Option } from '../../ui-kit/Select/Option';
 import { type File } from '../model/LeadFormState';
+import { checkNewMicroservice } from '../utils/checkNewMicroservice';
 import { doRequest } from './doRequest';
 
 type ParticipantAddress = {
@@ -169,5 +170,8 @@ export type UpdateUserTaskBody = {
   crshbFileIds?: number[];
 };
 
-export const updateUserTask = (body: UpdateUserTaskBody) =>
-  doRequest('/user-data/updateUserTask', 'PUT', body);
+export const updateUserTask = (body: UpdateUserTaskBody) => {
+  const isNewMicroservice = checkNewMicroservice();
+
+  return doRequest(`${isNewMicroservice ? '/internal' : ''}/user-data/updateUserTask`, 'PUT', body);
+};

package/src/retail/hooks/useLeadFormData.ts

@@ -14,7 +14,7 @@ export const useLeadFormData = (typeField: string) => {
 
   const { data, error } = useAsyncData(
     `${baseUrl}${
-      isNewMicroservice ? `/public-data` : ''
+      isNewMicroservice ? `/external/public-data` : ''
     }/dictionary?dictionaryType=${encodeURIComponent(typeField)}`,
     fetchData,
   );

package/src/ui-kit/DialogManager/Dialog.tsx

@@ -7,7 +7,7 @@ import { style } from '../../utils/style';
 import { CloseButton } from './CloseButton';
 
 type DialogType = 'sm' | 'lg' | 'xl' | '4xl' | 'none';
-type DialogPosition = 'center' | 'corner';
+type DialogPosition = 'center' | 'corner' | 'top';
 
 export interface DialogProps extends OnCloseProps, OnClickPreventableProps {
   head?: VNode;
@@ -24,6 +24,7 @@ const DIALOG_STYLE: Record<DialogType, string> = {
 };
 
 const DIALOG_POSITION: Record<DialogPosition, string> = {
+  top: 'relative mx-auto',
   center: 'relative mx-auto top-1/2 -translate-y-1/2 mt-0',
   corner: 'absolute bottom-0 right-0',
 };

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

@@ -52,6 +52,7 @@ export const SearchDialog = JSX<SearchDialogProps>(
           />
         }
         onClose={onClose}
+        position="top"
       >
         <Sitemap navigationItems={searchItems} isSearchPanel={true} />
       </Dialog>

package/src/ui-kit/SearchDialog/SearchInput.tsx

@@ -28,7 +28,7 @@ export const SearchInput = JSX<SearchInputProps>(
         </div>
         <input
           className={style(
-            'h-14 w-full px-10 text-l text-black box-border rounded-md',
+            'h-14 w-full px-12 text-l text-black box-border rounded-md',
             inputValidStyle,
           )}
           value={value}