hl-core 0.0.10-beta.82 → 0.0.10-beta.83

package/api/interceptors.ts

@@ -1,4 +1,23 @@
 import { AxiosError, type AxiosInstance, type InternalAxiosRequestConfig, isAxiosError } from 'axios';
+
+const INTERCEPTOR_HANDLED_STATUSES = new Set([401, 403, 404, 413, 500]);
+
+function markErrorAsHandled(err: unknown, status?: number): void {
+  if (typeof status === 'number' && !INTERCEPTOR_HANDLED_STATUSES.has(status)) return;
+
+  const axiosError = err as { config?: Record<string, unknown>; handledByInterceptor?: boolean; handledStatus?: number };
+  axiosError.handledByInterceptor = true;
+  if (typeof status === 'number') {
+    axiosError.handledStatus = status;
+  }
+
+  if (axiosError.config) {
+    axiosError.config.handledByInterceptor = true;
+    if (typeof status === 'number') {
+      axiosError.config.handledStatus = status;
+    }
+  }
+}
 /**
  * Обновляет baseURL в зависимости от текущего хоста
  */
@@ -118,6 +137,7 @@ export default function setupInterceptors(axios: AxiosInstance): void {
 
       // 1) Не-Axios ошибка (например, thrown Error)
       if (!isAxiosError(err)) {
+        markErrorAsHandled(err);
         showToaster('error', appContextStore.t('toaster.unknownError'), 5000);
         return Promise.reject(err);
       }
@@ -126,6 +146,7 @@ export default function setupInterceptors(axios: AxiosInstance): void {
 
       // 2) Нет ответа вообще (timeout, сеть, CORS)
       if (!response) {
+        markErrorAsHandled(err);
         const isTimeout = code === 'ECONNABORTED' || /timeout/i.test(String(message));
         showToaster('error', isTimeout ? appContextStore.t('toaster.timeout') : appContextStore.t('toaster.networkError'), 5000);
         return Promise.reject(err);
@@ -137,12 +158,14 @@ export default function setupInterceptors(axios: AxiosInstance): void {
 
       // 3) 401 — простая обработка, показываем ошибку
       if (status === 401) {
+        markErrorAsHandled(err, status);
         showToaster('error', appContextStore.t('error.401'), 5000);
         return Promise.reject(err);
       }
 
       // 4) 403 — вытаскиваем только path без query/hash
       if (status === 403) {
+        markErrorAsHandled(err, status);
         try {
           const rawUrl = response.config?.url ?? '';
           const urlObj = new URL(rawUrl, window.location.origin);
@@ -157,18 +180,21 @@ export default function setupInterceptors(axios: AxiosInstance): void {
 
       // 5) 404
       if (status === 404 && !isSilent) {
+        markErrorAsHandled(err, status);
         showToaster('error', appContextStore.t('error.404'), 5000);
         return Promise.reject(err);
       }
 
       // 6) 413
       if (status === 413) {
+        markErrorAsHandled(err, status);
         showToaster('error', appContextStore.t('error.exceedUploadLimitFile'), 5000);
         return Promise.reject(err);
       }
 
       // 7) 500 — явная обработка
       if (status === 500) {
+        markErrorAsHandled(err, status);
         const errorMessage = extractErrorMessage(data, status, appContextStore);
         showToaster('error', String(errorMessage), 5000);
         return Promise.reject(err);

package/composables/index.ts

@@ -321,7 +321,27 @@ export const ESBDMessage = (ESBDObject: any, initialPoint: any) => {
 export const ErrorHandler = (err: unknown, errorText?: string) => {
   console.error('[ErrorHandler]', err);
 
+  const isHandledByInterceptor = (error: unknown, status?: number) => {
+    if (!error || typeof error !== 'object') return false;
+
+    const localError = error as AxiosError & {
+      handledByInterceptor?: boolean;
+      handledStatus?: number;
+      config?: Record<string, unknown>;
+    };
+
+    const handledOnError = localError.handledByInterceptor === true;
+    const handledOnConfig = localError.config?.handledByInterceptor === true;
+    const markedStatus = Number(localError.handledStatus ?? localError.config?.handledStatus ?? NaN);
+
+    return (handledOnError || handledOnConfig) && (status === undefined || markedStatus === status);
+  };
+
   try {
+    if (isHandledByInterceptor(err)) {
+      return false;
+    }
+
     if (typeof err === 'string') {
       showToaster('error', err, 6000);
       return false;
@@ -342,6 +362,10 @@ export const ErrorHandler = (err: unknown, errorText?: string) => {
         return false;
       }
 
+      if (isHandledByInterceptor(err, response.status)) {
+        return false;
+      }
+
       const responseData = response.data as unknown;
 
       if (responseData instanceof ArrayBuffer) {
@@ -1049,7 +1073,7 @@ export class RoleController {
   isFinCenter = () => this.isRole(constants.roles.FinCenter);
   isSupervisor = () => this.isRole(constants.roles.Supervisor);
   isHeadManager = () => this.isRole(constants.roles.HeadManager);
-  isHeadOfDepartment = () => this.isRole(constants.roles.HeadOfDepartment);
+  isHeadOfDepartmentSettlementLosses = () => this.isRole(constants.roles.HeadOfDepartmentSettlementLosses);
   isBranchDirector = () => this.isRole(constants.roles.BranchDirector);
   isRegionDirector = () => this.isRole(constants.roles.RegionDirector);
   isUSNSACCINS = () => this.isRole(constants.roles.USNSACCINS);
@@ -1103,7 +1127,7 @@ export class RoleController {
         this.isSanctioner3() ||
         this.isRegisterSanctioner() ||
         this.isDeputyDirector() ||
-        this.isHeadOfDepartment() ||
+        this.isHeadOfDepartmentSettlementLosses() ||
         baseAccessRoles,
       toReinsurance: this.isReInsurer() || this.isAdjuster() || this.isHeadAdjuster() || baseAccessRoles,
       toReporting:
@@ -1137,6 +1161,7 @@ export class RoleController {
         this.isAgentMycar() ||
         this.isManagerHalykBank() ||
         this.isHeadManager() ||
+        this.isHeadOfDepartmentSettlementLosses() ||
         this.isServiceManager() ||
         this.isUSNSsanctioner() ||
         this.isUnderwriter() ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.10-beta.82",
+  "version": "0.0.10-beta.83",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",

package/types/enum.ts

@@ -139,7 +139,7 @@ export enum Roles {
   Sanctioner3 = 'Sanctioner3',
   RegisterSanctioner = 'RegisterSanctioner',
   DeputyDirectorSettlementLosses = 'DeputyDirectorSettlementLosses',
-  HeadOfDepartment = 'HeadOfDepartment',
+  HeadOfDepartmentSettlementLosses = 'HeadOfDepartmentSettlementLosses',
 }
 
 export enum Statuses {