shared-ritm 1.2.56 → 1.2.57

package/src/api/settings/ApiService.ts

@@ -1,128 +1,128 @@
-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',
-        Accept: '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)
-      if (response?.data === false) return false as unknown as T
-      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)
-      if (response?.data === false) return false
-      return response?.data || (response as any)
-    } 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',
+        Accept: '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)
+      if (response?.data === false) return false as unknown as T
+      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)
+      if (response?.data === false) return false
+      return response?.data || (response as any)
+    } 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
+    }
+  }
+}

package/src/api/types/Api_Controls.ts

@@ -1,72 +1,72 @@
-export type Api_User_Dto = {
-  id: string
-  full_name: string
-}
-export type Api_ControlZones_Dto = {
-  id: string
-  name: string
-  inventory_number: string
-  uuid: string
-  controller_zone: string
-  users?: Api_User_Dto[]
-}
-export type ControlsParams = {
-  search?: string
-  page?: number
-  filter?: Record<string, string[]>
-}
-
-export interface ControlMeta {
-  total: number
-  perPage: number
-  totalPages: number
-  currentPage: number
-}
-
-export type FiltersValue = {
-  users?: {
-    users: Api_User_Dto[]
-  }
-  controller?: {
-    controller: Api_User_Dto[]
-  }
-  responsible?: {
-    responsible: Api_User_Dto[]
-  }
-  status?: {
-    status: boolean
-  }
-}
-export type Api_Instrument_Dto = {
-  id: string
-  name: string
-  storage_id?: string
-}
-export type Api_Warehouse_Dto = {
-  id: string
-  invoice_ref_key: string
-  inventory_number: string
-  instrument: Api_Instrument_Dto[]
-}
-
-export type Api_ControlLogs_Dto = {
-  id: string
-  automatically: string
-  in_zone: string
-  uuid: string
-  controller_zone: string
-  controller: Api_User_Dto[]
-  user: Api_User_Dto[]
-  frame: Api_ControlZones_Dto[]
-  warehouse: Api_Warehouse_Dto[]
-}
-export type Api_New_Items = {
-  title: string
-  inventory_numbers: string
-  storage_id: string
-}
-export type Api_ManualEntry_Dto = {
-  user: string
-  items?: string[]
-  new_items?: Api_New_Items[]
-}
+export type Api_User_Dto = {
+  id: string
+  full_name: string
+}
+export type Api_ControlZones_Dto = {
+  id: string
+  name: string
+  inventory_number: string
+  uuid: string
+  controller_zone: string
+  users?: Api_User_Dto[]
+}
+export type ControlsParams = {
+  search?: string
+  page?: number
+  filter?: Record<string, string[]>
+}
+
+export interface ControlMeta {
+  total: number
+  perPage: number
+  totalPages: number
+  currentPage: number
+}
+
+export type FiltersValue = {
+  users?: {
+    users: Api_User_Dto[]
+  }
+  controller?: {
+    controller: Api_User_Dto[]
+  }
+  responsible?: {
+    responsible: Api_User_Dto[]
+  }
+  status?: {
+    status: boolean
+  }
+}
+export type Api_Instrument_Dto = {
+  id: string
+  name: string
+  storage_id?: string
+}
+export type Api_Warehouse_Dto = {
+  id: string
+  invoice_ref_key: string
+  inventory_number: string
+  instrument: Api_Instrument_Dto[]
+}
+
+export type Api_ControlLogs_Dto = {
+  id: string
+  automatically: string
+  in_zone: string
+  uuid: string
+  controller_zone: string
+  controller: Api_User_Dto[]
+  user: Api_User_Dto[]
+  frame: Api_ControlZones_Dto[]
+  warehouse: Api_Warehouse_Dto[]
+}
+export type Api_New_Items = {
+  title: string
+  inventory_numbers: string
+  storage_id: string
+}
+export type Api_ManualEntry_Dto = {
+  user: string
+  items?: string[]
+  new_items?: Api_New_Items[]
+}