shared-ritm 1.1.27 → 1.1.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shared-ritm",
-  "version": "1.1.27",
+  "version": "1.1.29",
   "private": false,
   "files": [
     "dist",

package/src/api/services/FileService.ts

@@ -3,7 +3,7 @@ import { Api_Files_Responsible_Dto } from '@/api/types/Api_Files'
 
 class FileService extends ApiService {
   public async uploadFile(data: FormData): Promise<ResponseApi<Api_Files_Responsible_Dto>> {
-    return await this.post(`/upload-file`, data)
+    return await this.post<FormData, any>(`/upload-file`, data, { headers: { 'Content-Type': 'multipart/form-data' } })
   }
 }
 

package/src/api/services/RepairsService.ts

@@ -1,82 +1,94 @@
-import ApiService, { ResponseApi } from '@/api/settings/ApiService'
-import {
-  Api_Create_Repair_With_Equipments,
-  Api_Equipment_Full_Dto,
-  Api_Repair_Dto,
-  Api_Update_Repair,
-  OptionFilters,
-} from '@/api/types/Api_Repairs'
-
-class RepairsService extends ApiService {
-  public fetchFilters(fullParams: string): Promise<OptionFilters> {
-    return this.get(`get_list_repair?smart=1&${fullParams}`)
-  }
-  public fetchRepairs(
-    isQuery: boolean,
-    queries?: string,
-    hasTeams?: boolean | string,
-    teamsFilter?: string,
-    typeFilter?: string,
-  ): Promise<ResponseApi<Api_Repair_Dto[]>> {
-    return this.get(
-      'get_list_repair' +
-        (isQuery
-          ? `${queries}&per_page=100000${typeFilter ? '&' + typeFilter : ''}&${!hasTeams ? teamsFilter : ''}`
-          : `?per_page=100000${typeFilter ? '&' + typeFilter : ''}&${teamsFilter}`),
-    )
-  }
-  public fetchEquipment(): Promise<ResponseApi<Api_Equipment_Full_Dto[]>> {
-    return this.get('repairs/equipment/list?per_page=100000')
-  }
-  public createRepair(payload: Api_Create_Repair_With_Equipments) {
-    return this.post<Api_Create_Repair_With_Equipments, any>('/repairs/equipments', payload)
-  }
-  public startRepair(id: string): Promise<void> {
-    return this.post<null, void>(`/repairs/${id}/start`, null)
-  }
-  public finishRepair(id: string) {
-    return this.post<null, void>(`/repairs/${id}/finish`, null)
-  }
-  public finishPreparationProject(id: string) {
-    return this.post<null, void>(`/repairs/${id}/finish_preparation`, null)
-  }
-
-  public moveRepairToCurrent(id: string) {
-    return this.post<any, void>(`/repairs/transfer_repair_plan_to_current`, {
-      repairs: [id],
-    })
-  }
-  public moveArchiveToCurrent(id: string) {
-    return this.post<any, void>(`/repairs/transfer_repair_archive_to_current`, {
-      repairs_ids: [id],
-    })
-  }
-  public moveRepairToApr(id: string) {
-    return this.post<any, void>(`/repairs/transfer_repair_current_to_plan`, {
-      repairs: [id],
-    })
-  }
-  public moveRepairToArchive(id: string) {
-    return this.post<any, void>(`/repairs/transfer_repair_current_to_archive`, {
-      repairs_ids: [id],
-    })
-  }
-  public restoreRepair(id: string) {
-    return this.post<any, void>(`/restore_repair`, {
-      repairs_ids: [id],
-    })
-  }
-  public updateRepair(payload: Api_Update_Repair, id: string) {
-    return this.put<Api_Update_Repair, void>(`/repairs/${id}`, payload)
-  }
-  public deleteRepair(id: string) {
-    return this.delete<any>(`/repairs/${id}`)
-  }
-}
-
-let api: RepairsService
-
-export default function useRepairsService() {
-  if (!api) api = new RepairsService()
-  return api
-}
+import ApiService, { ResponseApi } from '@/api/settings/ApiService'
+import {
+  Api_Create_Repair_With_Equipments,
+  Api_Equipment_Full_Dto,
+  Api_Repair_Dto,
+  Api_Update_Repair,
+  OptionFilters,
+} from '@/api/types/Api_Repairs'
+
+class RepairsService extends ApiService {
+  public fetchFilters(fullParams: string): Promise<OptionFilters> {
+    return this.get(`get_list_repair?smart=1&${fullParams}`)
+  }
+
+  public fetchRepairs(
+    isQuery: boolean,
+    queries?: string,
+    hasTeams?: boolean | string,
+    teamsFilter?: string,
+    typeFilter?: string,
+  ): Promise<ResponseApi<Api_Repair_Dto[]>> {
+    return this.get(
+      'get_list_repair' +
+        (isQuery
+          ? `${queries}&per_page=100000${typeFilter ? '&' + typeFilter : ''}&${!hasTeams ? teamsFilter : ''}`
+          : `?per_page=100000${typeFilter ? '&' + typeFilter : ''}&${teamsFilter}`),
+    )
+  }
+
+  public fetchEquipment(): Promise<ResponseApi<Api_Equipment_Full_Dto[]>> {
+    return this.get('repairs/equipment/list?per_page=100000')
+  }
+
+  public createRepair(payload: Api_Create_Repair_With_Equipments) {
+    return this.post<Api_Create_Repair_With_Equipments, any>('/repairs/equipments', payload)
+  }
+
+  public startRepair(id: string): Promise<void> {
+    return this.post<null, void>(`/repairs/${id}/start`, null)
+  }
+
+  public finishRepair(id: string) {
+    return this.post<null, void>(`/repairs/${id}/finish`, null)
+  }
+
+  public finishPreparationProject(id: string) {
+    return this.post<null, void>(`/repairs/${id}/finish_preparation`, null)
+  }
+
+  public moveRepairToCurrent(id: string) {
+    return this.post<any, void>(`/repairs/transfer_repair_plan_to_current`, {
+      repairs: [id],
+    })
+  }
+
+  public moveArchiveToCurrent(id: string) {
+    return this.post<any, void>(`/repairs/transfer_repair_archive_to_current`, {
+      repairs_ids: [id],
+    })
+  }
+
+  public moveRepairToApr(id: string) {
+    return this.post<any, void>(`/repairs/transfer_repair_current_to_plan`, {
+      repairs: [id],
+    })
+  }
+
+  public moveRepairToArchive(id: string) {
+    return this.post<any, void>(`/repairs/transfer_repair_current_to_archive`, {
+      repairs_ids: [id],
+    })
+  }
+
+  public restoreRepair(id: string) {
+    return this.post<any, void>(`/restore_repair`, {
+      repairs_ids: [id],
+    })
+  }
+
+  public updateRepair(payload: Api_Update_Repair, id: string) {
+    return this.put<Api_Update_Repair, void>(`/repairs/${id}`, payload)
+  }
+
+  public deleteRepair(id: string) {
+    return this.delete<any>(`/repairs/${id}`)
+  }
+}
+
+let api: RepairsService
+
+export default function useRepairsService() {
+  if (!api) api = new RepairsService()
+  return api
+}

package/src/api/settings/ApiService.ts

@@ -1,124 +1,125 @@
-import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios'
-
-export enum ApiServiceType {
-  SERVICE_AUTH = 'SERVICE_AUTH',
-}
-
-export type ResponseApi<T> = {
-  count: number
-  current_page: number
-  data: T
-  per_page: number
-  total: number
-  total_pages: number
-}
-
-export default class ApiService {
-  private axiosInstance: AxiosInstance
-
-  constructor() {
-    this.axiosInstance = axios.create({
-      baseURL: process.env.VUE_APP_BACKEND,
-      headers: {
-        'Content-Type': 'application/json',
-      },
-    })
-
-    this.axiosInstance.interceptors.request.use(
-      (config: InternalAxiosRequestConfig) => {
-        const token = this.getToken()
-        if (token && config.headers) {
-          config.headers.Authorization = `Bearer ${token}`
-        }
-        return config
-      },
-      (error: AxiosError) => {
-        return Promise.reject(error)
-      },
-    )
-
-    this.axiosInstance.interceptors.response.use(
-      (response: AxiosResponse) => {
-        return response.data
-      },
-      (error: AxiosError) => {
-        if (error.response?.status === 401 || error.response?.status === 403) {
-          this.logout()
-        }
-        return Promise.reject(error)
-      },
-    )
-  }
-  private getToken() {
-    return localStorage.getItem('token')
-  }
-
-  private removeToken() {
-    localStorage.removeItem('token')
-  }
-
-  public logout(): void {
-    this.removeToken()
-    window.location.href = '/sign-in'
-  }
-
-  private handleError(error: AxiosError): void {
-    if (error.response) {
-      console.error('API Error:', error.response.status, error.response.data)
-    } else if (error.request) {
-      console.error('No response received:', error.request)
-    } else {
-      console.error('Error during request setup:', error.message)
-    }
-  }
-
-  protected async get<T>(url: string, options?: AxiosRequestConfig) {
-    try {
-      const response: AxiosResponse<T> = await this.axiosInstance.get<T>(url, options)
-      return response?.data ?? (response as unknown as T)
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-
-  protected async delete<T>(url: string, options?: AxiosRequestConfig) {
-    try {
-      return await this.axiosInstance.delete<T>(url, options)
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-
-  protected async post<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig) {
-    try {
-      const response: AxiosResponse<T2> = await this.axiosInstance.post<T1, AxiosResponse<T2>>(url, payload, options)
-      return response.data
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-
-  // protected patch<T1, T2>(url: string, payload: T1, type: ApiServiceType, options?: AxiosRequestConfig): Promise<T2> {
-  //   return axios
-  //     .patch<T1, AxiosResponse<T2>>(apiServiceUrls[type] + url, payload, options)
-  //     .catch((err: AxiosError) => processError401<T2>(err))
-  //     .then(extractData)
-  // }
-  //
-  protected async put<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig) {
-    try {
-      const response: AxiosResponse<T2> = await this.axiosInstance.put<T1, AxiosResponse<T2>>(url, payload, options)
-      return response.data
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-}
+import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios'
+
+export enum ApiServiceType {
+  SERVICE_AUTH = 'SERVICE_AUTH',
+}
+
+export type ResponseApi<T> = {
+  count: number
+  current_page: number
+  data: T
+  per_page: number
+  total: number
+  total_pages: number
+}
+
+export default class ApiService {
+  private axiosInstance: AxiosInstance
+
+  constructor() {
+    this.axiosInstance = axios.create({
+      baseURL: process.env.VUE_APP_BACKEND,
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    })
+
+    this.axiosInstance.interceptors.request.use(
+      (config: InternalAxiosRequestConfig) => {
+        const token = this.getToken()
+        if (token && config.headers) {
+          config.headers.Authorization = `Bearer ${token}`
+        }
+        return config
+      },
+      (error: AxiosError) => {
+        return Promise.reject(error)
+      },
+    )
+
+    this.axiosInstance.interceptors.response.use(
+      (response: AxiosResponse) => {
+        return response.data
+      },
+      (error: AxiosError) => {
+        if (error.response?.status === 401 || error.response?.status === 403) {
+          this.logout()
+        }
+        return Promise.reject(error)
+      },
+    )
+  }
+
+  private getToken() {
+    return localStorage.getItem('token')
+  }
+
+  private removeToken() {
+    localStorage.removeItem('token')
+  }
+
+  public logout(): void {
+    this.removeToken()
+    window.location.href = '/sign-in'
+  }
+
+  private handleError(error: AxiosError): void {
+    if (error.response) {
+      console.error('API Error:', error.response.status, error.response.data)
+    } else if (error.request) {
+      console.error('No response received:', error.request)
+    } else {
+      console.error('Error during request setup:', error.message)
+    }
+  }
+
+  protected async get<T>(url: string, options?: AxiosRequestConfig) {
+    try {
+      const response: AxiosResponse<T> = await this.axiosInstance.get<T>(url, options)
+      return response?.data ?? (response as unknown as T)
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+
+  protected async delete<T>(url: string, options?: AxiosRequestConfig) {
+    try {
+      return await this.axiosInstance.delete<T>(url, options)
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+
+  protected async post<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig) {
+    try {
+      const response: AxiosResponse<T2> = await this.axiosInstance.post<T1, AxiosResponse<T2>>(url, payload, options)
+      return response.data
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+
+  // protected patch<T1, T2>(url: string, payload: T1, type: ApiServiceType, options?: AxiosRequestConfig): Promise<T2> {
+  //   return axios
+  //     .patch<T1, AxiosResponse<T2>>(apiServiceUrls[type] + url, payload, options)
+  //     .catch((err: AxiosError) => processError401<T2>(err))
+  //     .then(extractData)
+  // }
+  //
+  protected async put<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig) {
+    try {
+      const response: AxiosResponse<T2> = await this.axiosInstance.put<T1, AxiosResponse<T2>>(url, payload, options)
+      return response.data
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+}