shared-ritm 1.2.106 → 1.2.108

package/src/api/types/Api_Instruments.ts

@@ -1,98 +1,136 @@
-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'
+import { Api_Status_DTO } from '@/api/types/Api_Tasks'
+import { Api_Search_User } from '@/api/types/Api_Search'
+
+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
+  }[]
+}
+
+export type Api_Warehouse_Search = Omit<
+  Api_Instrument,
+  | 'created_at'
+  | 'deleted_at'
+  | 'invoice_ref_key'
+  | 'last_status_updated_at'
+  | 'pressure'
+  | 'registry_module_id'
+  | 'supervisor'
+  | 'supervisor_id'
+  | 'type'
+  | 'weight'
+> & {
+  issued_in: unknown | null
+  registry: {
+    id: string
+    title: string
+  }
+}
+
+export type Api_Warehouse_Create = {
+  instrument_id: string
+  inventory_number: string
+  module_id?: string
+  registry_module_id?: string
+}
+
+export type Api_Warehouse_Status_History_Item = {
+  old_status: Api_Status_DTO
+  new_status: Api_Status_DTO
+  created_at: string
+  responsible: Omit<Api_Search_User, 'photos' | 'divisions' | 'passes'> & {
+    roles: { id: string; display_name: string }[]
+  }
+}

package/src/api/types/Api_Search.ts

@@ -1,3 +1,5 @@
+import { Api_Warehouse_Search } from '@/api/types/Api_Instruments'
+
 export type Api_Search_User_Passes = {
   id: string
   type: string
@@ -56,3 +58,20 @@ export type Api_Search_Instruments = {
   divisions: string
   personnel_number: string
 }
+
+export type Api_Search_Module_User = Pick<Api_Search_User, 'id' | 'full_name' | 'email'> & {
+  teams: Omit<Api_Search_User_Teams, 'roles'>[]
+}
+
+export type Api_Search_Module = {
+  id: string
+  RFID: string
+  inventory_number: string
+  title: string
+  type: string
+  mac: unknown
+  wlan: unknown
+  warehouses: Api_Warehouse_Search[]
+  user: Api_Search_Module_User
+  teams: Omit<Api_Search_User_Teams, 'roles'>[]
+}

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