@tagsamurai/gsts-api-services 2.0.1-alpha.16 → 2.0.1-alpha.18

package/api-services.es.js

@@ -1,28 +1,28 @@
 import E from "axios";
-const D = { BASE_URL: "/", DEV: !1, MODE: "production", PROD: !0, SSR: !1, VITE_APP_GLOBAL_SETTINGS_API: "https://dev-api.global-settings.tagsamurai.com", VITE_APP_IMAGE_BASE_URL: "https://dev-api.tagsamurai.com/fam/utility/v2/files", VITE_APP_LOGS_NOTIFICATION_API: "https://dev-api-logs-notification.tagsamurai.com", VITE_APP_TAGSAMURAI_API: "https://dev-api.tagsamurai.com" }, O = (t = "APP_TAGSAMURAI_API") => D["VITE_" + t], u = (t = {}, e = !1) => {
+const D = { BASE_URL: "/", DEV: !1, MODE: "production", PROD: !0, SSR: !1, VITE_APP_GLOBAL_SETTINGS_API: "https://dev-api.global-settings.tagsamurai.com", VITE_APP_IMAGE_BASE_URL: "https://dev-api.tagsamurai.com/fam/utility/v2/files", VITE_APP_LOGS_NOTIFICATION_API: "https://dev-api-logs-notification.tagsamurai.com", VITE_APP_TAGSAMURAI_API: "https://dev-api.tagsamurai.com" }, I = (t = "APP_TAGSAMURAI_API") => D["VITE_" + t], u = (t = {}, e = !1) => {
   const {
     env: r = "APP_GLOBAL_SETTINGS_API",
-    prefix: o = "",
+    prefix: n = "",
     headers: i = {},
     ...l
-  } = t, I = "".concat(O(r)).concat(o), A = E.create({
+  } = t, O = "".concat(I(r)).concat(n), m = E.create({
     ...l,
-    baseURL: I,
+    baseURL: O,
     headers: e ? i : {
       "Content-Type": "application/json",
       ...i
     }
   });
-  return A.interceptors.request.use((m) => {
-    var P, y, S;
-    const b = JSON.parse((P = localStorage.getItem("user")) != null ? P : "{}"), w = (S = (y = b.jwt) != null ? y : b.token) != null ? S : "";
-    return m.headers.Authorization = "Bearer ".concat(w), m;
-  }), A;
+  return m.interceptors.request.use((A) => {
+    var P, y, $;
+    const h = JSON.parse((P = localStorage.getItem("user")) != null ? P : "{}"), w = ($ = (y = h.jwt) != null ? y : h.token) != null ? $ : "";
+    return A.headers.Authorization = "Bearer ".concat(w), A;
+  }), m;
 }, c = u({
   prefix: "/v1/global-settings/auth"
 }), L = (t) => {
-  var e, r, o, i;
-  return ((e = t.response) == null ? void 0 : e.status) === 401 || ((r = t.response) == null ? void 0 : r.status) === 500 || ((i = (o = t.response) == null ? void 0 : o.data) == null ? void 0 : i.message) === "jwt malformed" ? (window.onblur = null, window.onfocus = null, window.sessionExpired = !0, window.dispatchEvent(new CustomEvent("user:expired"))) : Promise.reject(t);
+  var e, r, n, i;
+  return ((e = t.response) == null ? void 0 : e.status) === 401 || ((r = t.response) == null ? void 0 : r.status) === 500 || ((i = (n = t.response) == null ? void 0 : n.data) == null ? void 0 : i.message) === "jwt malformed" ? (window.onblur = null, window.onfocus = null, window.sessionExpired = !0, window.dispatchEvent(new CustomEvent("user:expired"))) : Promise.reject(t);
 }, j = {
   login: (t) => {
     const e = { ...t, isMobile: !1 };
@@ -50,17 +50,17 @@ const D = { BASE_URL: "/", DEV: !1, MODE: "production", PROD: !0, SSR: !1, VITE_
    */
   logout: () => c.post("/logout")
 }, U = (t, e, r) => {
-  const o = new URL(O("APP_TAGSAMURAI_API") || "").origin;
-  let i = t.startsWith("http") ? t : "".concat(o, "/file-storage/api/file/").concat(t.replace(/^\/+/, ""));
+  const n = new URL(I("APP_TAGSAMURAI_API") || "").origin;
+  let i = t.startsWith("http") ? t : "".concat(n, "/file-storage/api/file/").concat(t.replace(/^\/+/, ""));
   if (e || r) {
     const l = new URLSearchParams();
     e && (l.set("width", e.toString()), l.set("height", (r == null ? void 0 : r.toString()) || e.toString())), i += "?".concat(l.toString());
   }
   return i;
 }, _ = () => {
-  var e, r, o;
+  var e, r, n;
   const t = JSON.parse((e = localStorage.getItem("user")) != null ? e : "{}");
-  return (o = (r = t.jwt) != null ? r : t.token) != null ? o : "";
+  return (n = (r = t.jwt) != null ? r : t.token) != null ? n : "";
 }, R = async (t, e) => {
   const r = await fetch(t, {
     headers: {
@@ -69,8 +69,8 @@ const D = { BASE_URL: "/", DEV: !1, MODE: "production", PROD: !0, SSR: !1, VITE_
   });
   if (!r.ok)
     throw new Error("Image fetch failed: ".concat(r.status, " ").concat(r.statusText));
-  const o = await r.arrayBuffer();
-  return new Blob([o], {
+  const n = await r.arrayBuffer();
+  return new Blob([n], {
     type: r.headers.get("Content-Type") || "image/webp"
   });
 }, G = async (t) => {
@@ -80,10 +80,10 @@ const D = { BASE_URL: "/", DEV: !1, MODE: "production", PROD: !0, SSR: !1, VITE_
   } catch (e) {
     return;
   }
-}, B = async (t, e, r, o) => {
+}, B = async (t, e, r, n) => {
   if (!t) return;
   const i = U(t, e, r);
-  return o ? i : G(i);
+  return n ? i : G(i);
 }, J = (t) => {
   if (!t || typeof t == "string")
     return;
@@ -109,14 +109,14 @@ const D = { BASE_URL: "/", DEV: !1, MODE: "production", PROD: !0, SSR: !1, VITE_
     return {};
   const e = {};
   return Object.keys(t).forEach((r) => {
-    const o = t[r];
-    e[r] = x(o) ? JSON.parse(o.trim()) : o;
+    const n = t[r];
+    e[r] = x(n) ? JSON.parse(n.trim()) : n;
   }), e;
-}, T = u({
+}, S = u({
   prefix: "/v1/global-settings/change-log"
 }), M = {
-  getChangelogs: (t) => T.get("", { params: t }),
-  getChangelogOptions: (t) => T.get("/options", { params: t })
+  getChangelogs: (t) => S.get("", { params: t }),
+  getChangelogOptions: (t) => S.get("/options", { params: t })
 }, d = u({
   prefix: "/v1/global-settings/division"
 }), q = {
@@ -160,58 +160,56 @@ const D = { BASE_URL: "/", DEV: !1, MODE: "production", PROD: !0, SSR: !1, VITE_
     const e = a(t);
     return g.post("/paired/options", e);
   }
-}, n = u({
+}, o = u({
   prefix: "/v2/hardware-tagging"
 }), H = {
   getHandheldReader: (t) => {
     const e = a(t);
-    return n.post("/handheld-reader/list", e);
-  },
-  getHandheldReaderDetail: (t) => n.get("/handheld-reader/".concat(t)),
-  getHandheldReaderOptions: (t) => {
-    const e = a(t);
-    return n.post("/handheld-reader/options", e);
+    return o.post("/handheld-reader/list", e);
   },
-  putMarkHandheldStatus: (t) => n.patch("/handheld-reader/status", t),
-  putPingReaders: (t) => n.put("/iot-reader/ping", t),
-  putMarkIOTStatus: (t, e) => n.put("/".concat(e, "/mark-status"), t),
-  putEditReaderGroup: (t, e, r) => n.patch(
-    "/".concat(t === "iot" ? "iot-" : "handheld-", "reader/").concat(r, "/group"),
-    e
-  ),
-  putEditAntennaGroup: (t, e) => n.put("/iot-reader/".concat(e, "/set-port-group"), t),
-  putEditPortStatus: (t, e) => n.put("/iot-reader/".concat(e, "/set-port-status"), t),
-  putEditAliasName: (t, e, r) => n.patch(
-    "/".concat(t === "iot" ? "iot-" : "handheld-", "reader/").concat(r, "/alias-name"),
-    e
-  ),
-  postActivateHardware: (t, e) => n.post(
-    "/".concat(t === "iot" ? "iot-" : "handheld-", "reader/activate"),
-    e
-  ),
-  deleteHardware: (t, e) => n.delete("/".concat(t === "iot" ? "iot-" : "handheld-", "-reader"), {
+  getHandheldReaderDetail: (t) => o.get("/handheld-reader/".concat(t)),
+  getHandheldReaderOptions: (t) => o.post("/handheld-reader/options", t),
+  putMarkHandheldStatus: (t, e, r) => o.patch("/".concat(t, "/status"), r, { params: e }),
+  postPingReaders: (t) => o.post("/iot-reader/ping", t),
+  putMarkIOTStatus: (t, e) => o.put("/".concat(e, "/mark-status"), t),
+  putEditReaderGroup: (t, e, r) => o.patch("/".concat(t, "-reader/").concat(r, "/group"), e),
+  putEditAntennaGroup: (t, e) => o.put("/iot-reader/".concat(e, "/set-port-group"), t),
+  putEditPortStatus: (t, e) => o.put("/iot-reader/".concat(e, "/set-port-status"), t),
+  putEditAliasName: (t, e, r) => o.patch("/".concat(t, "-reader/").concat(r, "/alias-name"), e),
+  postActivateHardware: (t, e) => o.post("/".concat(t, "-reader/activate"), e),
+  deleteHardware: (t, e) => o.delete("/".concat(t, "-reader"), {
     params: e
   }),
-  putAntennaPower: (t, e) => n.put("/iot-reader/".concat(e, "/set-antenna-power"), t),
-  getIOTReaderOrAntenna: (t, e) => n.get("/".concat(t), { params: e }),
-  getIOTReaderDetail: (t) => n.get("/iot-reader/".concat(t)),
-  getIOTReaderOrAntennaOptions: (t, e) => n.get("/".concat(t, "/options"), { params: e }),
-  getActivityLog: (t) => n.get("/activity-log", { params: t }),
-  getActivityLogOptions: (t) => n.get("/activity-log/options", { params: t }),
-  getDetailActivityLog: (t) => n.get("/activity-log", { params: t }),
-  getDetailActivityLogOptions: (t) => n.get("/activity-log/options", { params: t }),
-  getExistingAliasNames: () => n.get("/reader/alias-names"),
-  getIotReaderPort: (t, e) => n.get("/iot-reader/".concat(t, "/ports"), { params: e })
+  putAntennaPower: (t, e) => o.put("/iot-reader/".concat(e, "/set-antenna-power"), t),
+  getIotReader: (t) => {
+    const e = a({ ...t });
+    return o.post("/iot-reader", e);
+  },
+  getIotReaderDetail: (t) => o.get("/iot-reader/".concat(t)),
+  getIotReaderOptions: (t) => o.post("/iot-reader/options", t),
+  getIotReaderPort: (t, e) => o.post("/iot-reader/".concat(t, "/port/list"), { params: e }),
+  getIotReaderTablet: (t, e) => o.post("/iot-reader/".concat(t, "/tablet/list"), { params: e }),
+  getIotReaderTabletOptions: (t, e) => o.post("/iot-reader/".concat(t, "/tablet/options"), e),
+  putEditIotReader: (t, e) => o.patch("/iot-reader/".concat(t), e),
+  disconnectIotTablet: (t, e) => o.delete("/iot-reader/".concat(t, "/tablet"), {
+    data: e
+  }),
+  // TODO: Activity API spec not finished yet
+  getActivityLog: (t) => o.get("/activity-log", { params: t }),
+  getActivityLogOptions: (t) => o.get("/activity-log/options", { params: t }),
+  getDetailActivityLog: (t) => o.get("/activity-log", { params: t }),
+  getDetailActivityLogOptions: (t) => o.get("/activity-log/options", { params: t }),
+  getExistingAliasNames: () => o.get("/reader/alias-names")
 }, C = u({
   env: "APP_LOGS_NOTIFICATION_API",
   prefix: "/v2"
 }), V = {
   getSessionLogList: (t) => C.get("/session-log", { params: t })
-}, $ = u({
+}, T = u({
   prefix: "/v1/global-settings/option"
 }), Y = {
-  getPositions: () => $.get("/position"),
-  getDivisions: () => $.get("/division")
+  getPositions: () => T.get("/position"),
+  getDivisions: () => T.get("/division")
 }, v = u({
   prefix: "/v1/global-settings/position"
 }), z = {
@@ -228,18 +226,18 @@ const D = { BASE_URL: "/", DEV: !1, MODE: "production", PROD: !0, SSR: !1, VITE_
   prefix: "/tag/v2"
 }), X = {
   getTagInfo: (t) => N.get("/rfid-qr/scan", { params: t })
-}, f = u({
+}, b = u({
   prefix: "/v2/hardware-tagging"
 }), W = {
   getTAGEventlog: (t) => {
     const e = a(t);
-    return f.post("/tag-event-log/list", e);
+    return b.post("/tag-event-log/list", e);
   },
   getTAGEventlogOptions: (t) => {
     const e = a(t);
-    return f.post("/tag-event-log/options", e);
+    return b.post("/tag-event-log/options", e);
   },
-  getDetailTAGEventlog: (t) => f.get("/tag-event-log/".concat(t))
+  getDetailTAGEventlog: (t) => b.get("/tag-event-log/".concat(t))
 }, p = u({
   prefix: "/v1/global-settings/user"
 }), K = {
@@ -270,14 +268,14 @@ const D = { BASE_URL: "/", DEV: !1, MODE: "production", PROD: !0, SSR: !1, VITE_
   deleteCancelEmailChange: (t) => p.delete("/cancel-email-change/".concat(t)),
   postResendEmail: (t) => p.post("/resend-email", t),
   putChangePassword: (t, e) => p.put("/change-password/".concat(t), e)
-}, h = u({
+}, f = u({
   prefix: "/v2/hardware-tagging"
 }), Q = {
-  getTabletList: (t) => h.post("/tablet/list", t),
-  getTabletOption: (t) => h.post("/tablet/options", t),
-  updateTabletStatus: (t, e) => h.patch("/tablet/status", e, { params: { ids: t } }),
-  disconnectTablet: (t) => h.patch("/tablet/disconnect-reader", { params: { ids: t } }),
-  deleteTablet: (t) => h.delete("/tablet", { params: { ids: t } })
+  getTabletList: (t) => f.post("/tablet/list", t),
+  getTabletOption: (t) => f.post("/tablet/options", t),
+  updateTabletStatus: (t, e) => f.patch("/tablet/status", e, { params: { ids: t } }),
+  disconnectTablet: (t) => f.patch("/tablet/disconnect-reader", { params: { ids: t } }),
+  deleteTablet: (t) => f.delete("/tablet", { params: { ids: t } })
 }, s = u({
   prefix: "/v2/iam"
 }), Z = {
@@ -313,8 +311,8 @@ const D = { BASE_URL: "/", DEV: !1, MODE: "production", PROD: !0, SSR: !1, VITE_
   },
   createUsers: (t) => {
     const e = new FormData();
-    return Object.entries(t).forEach(([r, o]) => {
-      o != null && e.append(r, o);
+    return Object.entries(t).forEach(([r, n]) => {
+      n != null && e.append(r, n);
     }), s.post("/users", e, {
       headers: { "Content-Type": "multipart/form-data" }
     });
@@ -334,8 +332,8 @@ const D = { BASE_URL: "/", DEV: !1, MODE: "production", PROD: !0, SSR: !1, VITE_
   },
   editUsers: (t, e) => {
     const r = new FormData();
-    return Object.entries(e).forEach(([o, i]) => {
-      i != null && r.append(o, i);
+    return Object.entries(e).forEach(([n, i]) => {
+      i != null && r.append(n, i);
     }), s.patch("/users/".concat(t), r, {
       headers: { "Content-Type": "multipart/form-data" }
     });
@@ -377,7 +375,7 @@ export {
   W as TagEventlogServices,
   X as TagServices,
   K as UserServices,
-  O as getBaseURL,
+  I as getBaseURL,
   B as getImageURL,
   J as queryParamsStringfy
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tagsamurai/gsts-api-services",
-  "version": "2.0.1-alpha.16",
+  "version": "2.0.1-alpha.18",
   "author": "developer.tagsamurai",
   "description": "Global Settings Tag Samurai Services Library",
   "module": "./api-services.es.js",

package/src/dto/dataTable.dto.d.ts

@@ -1,5 +1,4 @@
 import { MultiSelectOption } from '../types/options.type';
-import { ApplicationModule } from '../types/tag.type';
 export type FilterOptions = {
     skuOptions?: MultiSelectOption[];
     statusOptions?: MultiSelectOption[];
@@ -20,24 +19,3 @@ export type FilterOptions = {
     actionOptions?: MultiSelectOption[];
     objectNameOptions?: MultiSelectOption[];
 };
-export type BooleanOptions = {
-    tab?: 'Available' | 'Damaged/Missing';
-    deviceNameOptions?: boolean;
-    nameOptions?: boolean;
-    userFullNameOptions?: boolean;
-    networkStatusOptions?: boolean;
-    brandOptions?: boolean;
-    modelOptions?: boolean;
-    moduleOptions?: boolean;
-    reportedByOptions?: boolean;
-    modifiedByOptions?: boolean;
-    fieldOptions?: boolean;
-    activityOptions?: boolean;
-    pairedInOptions?: boolean;
-    availabilityOptions?: boolean;
-    module?: ApplicationModule;
-    status?: string;
-    skuOptions?: boolean;
-    statusOptions?: boolean;
-    typeOptions?: boolean;
-};

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

@@ -1,80 +1,21 @@
-import { AntennaPortDetail, HandheldDataType, HandheldDetailDataType, HardwareDataType, HardwareDetailDataType } from '../types/hardware.type';
-import { MultiSelectOption } from '../types/options.type';
+import { TableParams } from '../types/dataTable.type';
+import { Tab } from '../types/tablet.type';
 type TAG = 'RFID' | 'NFC';
-export interface HardwareFetchResponse<T = HardwareDataType> {
-    message: string;
-    status: number;
-    data: {
-        data: T[];
-        totalRecords: number;
-    };
-}
-export interface HandheldFetchResponse<T = HandheldDataType> {
-    message: string;
-    data: {
-        data: T[];
-        totalRecords: number;
-    };
-}
-export interface HardwareFetchDetailResponse<T = HardwareDetailDataType> {
-    message: string;
-    status: number;
-    data: T;
-}
-export interface HandheldFetchDetailResponse<T = HandheldDetailDataType> {
-    message: string;
-    status: number;
-    data: T;
-}
-export type HardwareFetchOptionResponse<Opt = Record<string, boolean>> = Record<keyof Opt, MultiSelectOption[]>;
-export interface HardwareShortFetchResponse<T = AntennaPortDetail> {
-    message: string;
-    status: number;
-    data: T[];
-}
-export type HardwareFilterRaw = {
-    tab?: 'Available' | 'Damaged/Missing';
-    page?: number;
-    limit?: number;
-    sortBy?: string;
-    sortOrder?: number;
-    search?: string;
-    column?: string[];
+export interface HandheldFilterRaw extends TableParams {
+    tab?: Tab;
     deviceName?: string[];
-    name?: number[];
     type?: string[];
-    readerGroup?: number[];
-    readerType?: string;
-    networkStatus?: string[];
-    brand?: number[];
-    model?: number[];
     status?: string[];
-    tag?: string;
     sku?: string[];
-    groupModule?: string[];
     group?: string[];
-    antennaGroupModule?: string[];
-    antennaGroup?: number[];
-    userFullName?: number[];
-    action?: string[];
     reportedBy?: string[];
     reportedAt?: number[];
-    createdAt?: number[];
-    lastReportDate?: number[];
-};
-export type HardwareFilterQuery = Partial<Record<keyof HardwareFilterRaw, string>>;
-export type HardwareDetailFilterRaw = {
-    date?: number[];
-    readerId?: string;
-    groupModule?: string[];
-    antennaGroupModule?: string[];
-    action?: string[];
-    userFullName?: number[];
-    modifiedBy?: number[];
-    isActive?: string[];
-    field?: string[];
-};
-export type HardwareDetailFilterQuery = Partial<Record<keyof HardwareDetailFilterRaw, string>>;
+}
+export interface HandheldOptions {
+    deviceNameOptions?: boolean;
+    skuOptions?: boolean;
+    reportedByOptions?: boolean;
+}
 export type DetailTableFilterParams = {
     createdAt?: string;
     activity?: string;
@@ -89,9 +30,42 @@ export type DetailTableFilterParams = {
     group?: string;
     tag?: string;
 };
-export type DetailTableFilteredParams = Partial<Record<keyof DetailTableFilterParams, string>>;
+export interface IotFilterRaw extends TableParams {
+    tab?: Tab;
+    deviceName?: string[];
+    sku?: string[];
+    networkStatus?: string[];
+    brand?: string[];
+    model?: string[];
+    type?: string[];
+    readerGroup?: string[];
+    portGroup?: string[];
+    status?: string[];
+    reportedBy?: string[];
+    reportedAt?: number[];
+}
+export interface IotOptions {
+    deviceNameOptions?: boolean;
+    skuOptions?: boolean;
+    brandOptions?: boolean;
+    modelOptions?: boolean;
+    typeOptions?: boolean;
+    reportedByOptions?: boolean;
+}
+export interface IotPortFilterRaw extends TableParams {
+    isActive: boolean[];
+    group: string[];
+}
+export interface IotTabletFilterRaw extends TableParams {
+    deviceName: string[];
+}
+export interface IotTabletOptions {
+    deviceNameOptions?: boolean;
+    skuOptions?: boolean;
+    reportedByOptions?: boolean;
+}
 export interface PutEditAliasName {
-    aliasName: string;
+    aliasName: string | null;
 }
 export interface PostActivateHardware {
     serialNumber: string;
@@ -107,6 +81,34 @@ export interface PutEditReaderGroup {
     receivingFixedAssetGroup?: string[];
     receivingSupplyAssetGroup?: string[];
 }
+export interface PutEditIotReader {
+    antennaPower: number[];
+    rssi: number;
+}
+export interface SmartFixedReaderBody extends PutEditIotReader {
+    type: 'Smart Fixed Reader';
+    smartFixedReaderGroup?: SmartFixedReaderGroup;
+    portGroup?: SmartFixedReaderGroup[];
+}
+export interface AssetControlBody extends PutEditIotReader {
+    type: 'Asset Control';
+    assetControlSize: 'Small' | 'Medium' | 'Large';
+    assetControlReaderGroup: AssetControlReaderGroup;
+    portDirection: string[];
+}
+interface AssetControlReaderGroup {
+    fixedAsset?: FixedAsset;
+    supplyAsset?: FixedAsset;
+}
+interface FixedAsset {
+    group?: string;
+    isRoleRestricted: boolean;
+    receivingGroups: string[];
+}
+interface SmartFixedReaderGroup {
+    fixedAsset?: string;
+    supplyAsset?: string;
+}
 export interface PutEditAntennaGroup {
     group: Omit<PutEditReaderGroup, 'receivingFixedAssetGroup' | 'receivingSupplyAssetGroup'>[];
 }
@@ -119,28 +121,22 @@ export interface PutEditPortStatus {
         port: number;
     }[];
 }
-export interface PutPingReadersBody {
+export interface PostPingReadersBody {
     ids: string[];
 }
 export interface PutHardwareStatusBody {
     status: 'Missing' | 'Damaged' | 'Available';
-    ids?: string[];
 }
 export type HardwareFormType = PutEditAliasName | PutEditAntennaGroup | PutEditAntennaPower | PutHardwareStatusBody | PutEditReaderGroup;
-export type GetAllTAGParams = {
-    page?: number;
-    limit?: number;
-    search?: string;
+export interface GetAllTAGParams extends TableParams {
     sortBy?: string;
-    sortOrder?: number;
-    column?: string[];
     tagType?: string[];
     rfidSku?: string[];
     nfcSku?: string[];
     type?: string[];
     status?: string[];
     lastScanned?: string[];
-};
+}
 export type GetAllTAGOptionsQuery = {
     tagTypeOptions?: boolean;
     rfidSkuOptions?: boolean;

package/src/dto/iam.dto.d.ts

@@ -1,4 +1,4 @@
-import { QueryParams } from '../types/fetchResponse.type';
+import { TableParams } from '../types/dataTable.type';
 import { GlobalUserOptions, ModuleAccess } from '../types/iam.type';
 export interface LoginPayload {
     email: string;
@@ -14,20 +14,12 @@ export interface SetPasswordPayload {
     token: string;
     password: string;
 }
-export interface BaseParams extends QueryParams {
-    page?: number;
-    limit?: number;
-    search?: string;
-    sortBy?: string;
-    sortOrder?: number;
-    column?: string[];
-}
-export interface GetPositionListParams extends BaseParams {
+export interface GetPositionListParams extends TableParams {
 }
 export interface CreateEditPositionPayload {
     name: string;
 }
-export interface GetDivisionListParams extends BaseParams {
+export interface GetDivisionListParams extends TableParams {
 }
 export interface CreateEditDivisionPayload {
     name: string;
@@ -44,7 +36,7 @@ export interface CreateUserPayload {
     expiryDate?: string;
     tag?: string;
 }
-export interface GetGlobalUserListParams extends BaseParams {
+export interface GetGlobalUserListParams extends TableParams {
     isActive?: boolean[];
     position?: string[];
     division?: string[];
@@ -73,7 +65,7 @@ export interface ChangePasswordPayload {
 export interface ModuleAuthPayload {
     module: ModuleAccess;
 }
-export interface GetConcurrentUsersParams extends BaseParams {
+export interface GetConcurrentUsersParams extends TableParams {
 }
 export interface LogoutSessionPayload {
     sessionId: string;

package/src/dto/tablet.dto.d.ts

@@ -1,14 +1,9 @@
+import { TableParams } from '../types/dataTable.type';
 import { FetchDetailResponse, FetchResponse } from '../types/fetchResponse.type';
 import { MultiSelectOption } from '../types/options.type';
 import { Tab, Tablet } from '../types/tablet.type';
-export interface GetTabletListQuery {
+export interface GetTabletListQuery extends TableParams {
     tab?: Tab;
-    page?: number;
-    limit?: number;
-    sortBy?: string;
-    sortOrder?: number;
-    search?: string;
-    column?: string[];
     deviceName?: string[];
     status?: string[];
     group?: string[];

package/src/dto/tag.dto.d.ts

@@ -29,7 +29,6 @@ export interface TAGFilterRaw {
     supplyAssetGroup?: number[];
     tag?: string[];
 }
-export type TAGFilterQuery = Partial<Record<keyof TAGFilterRaw, string>>;
 export interface PUTAuditTAGBody {
     ids: string[];
     markNotFoundAsDamagedMissing: boolean;

package/src/dto/tagEventlog.dto.d.ts

@@ -1,13 +1,9 @@
+import { TableParams } from '../types/dataTable.type';
 import { FetchListResponse, FetchOptionResponse } from '../types/fetchResponse.type';
 import { MultiSelectOption } from '../types/options.type';
 import { TAGEventlogData } from '../types/tagEventlog.type';
-export interface TAGEventlogFilterQuery {
-    page?: number;
-    limit?: number;
-    search?: string;
+export interface TAGEventlogFilterQuery extends TableParams {
     sortBy?: string;
-    sortOrder?: number;
-    column?: string[];
     type?: string;
     createdAt?: string[];
     action?: string[];
@@ -48,7 +44,7 @@ export type TAGEventlogDetailResponse = {
 };
 export type GetTAGEventLogOptionsBody = {
     type: 'Audit TAG' | 'Combine & Separate TAG';
-    modifiedByOptions: boolean;
-    actionOptions: boolean;
-    moduleOptions: boolean;
+    modifiedByOptions?: boolean;
+    actionOptions?: boolean;
+    moduleOptions?: boolean;
 };

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

@@ -1,15 +1,18 @@
 import { AxiosResponse } from 'axios';
-import { BooleanOptions } from '../dto/dataTable.dto';
-import { DeleteHardware, HandheldFetchDetailResponse, HandheldFetchResponse, HardwareDetailFilterQuery, HardwareFetchDetailResponse, HardwareFetchOptionResponse, HardwareFetchResponse, HardwareFilterQuery, PostActivateHardware, PutEditAliasName, PutEditAntennaGroup, PutEditAntennaPower, PutEditPortStatus, PutEditReaderGroup, PutHardwareStatusBody, PutPingReadersBody } from '../dto/hardware.dto';
-import { AntennaPortDetail, HardwareDataType, HardwareDetailUserActivity } from '../types/hardware.type';
+import { DeleteHardware, HandheldFilterRaw, HandheldOptions, IotFilterRaw, IotOptions, IotPortFilterRaw, IotTabletFilterRaw, IotTabletOptions, PostActivateHardware, PutEditAliasName, PutEditAntennaGroup, PutEditAntennaPower, PutEditPortStatus, PutEditReaderGroup, PutHardwareStatusBody, PostPingReadersBody, SmartFixedReaderBody, AssetControlBody } from '../dto/hardware.dto';
+import { AntennaPortDetail, HandheldDataType, HandheldDetailDataType, HardwareDetailUserActivity, IotDataType, IotDetailDataType, IotTablet, PingIot } from '../types/hardware.type';
+import { FetchDetailResponse, FetchListResponse, FetchOptionResponse, FilterQuery, ShortFetchListResponse } from '../types/fetchResponse.type';
+import { Tab } from '../types/tablet.type';
 declare const HardwareServices: {
-    getHandheldReader: (params?: HardwareFilterQuery) => Promise<AxiosResponse<HandheldFetchResponse>>;
-    getHandheldReaderDetail: (handheldId?: string) => Promise<AxiosResponse<HandheldFetchDetailResponse>>;
-    getHandheldReaderOptions: (params?: BooleanOptions) => Promise<AxiosResponse<{
-        data: HardwareFetchOptionResponse;
+    getHandheldReader: (params?: FilterQuery<HandheldFilterRaw>) => Promise<AxiosResponse<FetchListResponse<HandheldDataType>>>;
+    getHandheldReaderDetail: (handheldId?: string) => Promise<AxiosResponse<FetchDetailResponse<HandheldDetailDataType>>>;
+    getHandheldReaderOptions: (body?: HandheldOptions & {
+        tab?: Tab;
+    }) => Promise<AxiosResponse<{
+        data: FetchOptionResponse<HandheldOptions>;
     }>>;
-    putMarkHandheldStatus: (body: PutHardwareStatusBody) => Promise<AxiosResponse>;
-    putPingReaders: (body: PutPingReadersBody) => Promise<AxiosResponse>;
+    putMarkHandheldStatus: (moduleTab: "iot" | "handheld", ids: string[], body: PutHardwareStatusBody) => Promise<AxiosResponse>;
+    postPingReaders: (body: PostPingReadersBody) => Promise<AxiosResponse<ShortFetchListResponse<PingIot>>>;
     putMarkIOTStatus: (body: PutHardwareStatusBody, subTab: "iot-reader" | "antenna") => Promise<AxiosResponse>;
     putEditReaderGroup: (moduleTab: "iot" | "handheld", body: PutEditReaderGroup, hardwareId?: string) => Promise<AxiosResponse>;
     putEditAntennaGroup: (body: PutEditAntennaGroup, hardwareId?: string) => Promise<AxiosResponse>;
@@ -18,20 +21,28 @@ declare const HardwareServices: {
     postActivateHardware: (moduleTab: "iot" | "handheld", body: PostActivateHardware) => Promise<AxiosResponse>;
     deleteHardware: (moduleTab: "iot" | "handheld", params?: DeleteHardware) => Promise<AxiosResponse>;
     putAntennaPower: (body: PutEditAntennaPower, iotId?: string) => Promise<AxiosResponse>;
-    getIOTReaderOrAntenna: (subTab: "iot-reader" | "antenna", params?: HardwareFilterQuery) => Promise<AxiosResponse<HardwareFetchResponse>>;
-    getIOTReaderDetail: (iotId?: string) => Promise<AxiosResponse<HardwareFetchDetailResponse>>;
-    getIOTReaderOrAntennaOptions: (subTab: "iot-reader" | "antenna", params?: BooleanOptions) => Promise<AxiosResponse<{
-        data: HardwareFetchOptionResponse;
+    getIotReader: (params?: FilterQuery<IotFilterRaw>) => Promise<AxiosResponse<FetchListResponse<IotDataType>>>;
+    getIotReaderDetail: (iotId?: string) => Promise<AxiosResponse<FetchDetailResponse<IotDetailDataType>>>;
+    getIotReaderOptions: (params?: IotOptions & {
+        tab?: Tab;
+    }) => Promise<AxiosResponse<{
+        data: FetchOptionResponse<IotOptions>;
     }>>;
-    getActivityLog: (params?: HardwareFilterQuery) => Promise<AxiosResponse<HardwareFetchResponse<HardwareDataType>>>;
-    getActivityLogOptions: (params?: BooleanOptions) => Promise<AxiosResponse<{
-        data: HardwareFetchOptionResponse;
+    getIotReaderPort: (id: string, params?: FilterQuery<IotPortFilterRaw>) => Promise<AxiosResponse<FetchListResponse<AntennaPortDetail>>>;
+    getIotReaderTablet: (id: string, params?: FilterQuery<IotTabletFilterRaw>) => Promise<AxiosResponse<FetchListResponse<IotTablet>>>;
+    getIotReaderTabletOptions: (id: string, params?: IotTabletOptions) => Promise<AxiosResponse<{
+        data: FetchOptionResponse<IotTabletOptions>;
     }>>;
-    getDetailActivityLog: (params?: HardwareDetailFilterQuery) => Promise<AxiosResponse<HardwareFetchResponse<HardwareDetailUserActivity>>>;
-    getDetailActivityLogOptions: (params?: BooleanOptions) => Promise<AxiosResponse<{
-        data: HardwareFetchOptionResponse;
+    putEditIotReader: (id: string, body: SmartFixedReaderBody | AssetControlBody) => Promise<AxiosResponse>;
+    disconnectIotTablet: (id: string, body?: DeleteHardware) => Promise<AxiosResponse>;
+    getActivityLog: (params?: FilterQuery) => Promise<AxiosResponse<FetchListResponse>>;
+    getActivityLogOptions: (params?: Record<string, boolean>) => Promise<AxiosResponse<{
+        data: FetchOptionResponse;
+    }>>;
+    getDetailActivityLog: (params?: FilterQuery) => Promise<AxiosResponse<FetchListResponse<HardwareDetailUserActivity>>>;
+    getDetailActivityLogOptions: (params?: Record<string, boolean>) => Promise<AxiosResponse<{
+        data: FetchOptionResponse;
     }>>;
     getExistingAliasNames: () => Promise<AxiosResponse>;
-    getIotReaderPort: (id: string, params?: HardwareDetailFilterQuery) => Promise<AxiosResponse<HardwareFetchResponse<AntennaPortDetail>>>;
 };
 export default HardwareServices;

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

@@ -1,12 +1,14 @@
+import { QueryParams } from './fetchResponse.type';
 export type ChildGroup = {
     groupHeader: string;
     groupItems: Data[];
 };
-export type TableParams = {
-    search?: string;
+export interface TableParams extends QueryParams {
     page?: number;
     limit?: number;
     sortBy?: string;
     sortOrder?: number;
-};
+    search?: string;
+    column?: string[];
+}
 export type Data = Record<string, unknown>;

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

@@ -27,6 +27,7 @@ export type FetchOptionResponse<Opt = Record<string, boolean>> = {
     message: string;
     data: FilterOptions<Opt>;
 };
+export type FilterQuery<T = Record<string, any>> = Partial<Record<keyof T, string>>;
 export type StatusMessageResponse = {
     status: number;
     message: string;

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

@@ -1,112 +1,73 @@
 import { FetchResponse } from './fetchResponse.type';
 export type HardwareTabType = 'activity-log' | 'handheld-damaged-missing' | 'handheld' | 'iot-reader' | 'iot-antenna' | 'iot-damaged-missing-reader' | 'iot-damaged-missing-antenna';
 export type HardwareDetailTabType = 'All' | 'Tagging' | 'User' | 'Antenna' | 'Changelog';
-export type ModuleGroup = {
-    _id: string;
-    key: number;
-    name: string;
-    module: 'fixedAsset' | 'supplyAsset';
-};
-export interface HardwareDataType {
-    _id: string;
-    imageSmall?: string;
-    imageBig?: string;
-    name: string;
-    sku: string;
-    aliasName?: string;
-    brand?: string;
-    model?: string;
-    type: string;
-    networkStatus?: 'Online' | 'Offline';
-    status: string;
-    createdAt?: string;
-    updatedAt?: string;
-    group?: ModuleGroup[];
-    antennaGroup?: {
-        port?: number;
-        groups?: ModuleGroup[];
-    }[];
-    activePort?: string;
-    reportedBy?: string;
-    lastReportDate?: string;
-    action?: string;
-    userFullName?: string;
-    readerName?: string;
-}
 export interface HardwareDetailDataType {
-    _id: string;
-    imageSmall?: string;
-    imageBig?: string;
-    readerName?: string;
-    serialNumber?: string;
-    name: {
-        _id: string;
-        nameWithSequence: string;
-        name: string;
-        key: number;
-        nameNumber?: number;
-    };
-    aliasName?: string;
-    networkStatus?: 'Online' | 'Offline';
-    lastReportDate?: string;
-    group?: ModuleGroup[];
-    brand?: {
-        name?: string;
-        key?: number;
-    };
-    model?: {
-        name?: string;
-        key?: number;
-    };
-    manager?: {
-        _id: string;
-        name?: string;
-        key?: number;
-    };
-    type: string;
-    status: string;
-    key: number;
-}
-export interface HandheldDataType {
     _id: string;
     image?: string;
     deviceName: string;
     sku: string;
     serialNumber: string;
     aliasName?: string;
+}
+export interface HandheldDataType extends HandheldDetailDataType {
+    reportedBy?: string;
+    reportedAt?: Date;
+}
+export interface HandheldDetailDataType extends HardwareDetailDataType {
     type: string;
     status: string;
-    group?: {
+    group: {
         fixedAsset?: string;
         supplyAsset?: string;
         admin?: string;
     };
+}
+export interface IotGroup {
+    fixedAsset?: string;
+    supplyAsset?: string;
+}
+export interface IotGroupList {
+    fixedAsset: (string | null)[];
+    supplyAsset: (string | null)[];
+}
+export interface IotDataType extends Omit<IotDetailDataType, 'rssi'> {
+    connectedTablet: number;
+    status: string;
+    portGroup: IotGroupList;
     reportedBy?: string;
-    reportedAt?: Date;
+    reportedAt?: string;
+}
+export interface IotDetailDataType extends HardwareDetailDataType {
+    activePort: string;
+    networkStatus: string;
+    brand: string;
+    model: string;
+    type: string;
+    readerGroup: IotGroup;
+    rssi: string;
 }
-export interface HandheldDetailDataType {
+export interface IotPort {
+    _id: string;
+    isActive: boolean;
+    port: string;
+    portGroup: IotGroupList;
+    antennaPower: string;
+}
+export interface IotTablet {
     _id: string;
-    image?: string;
     deviceName: string;
-    sku: string;
-    serialNumber: string;
-    aliasName?: string;
-    type: string;
-    status: string;
-    group?: {
-        fixedAsset?: string;
-        supplyAsset?: string;
-        admin?: string;
-    };
+    deviceId: string;
 }
 export interface AntennaPortDetail {
     _id: number;
     isActive: boolean;
     port: string;
-    group: ModuleGroup[];
+    portGroup: IotGroup;
     antennaPower: string;
-    powerInt: number;
-    invalid?: boolean;
+}
+export interface PingIot {
+    _id: string;
+    isOnline: boolean;
 }
 export interface HardwareDetailUserActivity {
     _id: string;