shared-ritm 1.3.87 → 1.3.88

package/src/api/services/UserService.ts

@@ -1,129 +1,129 @@
-import ApiService from '../settings/ApiService'
-import {
-  Api_User,
-  Api_User_Create,
-  Api_User_Delete_Body,
-  Api_User_Delete_Photos_Body,
-  Api_User_Position,
-  Api_User_Role,
-  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 {
-  public async editUser({ id, model }: { id: string; model: any }): Promise<Api_User> {
-    return await this.put<Partial<Api_User>, Api_User>(`/admin/users/${id}`, model)
-  }
-
-  public async getUser(id: string): Promise<Api_User> {
-    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
-  }): Promise<ResponseApi<Api_User_Warehouse[]>> {
-    return await this.get<ResponseApi<Api_User_Warehouse[]>>(`users/get_warehouse_list_by_user`, { params })
-  }
-
-  public async createUser(model: Api_User_Create): Promise<Api_User> {
-    return await this.post<Api_User_Create, Api_User>('/admin/users', model)
-  }
-
-  public async deleteUser({
-    user_id,
-    archive_reason,
-  }: Api_User_Delete_Body): Promise<{ data: boolean; status: number }> {
-    return await this.post(`/users/archive_user`, { user_id, archive_reason })
-  }
-
-  public async deleteUserPhotos({
-    user_id,
-    photos,
-  }: Api_User_Delete_Photos_Body): Promise<{ data: boolean; status: number }> {
-    return await this.post(`/users/photos/delete`, { user_id, photos })
-  }
-
-  public async restoreUser(user_id: string): Promise<{ data: boolean; status: number }> {
-    return await this.post(`/users/restore_user`, { user_id })
-  }
-
-  public async getRoles(params?: { per_page?: number }): Promise<ResponseApi<Api_User_Role[]>> {
-    return await this.get<ResponseApi<Api_User_Role[]>>('/search/roles', { params })
-  }
-
-  public async getPositions(params?: { per_page?: number }): Promise<ResponseApi<Api_User_Position[]>> {
-    return await this.get<ResponseApi<Api_User_Position[]>>('/search/positions', { params })
-  }
-
-  public async createPosition(body: Partial<Api_User_Position>): Promise<ResponseApi<Api_User_Position>> {
-    return await this.post<Partial<Api_User_Position>, ResponseApi<Api_User_Position>>('/admin/positions', body)
-  }
-
-  public async editPosition(id: string, body: Partial<Api_User_Position>): Promise<ResponseApi<Api_User_Position>> {
-    return await this.put<Partial<Api_User_Position>, ResponseApi<Api_User_Position>>(`/admin/positions/${id}`, body)
-  }
-
-  public async deletePosition(id: string): Promise<{ data: boolean; status: number }> {
-    return await this.delete(`/admin/positions/${id}`)
-  }
-
-  public async getTeams(params?: { per_page?: number }): Promise<ResponseApi<Api_User_Team_Search[]>> {
-    return await this.get<ResponseApi<Api_User_Team_Search[]>>('/search/teams', { params })
-  }
-
-  public async createTeam(body: Partial<Api_User_Team_Search>): Promise<ResponseApi<Api_User_Team>> {
-    return await this.post<Partial<Api_User_Team_Search>, ResponseApi<Api_User_Team>>('/teams', body)
-  }
-
-  public async editTeam(id: string, body: Partial<Api_User_Team_Search>): Promise<{ data: boolean; status: number }> {
-    return await this.patch<Partial<Api_User_Team_Search>, { data: boolean; status: number }>(`/teams/${id}`, body)
-  }
-
-  public async deleteTeam(id: string): Promise<{ data: boolean; status: number }> {
-    return await this.delete(`/teams/${id}`)
-  }
-
-  public async checkUserVectors(id: string): Promise<{ count: number }> {
-    return await this.get(`/user/get-vectors/${id}`)
-  }
-
-  public async checkArchiveUserVectors(id: string): Promise<{ count: number }> {
-    return await this.get(`/users/get_vector_count_by_user?user_id=${id}`)
-  }
-
-  public async addUserVectors(formData: FormData): Promise<{ response: string }> {
-    return await this.post(`/user/add-vector`, formData, {
-      headers: { 'Content-Type': 'multipart/form-data' },
-    })
-  }
-
-  public async removeUserVectors(id: string): Promise<unknown> {
-    return await this.delete(`/user/delete-vectors/${id}`)
-  }
-
-  public async deleteUserPasses(body: {
-    personnel_number: number
-  }): Promise<{ delete_passes: boolean; user: Partial<Api_User> }> {
-    return await this.post('admin/delete/passes', body)
-  }
-
-  public async checkUserBeforeArchive(body: { user_id: string }): Promise<any> {
-    return await this.post('users/check_user_before_archive', body)
-  }
-}
-
-let api: UserService
-
-export default function useUserService() {
-  if (!api) api = new UserService()
-  return api
-}
+import ApiService from '../settings/ApiService'
+import {
+  Api_User,
+  Api_User_Create,
+  Api_User_Delete_Body,
+  Api_User_Delete_Photos_Body,
+  Api_User_Position,
+  Api_User_Role,
+  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 {
+  public async editUser({ id, model }: { id: string; model: any }): Promise<Api_User> {
+    return await this.put<Partial<Api_User>, Api_User>(`/admin/users/${id}`, model)
+  }
+
+  public async getUser(id: string): Promise<Api_User> {
+    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
+  }): Promise<ResponseApi<Api_User_Warehouse[]>> {
+    return await this.get<ResponseApi<Api_User_Warehouse[]>>(`users/get_warehouse_list_by_user`, { params })
+  }
+
+  public async createUser(model: Api_User_Create): Promise<Api_User> {
+    return await this.post<Api_User_Create, Api_User>('/admin/users', model)
+  }
+
+  public async deleteUser({
+    user_id,
+    archive_reason,
+  }: Api_User_Delete_Body): Promise<{ data: boolean; status: number }> {
+    return await this.post(`/users/archive_user`, { user_id, archive_reason })
+  }
+
+  public async deleteUserPhotos({
+    user_id,
+    photos,
+  }: Api_User_Delete_Photos_Body): Promise<{ data: boolean; status: number }> {
+    return await this.post(`/users/photos/delete`, { user_id, photos })
+  }
+
+  public async restoreUser(user_id: string): Promise<{ data: boolean; status: number }> {
+    return await this.post(`/users/restore_user`, { user_id })
+  }
+
+  public async getRoles(params?: { per_page?: number }): Promise<ResponseApi<Api_User_Role[]>> {
+    return await this.get<ResponseApi<Api_User_Role[]>>('/search/roles', { params })
+  }
+
+  public async getPositions(params?: { per_page?: number }): Promise<ResponseApi<Api_User_Position[]>> {
+    return await this.get<ResponseApi<Api_User_Position[]>>('/search/positions', { params })
+  }
+
+  public async createPosition(body: Partial<Api_User_Position>): Promise<ResponseApi<Api_User_Position>> {
+    return await this.post<Partial<Api_User_Position>, ResponseApi<Api_User_Position>>('/admin/positions', body)
+  }
+
+  public async editPosition(id: string, body: Partial<Api_User_Position>): Promise<ResponseApi<Api_User_Position>> {
+    return await this.put<Partial<Api_User_Position>, ResponseApi<Api_User_Position>>(`/admin/positions/${id}`, body)
+  }
+
+  public async deletePosition(id: string): Promise<{ data: boolean; status: number }> {
+    return await this.delete(`/admin/positions/${id}`)
+  }
+
+  public async getTeams(params?: { per_page?: number }): Promise<ResponseApi<Api_User_Team_Search[]>> {
+    return await this.get<ResponseApi<Api_User_Team_Search[]>>('/search/teams', { params })
+  }
+
+  public async createTeam(body: Partial<Api_User_Team_Search>): Promise<ResponseApi<Api_User_Team>> {
+    return await this.post<Partial<Api_User_Team_Search>, ResponseApi<Api_User_Team>>('/teams', body)
+  }
+
+  public async editTeam(id: string, body: Partial<Api_User_Team_Search>): Promise<{ data: boolean; status: number }> {
+    return await this.patch<Partial<Api_User_Team_Search>, { data: boolean; status: number }>(`/teams/${id}`, body)
+  }
+
+  public async deleteTeam(id: string): Promise<{ data: boolean; status: number }> {
+    return await this.delete(`/teams/${id}`)
+  }
+
+  public async checkUserVectors(id: string): Promise<{ count: number }> {
+    return await this.get(`/user/get-vectors/${id}`)
+  }
+
+  public async checkArchiveUserVectors(id: string): Promise<{ count: number }> {
+    return await this.get(`/users/get_vector_count_by_user?user_id=${id}`)
+  }
+
+  public async addUserVectors(formData: FormData): Promise<{ response: string }> {
+    return await this.post(`/user/add-vector`, formData, {
+      headers: { 'Content-Type': 'multipart/form-data' },
+    })
+  }
+
+  public async removeUserVectors(id: string): Promise<unknown> {
+    return await this.delete(`/user/delete-vectors/${id}`)
+  }
+
+  public async deleteUserPasses(body: {
+    personnel_number: number
+  }): Promise<{ delete_passes: boolean; user: Partial<Api_User> }> {
+    return await this.post('admin/delete/passes', body)
+  }
+
+  public async checkUserBeforeArchive(body: { user_id: string }): Promise<any> {
+    return await this.post('users/check_user_before_archive', body)
+  }
+}
+
+let api: UserService
+
+export default function useUserService() {
+  if (!api) api = new UserService()
+  return api
+}

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

@@ -68,7 +68,7 @@ export default class ApiService {
 
           const newToken = response.accessToken
           if (!newToken) {
-            await this.logoutUser()
+            this.logoutUser()
             return Promise.reject(error)
           }
 
@@ -77,7 +77,7 @@ export default class ApiService {
           isRefreshing = false
           return this.axiosInstance(originalRequest)
         } catch (e) {
-          await this.logoutUser()
+          this.logoutUser()
           return Promise.reject(e)
         }
       },
@@ -108,9 +108,9 @@ export default class ApiService {
     refreshSubscribers = []
   }
 
-  public async logoutUser(): Promise<any> {
+  public logoutUser(): any {
     isRefreshing = false
-    await this.post<any, any>(`/v2/logout`, null)
+    this.post<any, any>(`/v2/logout`, {})
     this.removeToken()
     window.location.href = '/sign-in'
   }