shared-ritm 1.3.67 → 1.3.69

package/src/api/services/RepairsService.ts

@@ -1,111 +1,111 @@
-import ApiService from '../settings/ApiService'
-import { ResponseApi } from '../types/Api_Service'
-import {
-  Api_Create_Repair_With_Equipments,
-  Api_Create_Repair_With_Template,
-  Api_Repair_Dto,
-  Api_Repair_Intersection,
-  Api_Repair_Template,
-  Api_Update_Repair,
-  OptionFilters,
-} from '../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 fetchRepairTemplates(params?: any): Promise<ResponseApi<Api_Repair_Template[]>> {
-    return this.get('repairs/get_repair_template_list', { params })
-  }
-
-  public createRepair(payload: Api_Create_Repair_With_Equipments) {
-    return this.post<Api_Create_Repair_With_Equipments, any>('/repairs/equipments', payload)
-  }
-
-  public createRepairFromTemplate(payload: Api_Create_Repair_With_Template) {
-    return this.post<Api_Create_Repair_With_Template, any>('/repairs/create_repair_from_repair_template', payload)
-  }
-
-  public startRepair(id: string): Promise<void> {
-    return this.post<null, void>(`/repairs/${id}/start`, null)
-  }
-
-  public finishRepair(id: string) {
-    return this.post<any, void>(`/repairs/complete_repair_list`, {
-      repairIdList: [id],
-    })
-  }
-
-  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 copyRepair(id: string) {
-    return this.post<null, any>(`/repairs/${id}/clone`, null)
-  }
-
-  public deleteRepair(id: string) {
-    return this.delete<any>(`/repairs/${id}`)
-  }
-
-  public fetchIntersection(id: string): Promise<Api_Repair_Intersection[]> {
-    return this.get(`v3/repairs/${id}/personnel/intersection`)
-  }
-}
-
-let api: RepairsService
-
-export default function useRepairsService() {
-  if (!api) api = new RepairsService()
-  return api
-}
+import ApiService from '../settings/ApiService'
+import { ResponseApi } from '../types/Api_Service'
+import {
+  Api_Create_Repair_With_Equipments,
+  Api_Create_Repair_With_Template,
+  Api_Repair_Dto,
+  Api_Repair_Intersection,
+  Api_Repair_Template,
+  Api_Update_Repair,
+  OptionFilters,
+} from '../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 fetchRepairTemplates(params?: any): Promise<ResponseApi<Api_Repair_Template[]>> {
+    return this.get('repairs/get_repair_template_list', { params })
+  }
+
+  public createRepair(payload: Api_Create_Repair_With_Equipments) {
+    return this.post<Api_Create_Repair_With_Equipments, any>('/repairs/equipments', payload)
+  }
+
+  public createRepairFromTemplate(payload: Api_Create_Repair_With_Template) {
+    return this.post<Api_Create_Repair_With_Template, any>('/repairs/create_repair_from_repair_template', payload)
+  }
+
+  public startRepair(id: string): Promise<void> {
+    return this.post<null, void>(`/repairs/${id}/start`, null)
+  }
+
+  public finishRepair(id: string) {
+    return this.post<any, void>(`/repairs/complete_repair_list`, {
+      repairIdList: [id],
+    })
+  }
+
+  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 copyRepair(id: string) {
+    return this.post<null, any>(`/repairs/${id}/clone`, null)
+  }
+
+  public deleteRepair(id: string) {
+    return this.delete<any>(`/repairs/${id}`)
+  }
+
+  public fetchIntersection(id: string): Promise<Api_Repair_Intersection[]> {
+    return this.get(`v3/repairs/${id}/personnel/intersection`)
+  }
+}
+
+let api: RepairsService
+
+export default function useRepairsService() {
+  if (!api) api = new RepairsService()
+  return api
+}

package/src/api/services/UserService.ts

@@ -9,9 +9,7 @@ import {
   Api_User_Team,
   Api_User_Team_Search,
   Api_User_Warehouse,
-  Api_User_Change_Password_Payload,
 } from '../types/Api_User'
-
 import { ResponseApi } from '../types/Api_Service'
 
 class UserService extends ApiService {
@@ -23,10 +21,6 @@ class UserService extends ApiService {
     return await this.get<Api_User>(`/admin/users/${id}`)
   }
 
-  public async changeUserPassword(payload: Api_User_Change_Password_Payload): Promise<Api_User> {
-    return await this.patch<Api_User_Change_Password_Payload, Api_User>(`/v2/auth/users/password`, payload)
-  }
-
   public async getUserWarehouses(params: {
     user_id: string
     page?: number

package/src/api/services/VideoService.ts

@@ -1,118 +1,118 @@
-import ApiService from '../settings/ApiService'
-import { ResponseApi } from '@/api/types/Api_Service'
-import {
-  Api_Video_Combination,
-  Api_Video_Source_By_Repair,
-  Api_Video_Source_Create,
-  Api_Video_Source_Economics,
-  Api_Video_Source_Search,
-  Api_Video_Training_Status,
-  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 hardReloadStream(): Promise<any> {
-    return this.post('horizon/video-source/streams/add', null)
-  }
-
-  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/list', { params })
-  }
-
-  public async fetchVideoSourceEconomics(params?: any): Promise<ResponseApi<Api_Video_Source_Economics>> {
-    return await this.get('horizon/video-source/economics', { params })
-  }
-
-  public async createVideoSource(body: Api_Video_Source_Create): Promise<Api_Video_Source_Search> {
-    return await this.post('horizon/video-source', body)
-  }
-
-  public async editVideoSource(id: string, body: Partial<Api_Video_Source_Create>): Promise<Api_Video_Source_Search> {
-    return await this.put(`/horizon/video-source/${id}`, body)
-  }
-
-  public async deleteVideoSource(id: string): Promise<void> {
-    await this.delete(`/horizon/video-source/${id}`)
-  }
-
-  public async fetchListRepairsVideoSource(params?: any): Promise<Api_Video_Source_By_Repair[]> {
-    return await this.get('work_zone/get_list_video_source_by_repair', { params })
-  }
-
-  public async sendCombination(body: { cameras_id: string[] }): Promise<any> {
-    return await this.post('horizon/video-source/training', body)
-  }
-
-  public async saveCombination(body: any): Promise<any> {
-    return await this.post('horizon/video-source/bind', body)
-  }
-
-  public async fetchCombination(params?: Record<string, string>): Promise<Api_Video_Combination> {
-    return await this.get('horizon/video-source/bind/show', { params })
-  }
-
-  public async startTraining(body: { cameras_id: string[] }): Promise<any> {
-    return await this.post('horizon/video-source/training/start', body)
-  }
-
-  public async stopTraining(body: { cameras_id: string[] }): Promise<any> {
-    return await this.post('horizon/video-source/training/stop', body)
-  }
-
-  public async fetchTrainingInfo(params?: Record<string, string>): Promise<any> {
-    return await this.get('horizon/video-source/training/info', { params })
-  }
-
-  public async fetchTrainingStatus(params?: Record<string, string>): Promise<Api_Video_Training_Status> {
-    return await this.get('horizon/video-source/training/status', { params })
-  }
-
-  public async fetchVisualizationDataLink(params?: Record<string, string>): Promise<string> {
-    return await this.get('horizon/video-source/link/video/training', { params })
-  }
-
-  public async updateVisualizationData(params?: Record<string, string>): Promise<number> {
-    return await this.get('horizon/video-source/download/video/training', { params })
-  }
-
-  public async deleteFrameFromVideo(id: string): Promise<void> {
-    await this.delete(`horizon/video-source/delete/fragment/video/training/${id}`)
-  }
-
-  // Для тестирования ws видеостены
-  public async sendEvent(params?: Record<string, any>): Promise<number> {
-    return await this.post('alerts_callback_url', params)
-  }
-}
-
-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_Combination,
+  Api_Video_Source_By_Repair,
+  Api_Video_Source_Create,
+  Api_Video_Source_Economics,
+  Api_Video_Source_Search,
+  Api_Video_Training_Status,
+  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 hardReloadStream(): Promise<any> {
+    return this.post('horizon/video-source/streams/add', null)
+  }
+
+  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/list', { params })
+  }
+
+  public async fetchVideoSourceEconomics(params?: any): Promise<ResponseApi<Api_Video_Source_Economics>> {
+    return await this.get('horizon/video-source/economics', { params })
+  }
+
+  public async createVideoSource(body: Api_Video_Source_Create): Promise<Api_Video_Source_Search> {
+    return await this.post('horizon/video-source', body)
+  }
+
+  public async editVideoSource(id: string, body: Partial<Api_Video_Source_Create>): Promise<Api_Video_Source_Search> {
+    return await this.put(`/horizon/video-source/${id}`, body)
+  }
+
+  public async deleteVideoSource(id: string): Promise<void> {
+    await this.delete(`/horizon/video-source/${id}`)
+  }
+
+  public async fetchListRepairsVideoSource(params?: any): Promise<Api_Video_Source_By_Repair[]> {
+    return await this.get('work_zone/get_list_video_source_by_repair', { params })
+  }
+
+  public async sendCombination(body: { cameras_id: string[] }): Promise<any> {
+    return await this.post('horizon/video-source/training', body)
+  }
+
+  public async saveCombination(body: any): Promise<any> {
+    return await this.post('horizon/video-source/bind', body)
+  }
+
+  public async fetchCombination(params?: Record<string, string>): Promise<Api_Video_Combination> {
+    return await this.get('horizon/video-source/bind/show', { params })
+  }
+
+  public async startTraining(body: { cameras_id: string[] }): Promise<any> {
+    return await this.post('horizon/video-source/training/start', body)
+  }
+
+  public async stopTraining(body: { cameras_id: string[] }): Promise<any> {
+    return await this.post('horizon/video-source/training/stop', body)
+  }
+
+  public async fetchTrainingInfo(params?: Record<string, string>): Promise<any> {
+    return await this.get('horizon/video-source/training/info', { params })
+  }
+
+  public async fetchTrainingStatus(params?: Record<string, string>): Promise<Api_Video_Training_Status> {
+    return await this.get('horizon/video-source/training/status', { params })
+  }
+
+  public async fetchVisualizationDataLink(params?: Record<string, string>): Promise<string> {
+    return await this.get('horizon/video-source/link/video/training', { params })
+  }
+
+  public async updateVisualizationData(params?: Record<string, string>): Promise<number> {
+    return await this.get('horizon/video-source/download/video/training', { params })
+  }
+
+  public async deleteFrameFromVideo(id: string): Promise<void> {
+    await this.delete(`horizon/video-source/delete/fragment/video/training/${id}`)
+  }
+
+  // Для тестирования ws видеостены
+  public async sendEvent(params?: Record<string, any>): Promise<number> {
+    return await this.post('alerts_callback_url', params)
+  }
+}
+
+let api: VideoService
+
+export default function useVideoService() {
+  if (!api) api = new VideoService()
+  return api
+}

package/src/api/settings/ApiService.ts

@@ -1,12 +1,4 @@
 import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios'
-import { Api_Auth_Login } from '@/api/types/Api_Auth'
-
-// eslint-disable-next-line
-var isRefreshing = false
-
-interface Api_Auth_Refresh {
-  accessToken: string
-}
 
 export enum ApiServiceType {
   SERVICE_AUTH = 'SERVICE_AUTH',
@@ -14,7 +6,6 @@ export enum ApiServiceType {
 
 export default class ApiService {
   private axiosInstance: AxiosInstance
-  private refreshSubscribers: any[] = []
 
   constructor() {
     this.axiosInstance = axios.create({
@@ -23,12 +14,14 @@ export default class ApiService {
         'Content-Type': 'application/json',
         Accept: 'application/json',
       },
-      withCredentials: true,
     })
 
     this.axiosInstance.interceptors.request.use(
       (config: InternalAxiosRequestConfig) => {
-        config.headers.Authorization = `Bearer ${this.getAccessToken()}`
+        const token = this.getToken()
+        if (token && config.headers) {
+          config.headers.Authorization = `Bearer ${token}`
+        }
         return config
       },
       (error: AxiosError) => {
@@ -40,57 +33,16 @@ export default class ApiService {
       (response: AxiosResponse) => {
         return response.data
       },
-      async error => {
-        const originalRequest = error.config
-
-        if (
-          error.response?.status !== 401 ||
-          originalRequest.url === '/v2/auth/refresh' ||
-          originalRequest.url === '/v2/login' ||
-          originalRequest._retry
-        ) {
-          alert('sssssss' + originalRequest.url)
-          return Promise.reject(error)
-        }
-
-        originalRequest._retry = true
-
-        alert(isRefreshing)
-
-        if (isRefreshing) {
-          alert(originalRequest.url)
-          return new Promise(resolve => {
-            this.subscribeTokenRefresh(() => resolve(this.axiosInstance(originalRequest)))
-          })
-        }
-
-        isRefreshing = true
-
-        try {
-          const response = await this.refresh()
-
-          const newToken = response.accessToken
-          if (!newToken) {
-            this.logoutUser()
-            return Promise.reject(error)
-          }
-
-          this.setAccessToken(newToken)
-          this.onRefreshed()
-          isRefreshing = false
-          return this.axiosInstance(originalRequest)
-        } catch (e) {
-          this.logoutUser()
-          return Promise.reject(e)
+      (error: AxiosError) => {
+        if (error.response?.status === 401 || error.response?.status === 403) {
+          this.logout()
         }
+        return Promise.reject(error)
       },
     )
   }
 
-  private setAccessToken(token: string) {
-    localStorage.setItem('token', token)
-  }
-  private getAccessToken() {
+  private getToken() {
     return localStorage.getItem('token')
   }
 
@@ -98,22 +50,7 @@ export default class ApiService {
     localStorage.removeItem('token')
   }
 
-  private subscribeTokenRefresh(cb: any) {
-    this.refreshSubscribers.push(cb)
-  }
-
-  private refresh(): Promise<Api_Auth_Refresh> {
-    return this.post<null, Api_Auth_Login>(`/v2/auth/refresh`, null)
-  }
-
-  private onRefreshed() {
-    this.refreshSubscribers.forEach(cb => cb())
-    this.refreshSubscribers = []
-  }
-
-  public logoutUser(): any {
-    isRefreshing = false
-    this.post<any, any>(`/v2/logout`, {})
+  public logout(): void {
     this.removeToken()
     window.location.href = '/sign-in'
   }

package/src/api/types/Api_Auth.ts

@@ -72,15 +72,6 @@ export type Api_Auth_User = {
   roles: Api_Auth_User_Role[]
   security_warnings: any[]
   teams: Api_Auth_User_Team[]
-  avatar: null
-  change_password: null
-  created_at: string
-  deleted_at: null
-  face_recognition_id: null
-  password_change_available_at: string
-  password_change_due_at: string
-  password_last_changed_at: string
-  updated_at: string
 }
 
 export type Api_Auth_Login = {
@@ -93,13 +84,6 @@ export type ChangePasswordPayload = {
   password_confirmation: string
 }
 
-export type ChangePasswordAndActivatePayload = {
-  email: string
-  currentPassword: string
-  password: string
-  passwordConfirmation: string
-}
-
 export type ChangePasswordResponse = Pick<
   Api_User,
   | 'id'

package/src/api/types/Api_Metrics.ts

@@ -1,5 +1,26 @@
-export type Api_Metrics_Unused_Personnel = {
-  position_name: string | null
-  brigade_name: string | null
-  full_name: string | null
-}
+export type Api_Metrics_Unused_Personnel = {
+  position_name: string | null
+  brigade_name: string | null
+  full_name: string | null
+}
+
+export type Api_Metrics_Personnel_Plan_User = {
+  user_id: string
+  full_name: string
+  position_id: string
+  position_name: string
+  position_display_name: string
+}
+
+export type Api_Metrics_Personnel_Plan_Position = {
+  position_id: string
+  position_name: string
+  position_display_name: string
+  count: number
+}
+
+export type Api_Metrics_Personnel_Plan = {
+  engaged: Api_Metrics_Personnel_Plan_User[]
+  fixed_repair: Api_Metrics_Personnel_Plan_Position[]
+  ready: Api_Metrics_Personnel_Plan_User[]
+}