shared-ritm 1.1.58 → 1.1.60

package/dist/types/api/services/TasksService.d.ts

@@ -1,5 +1,5 @@
 import ApiService, { ResponseApi } from '@/api/settings/ApiService';
-import { Api_Task_Instrument_Dto, Api_Task_Module_Instrument_Condition, Api_Tasks_Dto, Api_Tasks_Task_Dto } from '@/api/types/Api_Tasks';
+import { Api_Task_Instrument_Dto, Api_Task_Instrument_From_Warehouse, Api_Task_Module_Instrument_Condition, Api_Tasks_Dto, Api_Tasks_Task_Dto } from '@/api/types/Api_Tasks';
 import { Api_Equipment_Full_Dto } from '@/api/types/Api_Repairs';
 declare class TasksService extends ApiService {
     fetchTaskById(id: string): Promise<ResponseApi<Api_Tasks_Task_Dto>>;
@@ -7,6 +7,12 @@ declare class TasksService extends ApiService {
     fetchSubtasksList(id: string): Promise<ResponseApi<Api_Tasks_Dto[]>>;
     fetchTaskBranch(id: string): Promise<ResponseApi<any>>;
     fetchInstrumentsList(params: any): Promise<ResponseApi<any[]>>;
+    fetchInstrumentTypeListWithPreparedWarehouse(params: {
+        page: number;
+        per_page: number;
+        'filterList[taskId]'?: string | undefined;
+        search?: string;
+    }): Promise<Api_Task_Instrument_From_Warehouse[]>;
     fetchInstrumentsEquivalentList(params: any): Promise<ResponseApi<Api_Task_Instrument_Dto[]>>;
     fetchDiffInstruments(params: any): Promise<ResponseApi<Api_Task_Module_Instrument_Condition>>;
     replaceInstruments(payload: any): Promise<ResponseApi<any>>;

package/dist/types/api/types/Api_Tasks.d.ts

@@ -126,3 +126,11 @@ export type Api_Task_Module_Instrument_Condition = {
     }>;
     instruments_types_count: Record<string, number>;
 };
+export type Api_Task_Instrument_From_Warehouse = {
+    id: string;
+    name: string;
+    warehouse_prepared_quantity: number;
+    has_status: boolean;
+    has_responsible: boolean;
+    has_module: boolean;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shared-ritm",
-  "version": "1.1.58",
+  "version": "1.1.60",
   "private": false,
   "files": [
     "dist",

package/src/api/services/AuthService.ts

@@ -1,41 +1,41 @@
-import ApiService from '@/api/settings/ApiService'
-
-type LoginPayload = {
-  email: string
-  password: string
-}
-
-type LoginResponse = {
-  token: string
-  user: any
-}
-
-type ConfigResponse = any
-
-class AuthService extends ApiService {
-  public login(email: string, password: string) {
-    return this.post<LoginPayload, LoginResponse>(`/login`, {
-      email,
-      password,
-    })
-  }
-
-  public logout() {
-    return this.post<null, LoginResponse>(`/logout`, null)
-  }
-
-  public userInfo() {
-    return this.get<any>(`/users/auth`)
-  }
-
-  public configs() {
-    return this.get<ConfigResponse>(`/configs`)
-  }
-}
-
-let api: AuthService
-
-export default function useAuthService() {
-  if (!api) api = new AuthService()
-  return api
-}
+import ApiService from '@/api/settings/ApiService'
+
+type LoginPayload = {
+  email: string
+  password: string
+}
+
+type LoginResponse = {
+  token: string
+  user: any
+}
+
+type ConfigResponse = any
+
+class AuthService extends ApiService {
+  public login(email: string, password: string) {
+    return this.post<LoginPayload, LoginResponse>(`/login`, {
+      email,
+      password,
+    })
+  }
+
+  public logout() {
+    return this.post<null, LoginResponse>(`/logout`, null)
+  }
+
+  public userInfo() {
+    return this.get<any>(`/users/auth`)
+  }
+
+  public configs() {
+    return this.get<ConfigResponse>(`/configs`)
+  }
+}
+
+let api: AuthService
+
+export default function useAuthService() {
+  if (!api) api = new AuthService()
+  return api
+}

package/src/api/services/FileService.ts

@@ -1,15 +1,15 @@
-import ApiService, { ResponseApi } from '@/api/settings/ApiService'
-import { Api_Files_Responsible_Dto } from '@/api/types/Api_Files'
-
-class FileService extends ApiService {
-  public uploadFile(data: FormData): Promise<ResponseApi<Api_Files_Responsible_Dto>> {
-    return this.post<FormData, any>(`/upload-file`, data, { headers: { 'Content-Type': 'multipart/form-data' } })
-  }
-}
-
-let api: FileService
-
-export default function useFileService() {
-  if (!api) api = new FileService()
-  return api
-}
+import ApiService, { ResponseApi } from '@/api/settings/ApiService'
+import { Api_Files_Responsible_Dto } from '@/api/types/Api_Files'
+
+class FileService extends ApiService {
+  public uploadFile(data: FormData): Promise<ResponseApi<Api_Files_Responsible_Dto>> {
+    return this.post<FormData, any>(`/upload-file`, data, { headers: { 'Content-Type': 'multipart/form-data' } })
+  }
+}
+
+let api: FileService
+
+export default function useFileService() {
+  if (!api) api = new FileService()
+  return api
+}

package/src/api/services/TasksService.ts

@@ -1,90 +1,100 @@
-import ApiService, { ResponseApi } from '@/api/settings/ApiService'
-import {
-  Api_Task_Instrument_Dto,
-  Api_Task_Module_Instrument_Condition,
-  Api_Tasks_Dto,
-  Api_Tasks_Task_Dto,
-} from '@/api/types/Api_Tasks'
-import { Api_Equipment_Full_Dto } from '@/api/types/Api_Repairs'
-
-class TasksService extends ApiService {
-  public async fetchTaskById(id: string): Promise<ResponseApi<Api_Tasks_Task_Dto>> {
-    return await this.get(`/tasks/${id}`)
-  }
-
-  public async fetchTasksList(params: any): Promise<ResponseApi<Api_Tasks_Dto[]>> {
-    return await this.get('/list/tasks/search', { params })
-  }
-
-  public async fetchSubtasksList(id: string): Promise<ResponseApi<Api_Tasks_Dto[]>> {
-    return await this.get(`/task/${id}/subtasks/list`)
-  }
-
-  public async fetchTaskBranch(id: string): Promise<ResponseApi<any>> {
-    return await this.get(`/get_list_task_branch?task_id=${id}`)
-  }
-
-  public async fetchInstrumentsList(params: any): Promise<ResponseApi<any[]>> {
-    return await this.get(`admin/instruments`, { params })
-  }
-
-  public async fetchInstrumentsEquivalentList(params: any): Promise<ResponseApi<Api_Task_Instrument_Dto[]>> {
-    return await this.get(`tasks/instrument/list`, { params })
-  }
-
-  public async fetchDiffInstruments(params: any): Promise<ResponseApi<Api_Task_Module_Instrument_Condition>> {
-    return await this.get(`tasks/${params.taskId}/fill/module`, { params })
-  }
-
-  public async replaceInstruments(payload: any): Promise<ResponseApi<any>> {
-    return await this.post(`/instruments/equivalent/attach`, payload)
-  }
-  public async fetchTaskUsagePersonal(params: any): Promise<ResponseApi<unknown[]>> {
-    return await this.get(`tasks/${params.taskId}/usage/users`, { params })
-  }
-
-  public fetchEquipment(params: any): Promise<ResponseApi<Api_Equipment_Full_Dto[]>> {
-    return this.get('repairs/equipment/list', { params })
-  }
-
-  public async createTask(payload: any): Promise<ResponseApi<any>> {
-    return await this.post(`tasks`, payload)
-  }
-
-  public async editTask(payload: any): Promise<ResponseApi<any>> {
-    return await this.put(`tasks/${payload.taskId}`, payload.data)
-  }
-
-  public async mergeTask(payload: { name: string; tasks_id: string[] }): Promise<ResponseApi<any>> {
-    return await this.post(`tasks/merge`, payload)
-  }
-
-  public async deleteTask(id: string): Promise<any> {
-    return await this.delete(`tasks/${id}`)
-  }
-
-  public async changeStatus(payload: { taskId: string; data: unknown }): Promise<unknown> {
-    const { taskId, data } = payload
-    return await this.put(`task/${taskId}/change-status`, data)
-  }
-
-  public async uploadComment(payload: unknown): Promise<unknown> {
-    return await this.post('comments', payload)
-  }
-
-  public async deleteComment(commentId: string): Promise<unknown> {
-    return await this.delete(`comments/${commentId}`)
-  }
-
-  public async editComment(payload: { commentId: string; data: unknown }): Promise<unknown> {
-    const { commentId, data } = payload
-    return await this.put(`comments/${commentId}`, data)
-  }
-}
-
-let api: TasksService
-
-export default function useTasksService() {
-  if (!api) api = new TasksService()
-  return api
-}
+import ApiService, { ResponseApi } from '@/api/settings/ApiService'
+import {
+  Api_Task_Instrument_Dto,
+  Api_Task_Instrument_From_Warehouse,
+  Api_Task_Module_Instrument_Condition,
+  Api_Tasks_Dto,
+  Api_Tasks_Task_Dto,
+} from '@/api/types/Api_Tasks'
+import { Api_Equipment_Full_Dto } from '@/api/types/Api_Repairs'
+
+class TasksService extends ApiService {
+  public async fetchTaskById(id: string): Promise<ResponseApi<Api_Tasks_Task_Dto>> {
+    return await this.get(`/tasks/${id}`)
+  }
+
+  public async fetchTasksList(params: any): Promise<ResponseApi<Api_Tasks_Dto[]>> {
+    return await this.get('/list/tasks/search', { params })
+  }
+
+  public async fetchSubtasksList(id: string): Promise<ResponseApi<Api_Tasks_Dto[]>> {
+    return await this.get(`/task/${id}/subtasks/list`)
+  }
+
+  public async fetchTaskBranch(id: string): Promise<ResponseApi<any>> {
+    return await this.get(`/get_list_task_branch?task_id=${id}`)
+  }
+
+  public async fetchInstrumentsList(params: any): Promise<ResponseApi<any[]>> {
+    return await this.get('admin/instruments', { params })
+  }
+
+  public async fetchInstrumentTypeListWithPreparedWarehouse(params: {
+    page: number
+    per_page: number
+    'filterList[taskId]'?: string | undefined
+    search?: string
+  }): Promise<Api_Task_Instrument_From_Warehouse[]> {
+    return await this.get('/instrument_type/get_instrument_type_list_with_prepared_warehouse', { params })
+  }
+
+  public async fetchInstrumentsEquivalentList(params: any): Promise<ResponseApi<Api_Task_Instrument_Dto[]>> {
+    return await this.get('tasks/instrument/list', { params })
+  }
+
+  public async fetchDiffInstruments(params: any): Promise<ResponseApi<Api_Task_Module_Instrument_Condition>> {
+    return await this.get(`tasks/${params.taskId}/fill/module`, { params })
+  }
+
+  public async replaceInstruments(payload: any): Promise<ResponseApi<any>> {
+    return await this.post(`/instruments/equivalent/attach`, payload)
+  }
+  public async fetchTaskUsagePersonal(params: any): Promise<ResponseApi<unknown[]>> {
+    return await this.get(`tasks/${params.taskId}/usage/users`, { params })
+  }
+
+  public fetchEquipment(params: any): Promise<ResponseApi<Api_Equipment_Full_Dto[]>> {
+    return this.get('repairs/equipment/list', { params })
+  }
+
+  public async createTask(payload: any): Promise<ResponseApi<any>> {
+    return await this.post(`tasks`, payload)
+  }
+
+  public async editTask(payload: any): Promise<ResponseApi<any>> {
+    return await this.put(`tasks/${payload.taskId}`, payload.data)
+  }
+
+  public async mergeTask(payload: { name: string; tasks_id: string[] }): Promise<ResponseApi<any>> {
+    return await this.post(`tasks/merge`, payload)
+  }
+
+  public async deleteTask(id: string): Promise<any> {
+    return await this.delete(`tasks/${id}`)
+  }
+
+  public async changeStatus(payload: { taskId: string; data: unknown }): Promise<unknown> {
+    const { taskId, data } = payload
+    return await this.put(`task/${taskId}/change-status`, data)
+  }
+
+  public async uploadComment(payload: unknown): Promise<unknown> {
+    return await this.post('comments', payload)
+  }
+
+  public async deleteComment(commentId: string): Promise<unknown> {
+    return await this.delete(`comments/${commentId}`)
+  }
+
+  public async editComment(payload: { commentId: string; data: unknown }): Promise<unknown> {
+    const { commentId, data } = payload
+    return await this.put(`comments/${commentId}`, data)
+  }
+}
+
+let api: TasksService
+
+export default function useTasksService() {
+  if (!api) api = new TasksService()
+  return api
+}

package/src/api/settings/ApiService.ts

@@ -1,126 +1,126 @@
-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',
-        'Access-Control-Allow-Origin': '*',
-      },
-    })
-
-    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)
-      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)
-      return response.data
-    } 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',
+        'Access-Control-Allow-Origin': '*',
+      },
+    })
+
+    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)
+      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)
+      return response.data
+    } 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
+    }
+  }
+}