@tagsamurai/fats-api-services 2.0.0-alpha.17 → 2.0.0-alpha.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tagsamurai/fats-api-services",
-  "version": "2.0.0-alpha.17",
+  "version": "2.0.0-alpha.18",
   "type": "module",
   "author": "Tagsamurai",
   "description": "Fixed Asset Tagsamurai API Services",

package/src/dto/hardware.dto.d.ts

@@ -1,6 +1,5 @@
 import { Tab } from '../types/hardware.type';
 import { TableParams } from './dataTable.dto';
-type TAG = 'RFID' | 'NFC';
 export interface HandheldFilterRaw extends TableParams {
     tab?: Tab;
     deviceName?: string[];
@@ -12,6 +11,7 @@ export interface HandheldFilterRaw extends TableParams {
     reportedAt?: number[];
 }
 export interface HandheldOptions {
+    tab?: Tab;
     deviceNameOptions?: boolean;
     skuOptions?: boolean;
     reportedByOptions?: boolean;
@@ -45,6 +45,7 @@ export interface SmartFixedFilterRaw extends TableParams {
     reportedAt?: number[];
 }
 export interface SmartFixedOptions {
+    tab?: Tab;
     deviceNameOptions?: boolean;
     skuOptions?: boolean;
     brandOptions?: boolean;
@@ -53,11 +54,20 @@ export interface SmartFixedOptions {
     reportedByOptions?: boolean;
 }
 export interface TabletFilterRaw extends TableParams {
-    deviceName: string[];
+    tab?: Tab;
+    deviceName?: string[];
+    status?: string[];
+    group?: string[];
+    reader?: string[];
+    registeredAt?: number[];
+    reportedBy?: string[];
+    reportedAt?: number[];
 }
 export interface TabletOptions {
+    tab?: Tab;
+    statusOptions?: boolean;
     deviceNameOptions?: boolean;
-    skuOptions?: boolean;
+    readerOptions?: boolean;
     reportedByOptions?: boolean;
 }
 export interface PutEditAliasName {
@@ -110,48 +120,4 @@ export interface PutHardwareStatusBody {
     status: 'Missing' | 'Damaged' | 'Available';
 }
 export type HardwareFormType = PutEditAliasName | PutHardwareStatusBody | PutEditReaderGroup;
-export interface GetAllTAGParams extends TableParams {
-    sortBy?: string;
-    tagType?: string[];
-    rfidSku?: string[];
-    nfcSku?: string[];
-    type?: string[];
-    status?: string[];
-    lastScanned?: string[];
-}
-export type GetAllTAGOptionsQuery = {
-    tagTypeOptions?: boolean;
-    rfidSkuOptions?: boolean;
-    nfcSkuOptions?: boolean;
-    typeOptions?: boolean;
-    statusOptions?: boolean;
-    lastScannedOptions?: boolean;
-};
-export type GetNotPairedYetListParams = GetAllTAGParams & {
-    tag?: TAG;
-};
-export type GetNotPairedYetOptions = {
-    tag?: TAG;
-    tagTypeOptions?: boolean;
-    rfidSkuOptions?: boolean;
-    nfcSkuOptions?: boolean;
-    typeOptions?: boolean;
-    statusOptions?: boolean;
-    lastScannedOptions?: boolean;
-};
-type TAGIds = {
-    data: {
-        rfidId: string;
-        nfcId: string;
-        qrId: string;
-    }[];
-};
-export type GetAuditTAGDetailParams = TAGIds;
-export type SubmitAuditTAGBody = TAGIds & {
-    markNotFoundAsDamagedMissing: boolean;
-};
-export type SubmitCombineTAGBody = TAGIds & {
-    tagType: 'RFID & QR';
-};
-export type SubmitSeparateTAGBody = TAGIds;
 export {};

package/src/services/hardware.service.d.ts

@@ -1,13 +1,11 @@
 import { AxiosResponse } from 'axios';
 import { FetchDetailResponse, FetchListResponse, FetchOptionResponse, FilterQuery, ShortFetchListResponse } from '../types/fetchResponse.type';
 import { AssetControlBody, DeleteHardware, HandheldFilterRaw, HandheldOptions, PostActivateHardware, PostPingReadersBody, PutEditAliasName, PutEditReaderGroup, PutHardwareStatusBody, SmartFixedFilterRaw, SmartFixedOptions, SmartFixedReaderBody, TabletFilterRaw, TabletOptions } from '../dto/hardware.dto';
-import { HandheldDataType, HandheldDetailDataType, PingSmartFixed, SmartFixedDataType, SmartFixedDetailDataType, Tab, Tablet } from '../types/hardware.type';
+import { HandheldDataType, HandheldDetailDataType, PingSmartFixed, SmartFixedDataType, SmartFixedDetailDataType, Tablet } from '../types/hardware.type';
 declare const HardwareServices: {
     getHandheldReader: (params?: FilterQuery<HandheldFilterRaw>) => Promise<AxiosResponse<FetchListResponse<HandheldDataType>>>;
     getHandheldReaderDetail: (handheldId?: string) => Promise<AxiosResponse<FetchDetailResponse<HandheldDetailDataType>>>;
-    getHandheldReaderOptions: (body?: HandheldOptions & {
-        tab?: Tab;
-    }) => Promise<AxiosResponse<{
+    getHandheldReaderOptions: (body?: HandheldOptions) => Promise<AxiosResponse<{
         data: FetchOptionResponse<HandheldOptions>;
     }>>;
     putHardwareStatus: (moduleTab: "smart-fixed-readers" | "handheld-readers" | "tablets", ids: string[], body: PutHardwareStatusBody) => Promise<AxiosResponse>;
@@ -18,16 +16,13 @@ declare const HardwareServices: {
     deleteHardware: (moduleTab: "smart-fixed-readers" | "handheld-readers" | "tablets", params?: DeleteHardware) => Promise<AxiosResponse>;
     getSmartFixedReader: (params?: FilterQuery<SmartFixedFilterRaw>) => Promise<AxiosResponse<FetchListResponse<SmartFixedDataType>>>;
     getSmartFixedReaderDetail: (smartFixedId?: string) => Promise<AxiosResponse<FetchDetailResponse<SmartFixedDetailDataType>>>;
-    getSmartFixedReaderOptions: (params?: SmartFixedOptions & {
-        tab?: Tab;
-    }) => Promise<AxiosResponse<{
+    getSmartFixedReaderOptions: (params?: SmartFixedOptions) => Promise<AxiosResponse<{
         data: FetchOptionResponse<SmartFixedOptions>;
     }>>;
     putEditSmartFixedReader: (id: string, body: SmartFixedReaderBody | AssetControlBody) => Promise<AxiosResponse>;
-    getTablet: (id: string, params?: FilterQuery<TabletFilterRaw>) => Promise<AxiosResponse<FetchListResponse<Tablet>>>;
-    getTabletOptions: (id: string, params?: TabletOptions) => Promise<AxiosResponse<{
+    getTablet: (params?: FilterQuery<TabletFilterRaw>) => Promise<AxiosResponse<FetchListResponse<Tablet>>>;
+    getTabletOptions: (params?: TabletOptions) => Promise<AxiosResponse<{
         data: FetchOptionResponse<TabletOptions>;
     }>>;
-    disconnectTablet: (id: string, body?: DeleteHardware) => Promise<AxiosResponse>;
 };
 export default HardwareServices;

package/src/types/hardware.type.d.ts

@@ -5,21 +5,21 @@ export type ModuleType = 'fixedAsset' | 'supplyAsset';
 export type Tab = 'Available' | 'Damaged/Missing';
 export interface HardwareDetailDataType {
     _id: string;
-    image?: string;
+    image: string | null;
     deviceName: string;
     sku: string;
     serialNumber: string;
-    aliasName?: string;
-}
-export interface HandheldDataType extends HandheldDetailDataType {
-    reportedBy?: string;
-    reportedAt?: Date;
+    aliasName: string | null;
 }
 export interface HandheldDetailDataType extends HardwareDetailDataType {
     type: string;
     status: string;
     group: ReaderGroup;
 }
+export interface HandheldDataType extends HandheldDetailDataType {
+    reportedBy: string | null;
+    reportedAt: Date | null;
+}
 export interface ReaderGroup {
     fixedAsset?: {
         _id: string;
@@ -43,13 +43,6 @@ export interface SmartFixedGroupList {
     fixedAsset: (string | null)[];
     supplyAsset: (string | null)[];
 }
-export interface SmartFixedDataType extends Omit<SmartFixedDetailDataType, 'rssi'> {
-    connectedTablet: number;
-    status: string;
-    portGroup: SmartFixedGroupList;
-    reportedBy?: string;
-    reportedAt?: string;
-}
 export interface SmartFixedDetailDataType extends HardwareDetailDataType {
     activePort: string;
     networkStatus: string;
@@ -59,10 +52,24 @@ export interface SmartFixedDetailDataType extends HardwareDetailDataType {
     readerGroup: SmartFixedGroup;
     rssi: string;
 }
+export interface SmartFixedDataType extends Omit<SmartFixedDetailDataType, 'rssi'> {
+    connectedTablet: number;
+    status: string;
+    portGroup: SmartFixedGroupList;
+    reportedBy: string | null;
+    reportedAt: Date | null;
+}
 export interface Tablet {
     _id: string;
     deviceName: string;
     deviceId: string;
+    status: string;
+    group: ReaderGroup;
+    reader: string | null;
+    aliasName: string | null;
+    registeredAt: Date;
+    reportedBy: string | null;
+    reportedAt: Date | null;
 }
 export interface PingSmartFixed {
     _id: string;