shared-ritm 1.2.104 → 1.2.105

package/src/api/services/VideoService.ts

@@ -1,62 +1,62 @@
-import ApiService from '../settings/ApiService'
-import { ResponseApi } from '@/api/types/Api_Service'
-import {
-  Api_Video_Source_Create,
-  Api_Video_Source_Search,
-  Api_Work_Zone,
-  Api_Work_Zone_Search,
-} from '@/api/types/Api_Video'
-
-class VideoService extends ApiService {
-  public async startVideoAnalytics(): Promise<boolean> {
-    return await this.post('/statanly/start', null)
-  }
-
-  public reloadVideoAnalytics(ids: string[]): Promise<any> {
-    return this.post('/horizon/video-source/reload', { video_source_ids: ids })
-  }
-
-  public async fetchWorkZones(params?: any): Promise<ResponseApi<Api_Work_Zone_Search[]>> {
-    return await this.get('/search/work_zones', { params })
-  }
-
-  public async fetchWorkZone(id: string): Promise<ResponseApi<Api_Work_Zone>> {
-    return await this.get(`/work_zone/get_work_zone/${id}`)
-  }
-
-  public async editWorkZone(id: string, body: { title: string }): Promise<{ data: Api_Work_Zone; status: number }> {
-    return await this.put(`/admin/work-zones/${id}`, body)
-  }
-
-  public async deleteWorkZone(id: string): Promise<{ data: boolean; status: number }> {
-    return await this.delete(`/admin/work-zones/${id}`)
-  }
-
-  public async fetchVideoSources(params?: any): Promise<ResponseApi<Api_Video_Source_Search[]>> {
-    return await this.get('/search/video_sources', { params })
-  }
-
-  public async createVideoSource(
-    body: Api_Video_Source_Create,
-  ): Promise<{ data: Api_Video_Source_Search; status: number }> {
-    return await this.post('horizon/video-source', body)
-  }
-
-  public async editVideoSource(
-    id: string,
-    body: Partial<Api_Video_Source_Create>,
-  ): Promise<{ data: Api_Video_Source_Search; status: number }> {
-    return await this.put(`/horizon/video-source/${id}`, body)
-  }
-
-  public async deleteVideoSource(id: string): Promise<void> {
-    await this.delete(`/horizon/video-source/${id}`)
-  }
-}
-
-let api: VideoService
-
-export default function useVideoService() {
-  if (!api) api = new VideoService()
-  return api
-}
+import ApiService from '../settings/ApiService'
+import { ResponseApi } from '@/api/types/Api_Service'
+import {
+  Api_Video_Source_Create,
+  Api_Video_Source_Search,
+  Api_Work_Zone,
+  Api_Work_Zone_Search,
+} from '@/api/types/Api_Video'
+
+class VideoService extends ApiService {
+  public async startVideoAnalytics(): Promise<boolean> {
+    return await this.post('/statanly/start', null)
+  }
+
+  public reloadVideoAnalytics(ids: string[]): Promise<any> {
+    return this.post('/horizon/video-source/reload', { video_source_ids: ids })
+  }
+
+  public async fetchWorkZones(params?: any): Promise<ResponseApi<Api_Work_Zone_Search[]>> {
+    return await this.get('/search/work_zones', { params })
+  }
+
+  public async fetchWorkZone(id: string): Promise<ResponseApi<Api_Work_Zone>> {
+    return await this.get(`/work_zone/get_work_zone/${id}`)
+  }
+
+  public async editWorkZone(id: string, body: { title: string }): Promise<{ data: Api_Work_Zone; status: number }> {
+    return await this.put(`/admin/work-zones/${id}`, body)
+  }
+
+  public async deleteWorkZone(id: string): Promise<{ data: boolean; status: number }> {
+    return await this.delete(`/admin/work-zones/${id}`)
+  }
+
+  public async fetchVideoSources(params?: any): Promise<ResponseApi<Api_Video_Source_Search[]>> {
+    return await this.get('/search/video_sources', { params })
+  }
+
+  public async createVideoSource(
+    body: Api_Video_Source_Create,
+  ): Promise<{ data: Api_Video_Source_Search; status: number }> {
+    return await this.post('horizon/video-source', body)
+  }
+
+  public async editVideoSource(
+    id: string,
+    body: Partial<Api_Video_Source_Create>,
+  ): Promise<{ data: Api_Video_Source_Search; status: number }> {
+    return await this.put(`/horizon/video-source/${id}`, body)
+  }
+
+  public async deleteVideoSource(id: string): Promise<void> {
+    await this.delete(`/horizon/video-source/${id}`)
+  }
+}
+
+let api: VideoService
+
+export default function useVideoService() {
+  if (!api) api = new VideoService()
+  return api
+}

package/src/api/settings/ApiService.ts

@@ -1,123 +1,126 @@
-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
+
+      if (Array.isArray(response?.data)) return response 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_Brigades.ts

@@ -0,0 +1,36 @@
+import { Api_User, Api_User_Team_Search } from '@/api/types/Api_User'
+import { Api_Tasks_Position_Dto } from '@/api/types/Api_Tasks'
+
+export type Api_Brigade_Master = {
+  id: string
+  full_name: string
+  email: string
+}
+
+export type Api_Brigade_Position = {
+  id: string
+  user: Pick<Api_User, 'id' | 'first_name' | 'last_name' | 'patronymic' | 'email' | 'full_name'> | null
+  position: Api_Tasks_Position_Dto
+}
+
+export type Api_Brigade = {
+  id: string
+  name: string
+  task_master: Api_Brigade_Master
+  teams: Api_User_Team_Search[]
+  positions: Api_Brigade_Position[]
+}
+
+export type Api_Brigade_Create = Pick<Api_Brigade, 'name' | 'teams'> & {
+  positions?: Api_Brigade_Position[]
+  task_master_user_id: string
+}
+
+export type Api_Brigade_Search = {
+  id: string
+  name: string
+  created_at: string
+  updated_at: string
+  task_master: Api_Brigade_Master
+  teams: Api_User_Team_Search[]
+}

package/src/api/types/Api_Equipment.ts

@@ -1,3 +1,3 @@
-import { Api_Equipment_Full_Dto } from '@/api/types/Api_Repairs'
-
-export type Api_Equipment_Create = Omit<Api_Equipment_Full_Dto, 'id'>
+import { Api_Equipment_Full_Dto } from '@/api/types/Api_Repairs'
+
+export type Api_Equipment_Create = Omit<Api_Equipment_Full_Dto, 'id'>

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
+  }[]
+}