shared-ritm 1.2.95 → 1.2.96

package/src/api/settings/ApiService.ts

@@ -1,123 +1,123 @@
-import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios'
-
-export enum ApiServiceType {
-  SERVICE_AUTH = 'SERVICE_AUTH',
-}
-
-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 async patch<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig): Promise<T2> {
-    try {
-      const response: AxiosResponse<T2> = await this.axiosInstance.patch<T1, AxiosResponse<T2>>(url, payload, options)
-      return response.data
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-
-  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 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 async patch<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig): Promise<T2> {
+    try {
+      const response: AxiosResponse<T2> = await this.axiosInstance.patch<T1, AxiosResponse<T2>>(url, payload, options)
+      return response.data
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+
+  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_Instruments.ts

@@ -1,98 +1,98 @@
-import { Api_User } from '../types/Api_User'
-
-export type Api_Instrument_Storage = {
-  id: string
-  created_at: string
-  deleted_at: string | null
-  updated_at: string
-  description: string
-  name: string
-  title: string
-  parent: unknown | null
-  parents: unknown[]
-  state_id: unknown | null
-}
-
-export type Api_Instrument_Type = {
-  id: string
-  name: string
-  created_at: string
-  updated_at: string
-  deleted_at: string | null
-  icon: string
-  storage_id: string
-  storage: Api_Instrument_Storage
-}
-
-export type Api_Instrument_Location = {
-  id: string
-  name: string
-  title: string
-  description: string
-  created_at: string
-  updated_at: string
-  deleted_at: string | null
-  state_id: unknown | null
-}
-
-export type Api_Instrument_Status = {
-  id: string
-  description: string
-  name: string
-  title: string
-  created_at: string
-  updated_at: string
-  deleted_at: string | null
-}
-
-export type Api_Instrument = {
-  id: string
-  RFID: string | null
-  instrument_id: string
-  arrival_at: string
-  created_at: string
-  supply_at: string
-  updated_at: string
-  deleted_at: string | null
-  inventory_number: string
-  instrument_type: Api_Instrument_Type
-  invoice_ref_key: string
-  last_status_updated_at: string
-  location_id: string
-  location: Api_Instrument_Location
-  misplacement: boolean
-  module: string | null
-  module_id: string | null
-  name: string
-  pressure: unknown | null
-  registry_module_id: string
-  responsible_id: string
-  responsible: Api_User
-  status: Api_Instrument_Status
-  status_id: string
-  storage: Api_Instrument_Storage
-  supervisor: unknown | null
-  supervisor_id: string
-  type: unknown | null
-  weight: unknown | null
-}
-
-export type Api_instruments_HistoryResponse = {
-  data: Api_Instrument[]
-  from: number
-  to: number
-  total: number
-  per_page: number
-  current_page: number
-  total_pages: number
-  last_page_url: string
-  first_page_url: string
-  next_page_url: string | null
-  prev_page_url: string | null
-  path: string
-  links: {
-    label: string
-    url: string
-    active: boolean
-  }[]
-}
+import { Api_User } from '../types/Api_User'
+
+export type Api_Instrument_Storage = {
+  id: string
+  created_at: string
+  deleted_at: string | null
+  updated_at: string
+  description: string
+  name: string
+  title: string
+  parent: unknown | null
+  parents: unknown[]
+  state_id: unknown | null
+}
+
+export type Api_Instrument_Type = {
+  id: string
+  name: string
+  created_at: string
+  updated_at: string
+  deleted_at: string | null
+  icon: string
+  storage_id: string
+  storage: Api_Instrument_Storage
+}
+
+export type Api_Instrument_Location = {
+  id: string
+  name: string
+  title: string
+  description: string
+  created_at: string
+  updated_at: string
+  deleted_at: string | null
+  state_id: unknown | null
+}
+
+export type Api_Instrument_Status = {
+  id: string
+  description: string
+  name: string
+  title: string
+  created_at: string
+  updated_at: string
+  deleted_at: string | null
+}
+
+export type Api_Instrument = {
+  id: string
+  RFID: string | null
+  instrument_id: string
+  arrival_at: string
+  created_at: string
+  supply_at: string
+  updated_at: string
+  deleted_at: string | null
+  inventory_number: string
+  instrument_type: Api_Instrument_Type
+  invoice_ref_key: string
+  last_status_updated_at: string
+  location_id: string
+  location: Api_Instrument_Location
+  misplacement: boolean
+  module: string | null
+  module_id: string | null
+  name: string
+  pressure: unknown | null
+  registry_module_id: string
+  responsible_id: string
+  responsible: Api_User
+  status: Api_Instrument_Status
+  status_id: string
+  storage: Api_Instrument_Storage
+  supervisor: unknown | null
+  supervisor_id: string
+  type: unknown | null
+  weight: unknown | null
+}
+
+export type Api_instruments_HistoryResponse = {
+  data: Api_Instrument[]
+  from: number
+  to: number
+  total: number
+  per_page: number
+  current_page: number
+  total_pages: number
+  last_page_url: string
+  first_page_url: string
+  next_page_url: string | null
+  prev_page_url: string | null
+  path: string
+  links: {
+    label: string
+    url: string
+    active: boolean
+  }[]
+}

package/src/api/types/Api_Tasks.ts

@@ -190,7 +190,7 @@ export type Api_Tasks_Task_Dto = {
   position_assigned: Api_Tasks_Position_Assigned_Dto[]
   comments: Api_Comment_Dto[]
   teams: Api_Tasks_Teams_Dto[]
-  equipment: Api_Tasks_Equipment_Dto[]
+  equipment: Api_Tasks_Equipment_Dto
   instrument_types: Api_Task_Instrument_From_Warehouse[]
   quality_metrics: Api_Task_QualityMetric_Dto[]
   video_source: Api_Task_VideoSource_Dto

package/src/api/types/Api_User.ts

@@ -1,117 +1,117 @@
-import { Api_Tasks_Status_Dto } from '@/api/types/Api_Tasks'
-
-export type Api_User_Team = {
-  id: string
-  name: string
-  display_name: string
-  description: string
-  created_at: string
-  updated_at: string
-  pivot?: {
-    team_id: string
-    user_id: string
-  }
-}
-
-export type Api_User_Team_Search = {
-  id: string
-  name: string
-  display_name: string
-}
-
-export type Api_User_Photo = {
-  id: string
-  name: string
-  path: string
-  type: string
-}
-
-export type Api_User_Archive_History_Item = {
-  user_id: string
-  responsible_id: string
-  archived_at: string
-  reason: string | null
-  restored_at: string | null
-}
-
-export type Api_User_Task = {
-  id: string
-  name: string
-  project_id: string
-  status: Api_Tasks_Status_Dto
-}
-
-export type Api_User = {
-  id: string
-  RFID: string
-  avatar: unknown | null
-  avatar_id: string | null
-  change_password: string
-  created_at: string
-  updated_at: string
-  deleted_at: string | null
-  dismissal_at: string | null
-  email_verified_at: string
-  divisions: string
-  email: string
-  face_recognition_id: string | null
-  first_name: string
-  full_name: string
-  last_name: string
-  patronymic: string
-  personnel_number: number
-  phone: string
-  profession: string
-  teams: Api_User_Team[]
-  photos: Api_User_Photo[]
-  archiveHistory: Api_User_Archive_History_Item[]
-  assigned_tasks?: Api_User_Task[]
-  responsible_tasks?: Api_User_Task[]
-}
-
-export type Api_User_Create = {
-  last_name?: string
-  first_name?: string
-  patronymic?: string
-  email?: string
-  phone?: string
-  divisions?: string
-  positions?: [string]
-  teams?: {
-    team_id: string
-    roles: string[]
-  }[]
-  current_password?: string
-  password?: string
-  password_confirmation?: string
-}
-
-export type Api_User_Permission = {
-  id: string
-  name: string
-  display_name: string
-}
-
-export type Api_User_Role = {
-  id: string
-  name: string
-  display_name: string
-  permissions?: Api_User_Permission[]
-}
-
-export type Api_User_Position = {
-  id: string
-  name: string
-  display_name: string
-  description?: string
-}
-
-export type Api_User_Delete_Body = {
-  user_id: string
-  archive_reason?: string
-}
-
-export type Api_User_Delete_Photos_Body = {
-  user_id: string
-  photos?: string[]
-}
+import { Api_Tasks_Status_Dto } from '@/api/types/Api_Tasks'
+
+export type Api_User_Team = {
+  id: string
+  name: string
+  display_name: string
+  description: string
+  created_at: string
+  updated_at: string
+  pivot?: {
+    team_id: string
+    user_id: string
+  }
+}
+
+export type Api_User_Team_Search = {
+  id: string
+  name: string
+  display_name: string
+}
+
+export type Api_User_Photo = {
+  id: string
+  name: string
+  path: string
+  type: string
+}
+
+export type Api_User_Archive_History_Item = {
+  user_id: string
+  responsible_id: string
+  archived_at: string
+  reason: string | null
+  restored_at: string | null
+}
+
+export type Api_User_Task = {
+  id: string
+  name: string
+  project_id: string
+  status: Api_Tasks_Status_Dto
+}
+
+export type Api_User = {
+  id: string
+  RFID: string
+  avatar: unknown | null
+  avatar_id: string | null
+  change_password: string
+  created_at: string
+  updated_at: string
+  deleted_at: string | null
+  dismissal_at: string | null
+  email_verified_at: string
+  divisions: string
+  email: string
+  face_recognition_id: string | null
+  first_name: string
+  full_name: string
+  last_name: string
+  patronymic: string
+  personnel_number: number
+  phone: string
+  profession: string
+  teams: Api_User_Team[]
+  photos: Api_User_Photo[]
+  archiveHistory: Api_User_Archive_History_Item[]
+  assigned_tasks?: Api_User_Task[]
+  responsible_tasks?: Api_User_Task[]
+}
+
+export type Api_User_Create = {
+  last_name?: string
+  first_name?: string
+  patronymic?: string
+  email?: string
+  phone?: string
+  divisions?: string
+  positions?: [string]
+  teams?: {
+    team_id: string
+    roles: string[]
+  }[]
+  current_password?: string
+  password?: string
+  password_confirmation?: string
+}
+
+export type Api_User_Permission = {
+  id: string
+  name: string
+  display_name: string
+}
+
+export type Api_User_Role = {
+  id: string
+  name: string
+  display_name: string
+  permissions?: Api_User_Permission[]
+}
+
+export type Api_User_Position = {
+  id: string
+  name: string
+  display_name: string
+  description?: string
+}
+
+export type Api_User_Delete_Body = {
+  user_id: string
+  archive_reason?: string
+}
+
+export type Api_User_Delete_Photos_Body = {
+  user_id: string
+  photos?: string[]
+}