hl-core 0.0.10-beta.63 → 0.0.10-beta.65

package/api/base.api.ts

@@ -503,7 +503,7 @@ export class ApiClass {
   }
 
   async availableToAccureStartEducationalCapital(id: string | number) {
-    return await this.axiosCall<boolean>({
+    return await this.axiosCall<any>({
       method: Methods.GET,
       url: `/${this.productUrl}/api/Application/AvailableToAccureStartEducationalCapital?processInstanceId=${id}`,
     });
@@ -617,6 +617,14 @@ export class ApiClass {
     });
   }
 
+  async checkExistProcess(iin: string, processCode: number) {
+    return await this.axiosCall<string>({
+      method: Methods.GET,
+      url: '/Arm/api/Bpm/CheckExistProcess',
+      params: { iin, processCode },
+    });
+  }
+
   async getContragentFromGBDFL(data: Types.Api.GBD.Request) {
     return await this.axiosCall<Types.Api.GBD.Response>({
       method: Methods.POST,
@@ -859,6 +867,13 @@ export class ApiClass {
     });
   }
 
+  async getCloseDate() {
+    return await this.axiosCall<string>({
+      method: Methods.GET,
+      url: `/${this.productUrl}/api/Application/GetCloseDate`,
+    });
+  }
+
   async getProcessGfot(processCode: string | number) {
     return await this.axiosCall<Value[]>({
       method: Methods.GET,
@@ -1097,6 +1112,16 @@ export class ApiClass {
     });
   }
 
+  async setIsNotCalculated(processInstanceId: string | number) {
+    return await this.axiosCall<boolean>({
+      method: Methods.POST,
+      url: `/${this.productUrl}/api/Application/SetIsNotCalculated`,
+      params: {
+        processInstanceId,
+      },
+    });
+  }
+
   async checkProActiveService(processInstanceId: string | number, iin: string) {
     return await this.axiosCall({
       method: Methods.GET,
@@ -1173,6 +1198,14 @@ export class ApiClass {
         data: data,
       });
     },
+    resetApplicationData: async (processInstanceId: string | number) => {
+      return await this.axiosCall<void>({
+        method: Methods.POST,
+        baseURL: getStrValuePerEnv('efoBaseApi'),
+        url: `${this.pensionannuityNew.base}/ResetApplicationData`,
+        params: { processInstanceId },
+      });
+    },
   };
 
   externalServices = {

package/api/interceptors.ts

@@ -1,46 +1,107 @@
-import { AxiosError, type AxiosInstance } from 'axios';
+import { AxiosError, type AxiosInstance, type InternalAxiosRequestConfig, isAxiosError } from 'axios';
 
-export default function (axios: AxiosInstance) {
+/**
+ * Обновляет baseURL в зависимости от текущего хоста
+ */
+function updateBaseUrlForEnvironment(request: InternalAxiosRequestConfig): void {
+  if (!request.url || !request.baseURL) return;
+
+  const host = window.location.hostname;
+
+  if (host.startsWith('bpmsrv02') || host.startsWith('vega')) {
+    if (request.baseURL === getStrValuePerEnv('baseApi')) {
+      request.baseURL = getStrValuePerEnv('baseApiLocal');
+    }
+    if (request.baseURL === getStrValuePerEnv('efoBaseApi')) {
+      request.baseURL = getStrValuePerEnv('efoBaseApiLocal');
+    }
+    if (request.baseURL === getStrValuePerEnv('amlBaseApi')) {
+      request.baseURL = getStrValuePerEnv('amlBaseApiLocal');
+    }
+    if (request.baseURL === getStrValuePerEnv('gatewayApiUrl')) {
+      request.baseURL = getStrValuePerEnv('gatewayApiUrlLocal');
+    }
+  }
+}
+
+/**
+ * Обрабатывает специальную логику для нового API
+ */
+function handleNewApiLogic(request: InternalAxiosRequestConfig): void {
+  if (!request.url || !request.baseURL) return;
+
+  if (import.meta.env.VITE_ON_NEW_API === 'true' && request.url.includes('api/Application')) {
+    if (request.baseURL === 'http://vega:84') {
+      request.baseURL = 'http://efo-dev.halyklife.nb/api';
+    }
+    if (request.baseURL === 'http://bpmsrv02.halyklife.nb') {
+      request.baseURL = 'http://efo-prod.halyklife.nb/api';
+    }
+
+    request.url = request.url.replace('/api/Application', '');
+
+    if (request.baseURL.includes('api/v1/insis')) {
+      request.baseURL = request.baseURL.replace('api/v1/insis', 'efo/api');
+    }
+    if (request.baseURL.includes('api/v1/test/insis')) {
+      request.baseURL = request.baseURL.replace('api/v1/test/insis', 'test/efo/api');
+    }
+  }
+}
+
+/**
+ * Извлекает полезное сообщение об ошибке из ответа
+ */
+function extractErrorMessage(data: any, status: number, dataStore: any): string {
+  // .NET ProblemDetails
+  if (data && typeof data === 'object') {
+    if (data.title || data.detail) {
+      return data.title || data.detail;
+    }
+    // Распространённые поля
+    if (data.message || data.status || data.statusName) {
+      return data.message || data.status || data.statusName;
+    }
+  }
+
+  // Если строка/HTML
+  if (typeof data === 'string') {
+    return data.slice(0, 200);
+  }
+
+  // Фолбэк
+  return status === 500 ? dataStore.t('toaster.serverError') : `HTTP ${status}`;
+}
+
+/**
+ * Настраивает interceptors для axios instance
+ *
+ * @param axios - Экземпляр axios для настройки
+ *
+ * Включает:
+ * - Автоматическое добавление токена авторизации
+ * - Обработку различных окружений (dev/prod)
+ * - Комплексную обработку ошибок с информативными сообщениями
+ * - Мягкую обработку 401 ошибок с сохранением redirect URL
+ * - Защиту от дублирования 401 ошибок
+ */
+export default function setupInterceptors(axios: AxiosInstance): void {
   axios.interceptors.request.use(
-    request => {
+    (request: InternalAxiosRequestConfig) => {
       const dataStore = useDataStore();
+
+      // Добавляем токен авторизации
       if (dataStore.accessToken) {
+        request.headers = request.headers || {};
         request.headers.Authorization = `Bearer ${dataStore.accessToken}`;
       }
-      if (request.url && request.baseURL) {
-        const host = window.location.hostname;
-        if (host.startsWith('bpmsrv02') || host.startsWith('vega')) {
-          if (request.baseURL === getStrValuePerEnv('baseApi')) {
-            request.baseURL = getStrValuePerEnv('baseApiLocal');
-          }
-          if (request.baseURL === getStrValuePerEnv('efoBaseApi')) {
-            request.baseURL = getStrValuePerEnv('efoBaseApiLocal');
-          }
-          if (request.baseURL === getStrValuePerEnv('amlBaseApi')) {
-            request.baseURL = getStrValuePerEnv('amlBaseApiLocal');
-          }
-          if (request.baseURL === getStrValuePerEnv('gatewayApiUrl')) {
-            request.baseURL = getStrValuePerEnv('gatewayApiUrlLocal');
-          }
-        }
-        if (import.meta.env.VITE_ON_NEW_API === 'true') {
-          if (request.url.includes('api/Application')) {
-            if (request.baseURL === 'http://vega:84') {
-              request.baseURL = 'http://efo-dev.halyklife.nb/api';
-            }
-            if (request.baseURL === 'http://bpmsrv02.halyklife.nb') {
-              request.baseURL = 'http://efo-prod.halyklife.nb/api';
-            }
-            request.url = request.url.replace('/api/Application', '');
-            if (request.baseURL.includes('api/v1/insis')) {
-              request.baseURL = request.baseURL.replace('api/v1/insis', 'efo/api');
-            }
-            if (request.baseURL.includes('api/v1/test/insis')) {
-              request.baseURL = request.baseURL.replace('api/v1/test/insis', 'test/efo/api');
-            }
-          }
-        }
-      }
+
+      // Обновляем baseURL для разных окружений
+      updateBaseUrlForEnvironment(request);
+
+      // Обрабатываем логику нового API
+      handleNewApiLogic(request);
+
       return request;
     },
     (error: AxiosError) => {
@@ -48,32 +109,77 @@ export default function (axios: AxiosInstance) {
     },
   );
   axios.interceptors.response.use(
-    response => {
-      return response;
-    },
-    (error: AxiosError) => {
+    response => response,
+    (err: unknown) => {
       const dataStore = useDataStore();
-      if (!dataStore.isCalculator) {
-        const router = useRouter();
-        if (error && error.response && error.response.status) {
-          if (error.response.status === 401) {
-            dataStore.$reset();
-            localStorage.clear();
-            if (dataStore.isBridge) {
-              router.push({ name: 'Auth', query: { error: 401 } });
-            } else {
-              dataStore.sendToParent(constants.postActions.Error401, 401);
-            }
-          }
-          if (error.response.status === 403 && error.response.config.url) {
-            dataStore.showToaster('error', `Нет доступа на запрос: ${error.response.config.url.substring(error.response.config.url.lastIndexOf('/') + 1)}`, 5000);
-          }
-          if (error.response.status === 413) {
-            dataStore.showToaster('error', dataStore.t('error.exceedUploadLimitFile'), 5000);
-          }
+
+      // если калькулятор, выходим (твоя логика)
+      if (dataStore.isCalculator) {
+        return Promise.reject(err);
+      }
+
+      // 1) Не-Axios ошибка (например, thrown Error)
+      if (!isAxiosError(err)) {
+        dataStore.showToaster('error', dataStore.t('toaster.unknownError'), 5000);
+        return Promise.reject(err);
+      }
+
+      const { response, request, code, message, config } = err;
+
+      // 2) Нет ответа вообще (timeout, сеть, CORS)
+      if (!response) {
+        const isTimeout = code === 'ECONNABORTED' || /timeout/i.test(String(message));
+        dataStore.showToaster('error', isTimeout ? dataStore.t('toaster.timeout') : dataStore.t('toaster.networkError'), 5000);
+        return Promise.reject(err);
+      }
+
+      const status = response.status;
+      const data = response.data;
+
+      // 3) 401 — простая обработка, показываем ошибку
+      if (status === 401) {
+        dataStore.showToaster('error', dataStore.t('error.401'), 5000);
+        return Promise.reject(err);
+      }
+
+      // 4) 403 — вытаскиваем только path без query/hash
+      if (status === 403) {
+        try {
+          const rawUrl = response.config?.url ?? '';
+          const urlObj = new URL(rawUrl, window.location.origin);
+          const pathSegment = urlObj.pathname.split('/').filter(Boolean).pop() ?? 'resource';
+          dataStore.showToaster('error', dataStore.t('error.403', { text: pathSegment }), 5000);
+        } catch (urlError) {
+          console.warn('Error parsing URL for 403 response:', urlError);
+          dataStore.showToaster('error', dataStore.t('error.403'), 5000);
         }
+        return Promise.reject(err);
       }
-      return Promise.reject(error);
+
+      // 5) 404
+      if (status === 404) {
+        dataStore.showToaster('error', dataStore.t('error.404'), 5000);
+        return Promise.reject(err);
+      }
+
+      // 6) 413
+      if (status === 413) {
+        dataStore.showToaster('error', dataStore.t('error.exceedUploadLimitFile'), 5000);
+        return Promise.reject(err);
+      }
+
+      // 7) 500 — явная обработка
+      if (status === 500) {
+        const errorMessage = extractErrorMessage(data, status, dataStore);
+        dataStore.showToaster('error', String(errorMessage), 5000);
+        return Promise.reject(err);
+      }
+
+      // 8) Прочие коды — показываем полезное сообщение
+      const errorMessage = extractErrorMessage(data, status, dataStore);
+      dataStore.showToaster('error', String(errorMessage), 5000);
+
+      return Promise.reject(err);
     },
   );
 }

package/components/Form/ManagerAttachment.vue

@@ -156,29 +156,54 @@ export default defineComponent({
     const isSaleChanellReadonly = computed(() => {
       if (!isReadonly.value) {
         if (dataStore.isTravelAgent()) return true;
-        if (dataStore.isGons) return !dataStore.isServiceManager();
+        if (dataStore.isGons) {
+          return !dataStore.isServiceManager() &&
+            !dataStore.isChiefManagerNSZH() &&
+            !dataStore.isChiefSalesManager() &&
+            !dataStore.isSalesManager() &&
+            !dataStore.isManager();
+        }
       }
       return isReadonly.value;
     });
     const isRegionReadonly = computed(() => {
       if (!isReadonly.value) {
         if (dataStore.isTravelAgent()) return true;
-        if (dataStore.isGons) return !dataStore.isServiceManager() && !dataStore.isAgent();
+        if (dataStore.isGons) {
+          return !dataStore.isServiceManager() &&
+            !dataStore.isAgent() &&
+            !dataStore.isChiefManagerNSZH() &&
+            !dataStore.isChiefSalesManager() &&
+            !dataStore.isSalesManager() &&
+            !dataStore.isManager();
+        }
       }
       return isReadonly.value;
     });
     const isManagerReadonly = computed(() => {
       if (!isReadonly.value) {
         if (dataStore.isTravelAgent()) return true;
-        if (dataStore.isGons) return !dataStore.isServiceManager();
+        if (dataStore.isGons) {
+          return !dataStore.isServiceManager() &&
+            !dataStore.isChiefManagerNSZH() &&
+            !dataStore.isChiefSalesManager() &&
+            !dataStore.isSalesManager() &&
+            !dataStore.isManager();
+        }
       }
       return isReadonly.value;
     });
     const isAgentReadonly = computed(() => {
       if (!isReadonly.value) {
         if (dataStore.isTravelAgent()) return true;
-        if (dataStore.isGons) return !dataStore.isServiceManager();
         if (dataStore.isPension) return true;
+        if (dataStore.isGons) {
+          return !dataStore.isServiceManager() &&
+            !dataStore.isChiefManagerNSZH() &&
+            !dataStore.isChiefSalesManager() &&
+            !dataStore.isSalesManager() &&
+            !dataStore.isManager();
+        }
       }
       return isReadonly.value;
     });

package/components/Input/TextHint.vue

@@ -0,0 +1,13 @@
+<template>
+  <p class="p-1 px-2 text-[10px]" :class="[$styles.greyText]">{{ text }}</p>
+</template>
+<script>
+export default {
+  props: {
+    text: {
+      type: String,
+      required: true,
+    },
+  },
+};
+</script>

package/components/Pages/Auth.vue

@@ -126,6 +126,7 @@
 
 <script lang="ts">
 import type { InputTypes } from '../../types';
+import { handleSuccessfulLogin } from '../../utils/auth-helpers';
 
 export default defineComponent({
   setup() {
@@ -182,11 +183,7 @@ export default defineComponent({
             await dataStore.loginUser(login.value, password.value, numAttempts.value);
             numAttempts.value++;
             authLoading.value = false;
-            if (!!dataStore.user.id) {
-              await router.push({ name: 'index' });
-            }
-          } else {
-            // TODO Reset password
+            await handleSuccessfulLogin(router);
           }
         }
       });

package/components/Pages/ContragentForm.vue

@@ -373,6 +373,10 @@ export default defineComponent({
     };
 
     const validateESBD = async (docTypeNumber: number) => {
+      if (!dataStore.checkWithESBD) {
+        return true;
+      }
+
       const data: ESBDValidationType = {
         personType: 1,
         iin: props.member.iin!.replaceAll('-', ''),
@@ -390,7 +394,20 @@ export default defineComponent({
         resident: props.member.signOfResidency.ids === '500011.2' || props.member.signOfResidency.ids === null ? 0 : 1,
         countryId: Number((props.member.countryOfTaxResidency.ids! as string).at(-1)),
       };
-      return await dataStore.getValidateClientESBD(data);
+      const ESBDResponse = await dataStore.getValidateClientESBD(data);
+      if (!ESBDResponse) {
+        dataStore.isLoading = false;
+        return false;
+      }
+      const initialPoint = `${props.member.iin!.replaceAll('-', '')}.`;
+      const RESPONSE = ESBDMessage(ESBDResponse, initialPoint);
+      let errorMessage = RESPONSE !== false ? RESPONSE : 'Что-то произошло не так';
+      if (typeof ESBDResponse !== 'object' || ESBDResponse.errorCode !== 0) {
+        dataStore.isLoading = false;
+        dataStore.showToaster('error', errorMessage, 5000);
+        return false;
+      }
+      return true;
     };
 
     const saveMember = async () => {
@@ -411,22 +428,11 @@ export default defineComponent({
           const docType = props.member.documentType.ids;
           if (props.member.gotFromInsis === true && (docType === '1UDL' || docType === 'SBI')) {
             dataStore.isLoading = true;
-            const ESBDResponse = await validateESBD(docType === '1UDL' ? 1 : 3);
-            if (!ESBDResponse) {
-              dataStore.isLoading = false;
-              return;
-            }
-            const initialPoint = `${props.member.iin!.replaceAll('-', '')}.`;
-            const RESPONSE = ESBDMessage(ESBDResponse, initialPoint);
-            let errorMessage = RESPONSE !== false ? RESPONSE : 'Что-то произошло не так';
-            if (typeof ESBDResponse === 'object' && ESBDResponse.errorCode === 0) {
-              props.member.verifyType = 'ESBD';
-              props.member.verifyDate = ESBDResponse.verifiedDate;
-              const hasMemberSaved = await saveMember();
-            } else {
-              dataStore.isLoading = false;
-              dataStore.showToaster('error', errorMessage, 5000);
-            }
+
+            const isESBDValid = await validateESBD(docType === '1UDL' ? 1 : 3);
+            if (isESBDValid === false) return;
+
+            const hasMemberSaved = await saveMember();
           } else {
             const hasMemberSaved = await saveMember();
           }