@tagsamurai/gsts-api-services 1.1.0-alpha.8 → 1.1.0-staging-local.1

package/api-services.es.js

@@ -1,29 +1,29 @@
 import L from "axios";
-const C = { BASE_URL: "/", DEV: !1, MODE: "production", PROD: !0, SSR: !1, VITE_APP_TAGSAMURAI_API: "https://dev-api.tagsamurai.local" }, T = (t = "APP_TAGSAMURAI_API") => C["VITE_" + t], i = (t = {}, e = !1) => {
+const C = { BASE_URL: "/", DEV: !1, MODE: "production", PROD: !0, SSR: !1, VITE_APP_TAGSAMURAI_API: "https://staging-api.tagsamurai.local" }, T = (t = "APP_TAGSAMURAI_API") => C["VITE_" + t], a = (t = {}, e = !1) => {
   const {
     env: r = "APP_TAGSAMURAI_API",
-    prefix: n = "",
-    headers: u = {},
-    ...f
-  } = t, w = "".concat(T(r)).concat(n), b = L.create({
-    ...f,
+    prefix: o = "",
+    headers: i = {},
+    ...b
+  } = t, w = "".concat(T(r)).concat(o), v = L.create({
+    ...b,
     baseURL: w,
-    headers: e ? u : {
+    headers: e ? i : {
       "Content-Type": "application/json",
-      ...u
+      ...i
     }
   });
-  return b.interceptors.request.use((v) => {
+  return v.interceptors.request.use((y) => {
     var S, P, h;
     const $ = JSON.parse((S = localStorage.getItem("user")) != null ? S : "{}"), R = (h = (P = $.jwt) != null ? P : $.token) != null ? h : "";
-    return v.headers.Authorization = "Bearer ".concat(R), v;
-  }), b;
-}, l = i({
+    return y.headers.Authorization = "Bearer ".concat(R), y;
+  }), v;
+}, l = a({
   prefix: "/global-settings/auth"
 }), E = (t) => {
-  var e, r, n, u;
-  return ((e = t.response) == null ? void 0 : e.status) === 401 || ((r = t.response) == null ? void 0 : r.status) === 500 || ((u = (n = t.response) == null ? void 0 : n.data) == null ? void 0 : u.message) === "jwt malformed" ? (window.onblur = null, window.onfocus = null, window.sessionExpired = !0, window.dispatchEvent(new CustomEvent("user:expired"))) : Promise.reject(t);
-}, j = {
+  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);
+}, k = {
   login: (t) => {
     const e = { ...t, isMobile: !1 };
     return l.post("/login", e);
@@ -50,17 +50,17 @@ const C = { BASE_URL: "/", DEV: !1, MODE: "production", PROD: !0, SSR: !1, VITE_
    */
   logout: () => l.post("/logout")
 }, U = (t, e, r) => {
-  const n = new URL(T("APP_TAGSAMURAI_API") || "").origin;
-  let u = t.startsWith("http") ? t : "".concat(n, "/file-storage/api/file/").concat(t.replace(/^\/+/, ""));
+  const o = new URL(T("APP_TAGSAMURAI_API") || "").origin;
+  let i = t.startsWith("http") ? t : "".concat(o, "/file-storage/api/file/").concat(t.replace(/^\/+/, ""));
   if (e || r) {
-    const f = new URLSearchParams();
-    e && (f.set("width", e.toString()), f.set("height", (r == null ? void 0 : r.toString()) || e.toString())), u += "?".concat(f.toString());
+    const b = new URLSearchParams();
+    e && (b.set("width", e.toString()), b.set("height", (r == null ? void 0 : r.toString()) || e.toString())), i += "?".concat(b.toString());
   }
-  return u;
+  return i;
 }, x = () => {
-  var e, r, n;
+  var e, r, o;
   const t = JSON.parse((e = localStorage.getItem("user")) != null ? e : "{}");
-  return (n = (r = t.jwt) != null ? r : t.token) != null ? n : "";
+  return (o = (r = t.jwt) != null ? r : t.token) != null ? o : "";
 }, D = async (t, e) => {
   const r = await fetch(t, {
     headers: {
@@ -69,8 +69,8 @@ const C = { 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 n = await r.arrayBuffer();
-  return new Blob([n], {
+  const o = await r.arrayBuffer();
+  return new Blob([o], {
     type: r.headers.get("Content-Type") || "image/webp"
   });
 }, _ = async (t) => {
@@ -80,10 +80,10 @@ const C = { BASE_URL: "/", DEV: !1, MODE: "production", PROD: !0, SSR: !1, VITE_
   } catch (e) {
     return;
   }
-}, B = async (t, e, r, n) => {
+}, B = async (t, e, r, o) => {
   if (!t) return;
-  const u = U(t, e, r);
-  return n ? u : _(u);
+  const i = U(t, e, r);
+  return o ? i : _(i);
 }, J = (t) => {
   if (!t || typeof t == "string")
     return;
@@ -100,95 +100,97 @@ const C = { BASE_URL: "/", DEV: !1, MODE: "production", PROD: !0, SSR: !1, VITE_
   const e = t.trim();
   if (!e) return !1;
   try {
-    return JSON.parse(e), !0;
+    const r = JSON.parse(e);
+    return typeof r == "object" && r !== null;
   } catch (r) {
     return !1;
   }
-}, o = (t) => {
+}, n = (t) => {
   if (!t)
     return {};
   const e = {};
   return Object.keys(t).forEach((r) => {
-    const n = t[r];
-    e[r] = G(n) ? JSON.parse(n.trim()) : n;
+    const o = t[r], i = G(o) ? JSON.parse(o.trim()) : o;
+    e[r] = Array.isArray(i) && i.length === 0 ? void 0 : i;
   }), e;
-}, p = i({
-  prefix: "/global-settings/change-log"
+}, p = a({
+  prefix: "/global-settings"
 }), M = {
-  getChangelogs: (t) => {
-    const e = o(t);
-    return p.post("/change-log/list", e);
-  },
-  getChangelogOptions: (t) => p.post("/change-log/options", t),
+  getChangelogs: (t) => p.get("/change-log", { params: t }),
+  getChangelogOptions: (t) => p.get("/change-log/options", { params: t }),
   getSessionList: (t) => {
-    const e = o(t);
+    const e = n(t);
     return p.post("/session-log/list", e);
   },
   getSessionOptions: (t) => p.post("/session-log/options", t),
   getHardwareChangelogs: (t) => {
-    const e = o(t);
+    const e = n(t);
     return p.post("/hardware-change-log/list", e);
   },
   getHardwareOptions: (t) => p.post("/hardware-change-log/options", t),
   getTaggingList: (t) => {
-    const e = o(t);
+    const e = n(t);
     return p.post("/reader-tagging-log/list", e);
   },
   getTaggingOptions: (t) => p.post("/reader-tagging-log/options", t),
   getUserTagList: (t) => {
-    const e = o(t);
+    const e = n(t);
     return p.post("/reader-user-tag-log/list", e);
   },
   getUserTagOptions: (t) => p.post("/reader-user-tag-log/options", t)
-}, m = i({
+}, d = a({
   prefix: "/global-settings/division"
 }), H = {
-  getDivisions: (t) => m.get("", { params: t }),
-  getDivisionDetail: (t) => m.get("/".concat(t)),
-  postCreateDivision: (t) => m.post("/", t),
-  putEditDivision: (t, e) => m.put("/".concat(t), e),
+  getDivisions: (t) => d.get("", { params: t }),
+  getDivisionDetail: (t) => d.get("/".concat(t)),
+  postCreateDivision: (t) => d.post("/", t),
+  putEditDivision: (t, e) => d.put("/".concat(t), e),
   deleteDivisions: (t) => {
     const e = { id: JSON.stringify(t) };
-    return m.delete("", { params: e });
+    return d.delete("", { params: e });
+  },
+  getAvailableDivision: (t) => {
+    const e = { name: t };
+    return d.get("/available", { params: e });
   }
-}, a = i({
+}, g = a({
   prefix: "/global-settings"
 }), q = {
   getAllTAG: (t) => {
-    const e = o(t);
-    return a.post("/all-tag/list", e);
+    const e = n(t);
+    return g.post("/all-tag/list", e);
   },
   getAllTAGOptions: (t) => {
-    const e = o(t);
-    return a.post("all-tag/options", e);
+    const e = n(t);
+    return g.post("all-tag/options", e);
   },
-  getNotPairedYetCounts: () => a.get("/not-paired-yet/tag-count"),
+  getNotPairedYetCounts: () => g.get("/not-paired-yet/tag-count"),
   getNotPairedYetList: (t) => {
-    const e = o(t);
-    return a.post("/not-paired-yet/list", e);
+    const e = n(t);
+    return g.post("/not-paired-yet/list", e);
   },
   getNotPairedYetOptions: (t) => {
-    const e = o(t);
-    return a.post("/not-paired-yet/options", e);
+    const e = n(t);
+    return g.post("/not-paired-yet/options", e);
   },
-  getAuditTAGDetail: (t) => a.post("/audit/detail", t),
-  submitAuditTAG: (t) => a.post("/audit/submit", t),
-  submitCombineTAG: (t) => a.post("/combine-tag/combine", t),
-  submitSeparateTAG: (t) => a.post("/combine-tag/separate", t),
+  getAuditTAGDetail: (t) => g.post("/audit/detail", t),
+  submitAuditTAG: (t) => g.post("/audit/submit", t),
+  submitCombineTAG: (t) => g.post("/combine-tag/combine", t),
+  submitSeparateTAG: (t) => g.post("/combine-tag/separate", t),
   getPairedList: (t) => {
-    const e = o(t);
-    return a.post("/paired/list", e);
+    const e = n(t);
+    return g.post("/paired/list", e);
   },
   getPairedOptions: (t) => {
-    const e = o(t);
-    return a.post("/paired/options", e);
+    const e = n(t);
+    return g.post("/paired/options", e);
   },
-  getScanTag: (t) => a.get("/scan-tag", { params: { tag: t } })
-}, s = i({
+  getScanTag: (t) => g.get("/scan-tag", { params: { tag: t } })
+}, s = a({
   prefix: "/global-settings"
 }), V = {
   getHandheldReader: (t) => {
-    const e = o(t);
+    const e = n(t);
     return s.post("/handheld-reader/list", e);
   },
   getHandheldReaderDetail: (t) => s.get("/handheld-reader/".concat(t)),
@@ -206,7 +208,7 @@ const C = { BASE_URL: "/", DEV: !1, MODE: "production", PROD: !0, SSR: !1, VITE_
   }),
   putAntennaPower: (t, e) => s.put("/iot-reader/".concat(e, "/set-antenna-power"), t),
   getIotReader: (t) => {
-    const e = o({ ...t });
+    const e = n({ ...t });
     return s.post("/iot-reader", e);
   },
   getIotReaderDetail: (t) => s.get("/iot-reader/".concat(t)),
@@ -224,97 +226,98 @@ const C = { BASE_URL: "/", DEV: !1, MODE: "production", PROD: !0, SSR: !1, VITE_
   getDetailActivityLog: (t) => s.get("/activity-log", { params: t }),
   getDetailActivityLogOptions: (t) => s.get("/activity-log/options", { params: t }),
   getExistingAliasNames: () => s.get("/reader/alias-names")
-}, F = i({
+}, F = a({
   prefix: "/fam/utility/v2"
 }), Y = {
   getSessionLogList: (t) => F.get("/session-log", { params: t })
-}, I = i({
+}, I = a({
   prefix: "/global-settings/option"
 }), z = {
   getPositions: () => I.get("/position"),
   getDivisions: () => I.get("/division")
-}, y = i({
+}, f = a({
   prefix: "/global-settings/position"
 }), W = {
-  getPositions: (t) => y.get("", { params: t }),
-  getPositionDetail: (t) => y.get("/".concat(t)),
-  postCreatePosition: (t) => y.post("/", t),
-  putEditPosition: (t, e) => y.put("/".concat(t), e),
+  getPositions: (t) => f.get("", { params: t }),
+  getPositionDetail: (t) => f.get("/".concat(t)),
+  postCreatePosition: (t) => f.post("/", t),
+  putEditPosition: (t, e) => f.put("/".concat(t), e),
   deletePositions: (t) => {
     const e = { id: JSON.stringify(t) };
-    return y.delete("", { params: e });
+    return f.delete("", { params: e });
+  },
+  getAvailablePosition: (t) => {
+    const e = { name: t };
+    return f.get("/available", { params: e });
   }
-}, N = i({
+}, N = a({
   prefix: "/fam/tag/v2"
 }), K = {
   getTagInfo: (t) => N.get("/rfid-qr/scan", { params: t })
-}, A = i({
+}, A = a({
   prefix: "/global-settings/change-log"
 }), Q = {
   getTAGEventlog: (t) => {
-    const e = o(t);
+    const e = n(t);
     return A.post("/tag-event-log/list", e);
   },
   getTAGEventlogOptions: (t) => {
-    const e = o(t);
+    const e = n(t);
     return A.post("/tag-event-log/options", e);
   },
   getDetailTAGEventlog: (t) => A.get("/tag-event-log/".concat(t))
-}, g = i({
+}, u = a({
   prefix: "/global-settings/user"
 }), X = {
-  getUsers: (t) => g.get("", { params: t }),
-  getUserDetail: (t) => g.get("/".concat(t)),
-  getUserSystemLogs: (t, e) => g.get("/".concat(t, "/system-logs"), { params: e }),
-  getUserSystemLogOptions: (t, e) => {
-    const r = {};
-    return r[e] = !0, g.get("/".concat(t, "/system-logs/options"), { params: r });
-  },
+  getUsers: (t) => u.get("", { params: t }),
+  getUserDetail: (t) => u.get("/".concat(t)),
+  getUserSystemLogs: (t, e) => u.get("/".concat(t, "/system-logs"), { params: e }),
+  getUserSystemLogOptions: (t) => u.get("/".concat(t.userId, "/system-logs/options"), { params: t }),
   postCreateUser: (t) => {
     const e = { "Content-Type": "multipart/form-data" };
-    return g.post("", t, { headers: e });
+    return u.post("", t, { headers: e });
   },
   putEditUser: (t, e) => {
     const r = { "Content-Type": "multipart/form-data" };
-    return g.put("/".concat(t), e, { headers: r });
+    return u.put("/".concat(t), e, { headers: r });
   },
   deleteUsers: (t) => {
     const e = { id: JSON.stringify(t) };
-    return g.delete("", { params: e });
+    return u.delete("", { params: e });
   },
-  putToggleStatusUsers: (t) => g.put("/active-status", t),
+  putToggleStatusUsers: (t) => u.put("/active-status", t),
   getUserOptions: (t) => {
     const e = {};
-    return e[t] = !0, g.get("/options", { params: e });
+    return e[t] = !0, u.get("/options", { params: e });
   },
-  deleteCancelEmailChange: (t) => g.delete("/cancel-email-change/".concat(t)),
-  postResendEmail: (t) => g.post("/resend-email", t),
-  putChangePassword: (t, e) => g.put("/change-password/".concat(t), e)
-}, O = i({
-  prefix: "fam/v2/general-settings"
+  deleteCancelEmailChange: (t) => u.delete("/cancel-email-change/".concat(t)),
+  postResendEmail: (t) => u.post("/resend-email", t),
+  putChangePassword: (t, e) => u.put("/change-password/".concat(t), e)
+}, O = a({
+  prefix: "/global-settings/v2/general-settings"
 }), Z = {
   get: () => O.get("/"),
   update: (t) => O.put("/", t)
-}, d = i({
+}, m = a({
   prefix: "/fam/utility/v2/file-manager"
 }), tt = {
-  getStorageInformation: () => d.get("/files/storage"),
+  getStorageInformation: () => m.get("/files/storage"),
   postFileManager: (t, e) => {
-    const r = o(e);
-    return d.post("/".concat(t, "/list"), r);
+    const r = n(e);
+    return m.post("/".concat(t, "/list"), r);
   },
   postFileManagerOption: (t, e) => {
-    const r = o(e);
-    return d.post("/".concat(t, "/options"), r);
+    const r = n(e);
+    return m.post("/".concat(t, "/options"), r);
   },
-  recoverFiles: (t, e) => d.put("/".concat(t, "/recover"), e),
-  deleteFiles: (t, e) => d.delete("/".concat(t), { params: e }),
-  deletePermanently: (t, e) => d.delete("/".concat(t, "/delete-permanent"), { params: e })
-}, c = i({
+  recoverFiles: (t, e) => m.put("/".concat(t, "/recover"), e),
+  deleteFiles: (t, e) => m.delete("/".concat(t), { params: e }),
+  deletePermanently: (t, e) => m.delete("/".concat(t, "/delete-permanent"), { params: e })
+}, c = a({
   prefix: "/global-settings"
 }), et = {
   getCustomFieldList: (t) => {
-    const e = o(t);
+    const e = n(t);
     return c.post("/custom-fields/list", e);
   },
   getCustomFieldOptions: (t) => c.post("/custom-fields/options", t),
@@ -331,11 +334,11 @@ const C = { BASE_URL: "/", DEV: !1, MODE: "production", PROD: !0, SSR: !1, VITE_
   getActiveCustomField: () => c.get("/custom-fields/active"),
   getAvailableCustomField: (t) => {
     const e = { name: t };
-    return c.get("/custom-fields", { params: e });
+    return c.get("/custom-fields/available", { params: e });
   }
 };
 export {
-  j as AuthServices,
+  k as AuthServices,
   M as ChangelogServices,
   et as CustomFieldServices,
   H as DivisionServices,

package/package.json

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

package/src/dto/auth.dto.d.ts

@@ -8,7 +8,10 @@ interface PasswordLoginCredentials extends Credentials {
 interface OTPLoginCredentials extends Credentials {
     otp: string;
 }
-export type LoginCredentials = PasswordLoginCredentials | OTPLoginCredentials;
+export interface TokenCredential {
+    jwt: string;
+}
+export type LoginCredentials = PasswordLoginCredentials | OTPLoginCredentials | TokenCredential;
 export interface SetPasswordBody {
     password: string;
     token: string;

package/src/dto/changelog.dto.d.ts

@@ -5,7 +5,7 @@ export type ChangelogResponse = FetchListResponse<ChangelogType>;
 export type ChangelogOptionResponse = FetchOptionResponse<ChangelogOptionFilter>;
 type HardwareType = 'Hardware Handheld' | 'Hardware Smart Fixed Reader' | 'Tablet';
 export interface ChangelogFilterQuery extends TableParams {
-    objects?: string[];
+    object?: string;
     objectName?: string[];
     field?: string[];
     action?: string[];

package/src/dto/user.dto.d.ts

@@ -42,9 +42,9 @@ export interface CreateUserBody {
     email: string;
     isTemporary?: boolean;
     expiryDate?: number;
-    phoneNumber: string;
     access: string;
     userTag?: string;
+    customFields?: Record<string, any>;
 }
 export interface EditUserBody extends Partial<CreateUserBody> {
     changeProfilePicture: boolean;

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

@@ -1,5 +1,5 @@
 import { AxiosResponse } from 'axios';
-import { LoginCredentials, SetPasswordBody } from '../dto/auth.dto';
+import { LoginCredentials, SetPasswordBody, TokenCredential } from '../dto/auth.dto';
 interface LoginResponse {
     data: {
         token: string;
@@ -9,9 +9,7 @@ interface LoginResponse {
 }
 declare const AuthServices: {
     login: (form: LoginCredentials) => Promise<AxiosResponse<LoginResponse>>;
-    reLogin: (body: {
-        jwt: string;
-    }) => Promise<AxiosResponse<LoginResponse>>;
+    reLogin: (body: TokenCredential) => Promise<AxiosResponse<LoginResponse>>;
     requestOTP: (email: string) => Promise<AxiosResponse<any, any>>;
     requestResetPassLink: (email: string) => Promise<AxiosResponse<any, any>>;
     setPassword: (body: SetPasswordBody) => Promise<AxiosResponse<any, any>>;

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

@@ -4,7 +4,7 @@ import { FetchListResponse, FetchOptionResponse, FilterQuery } from '../types/fe
 import { HardwareChangelogType, SessionType, TaggingType, UserTagType } from '../types/changelog.type';
 declare const ChangelogServices: {
     getChangelogs: (params?: FilterQuery<ChangelogFilterQuery>) => Promise<AxiosResponse<ChangelogResponse>>;
-    getChangelogOptions: (body?: ChangelogOptionQuery) => Promise<AxiosResponse<ChangelogOptionResponse>>;
+    getChangelogOptions: (params?: ChangelogOptionQuery) => Promise<AxiosResponse<ChangelogOptionResponse>>;
     getSessionList: (params?: FilterQuery<SessionFilterQuery>) => Promise<AxiosResponse<FetchListResponse<SessionType>>>;
     getSessionOptions: (body?: SessionOptionQuery) => Promise<AxiosResponse<FetchOptionResponse<SessionOptionFilter>>>;
     getHardwareChangelogs: (params?: FilterQuery<HardwareChangelogFilterQuery>) => Promise<AxiosResponse<FetchListResponse<HardwareChangelogType>>>;

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

@@ -1,5 +1,5 @@
 import { AxiosResponse } from 'axios';
-import { FetchDetailResponse, FetchListResponse } from '../types/fetchResponse.type';
+import { FetchDetailResponse, FetchListResponse, ShortFetchListResponse } from '../types/fetchResponse.type';
 import { CustomField, CustomFieldOptions, ActiveCustomField } from '../types/iam.type';
 import { GetCustomFieldListParams, GetCustomFieldOptionsParams, CreateEditCustomFieldPayload, SetActiveCustomFieldPayload } from '../dto/iam.dto';
 declare const CustomFieldServices: {
@@ -9,7 +9,7 @@ declare const CustomFieldServices: {
     editCustomField: (id: string, payload: CreateEditCustomFieldPayload) => Promise<AxiosResponse>;
     setActiveCustomField: (ids: string[], payload: SetActiveCustomFieldPayload) => Promise<AxiosResponse>;
     deleteCustomField: (ids: string[]) => Promise<AxiosResponse>;
-    getActiveCustomField: () => Promise<AxiosResponse<FetchListResponse<ActiveCustomField>>>;
+    getActiveCustomField: () => Promise<AxiosResponse<ShortFetchListResponse<ActiveCustomField>>>;
     getAvailableCustomField: (name: string) => Promise<AxiosResponse>;
 };
 export default CustomFieldServices;

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

@@ -9,5 +9,6 @@ declare const DivisionServices: {
     postCreateDivision: (body: CreateEditMasterDataBody) => Promise<AxiosResponse>;
     putEditDivision: (id: string, body: CreateEditMasterDataBody) => Promise<AxiosResponse>;
     deleteDivisions: (ids: string[]) => Promise<AxiosResponse>;
+    getAvailableDivision: (name: string) => Promise<AxiosResponse>;
 };
 export default DivisionServices;

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

@@ -4,7 +4,9 @@ import { DeleteFileManagerDto } from '../dto/fileManager.dto';
 declare const FileManagerServices: {
     getStorageInformation: () => Promise<AxiosResponse>;
     postFileManager: (type: FileType, params?: FileManagerFilterParams) => Promise<AxiosResponse>;
-    postFileManagerOption: (type: FileType, params?: FileManagerOptionBoolean) => Promise<AxiosResponse>;
+    postFileManagerOption: (type: FileType, params?: FileManagerOptionBoolean & {
+        isDeleted: boolean;
+    }) => Promise<AxiosResponse>;
     recoverFiles: (type: FileType, body: object) => Promise<AxiosResponse>;
     deleteFiles: (type: FileType, params: DeleteFileManagerDto) => Promise<AxiosResponse>;
     deletePermanently: (type: FileType, params: DeleteFileManagerDto) => Promise<AxiosResponse>;

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

@@ -9,5 +9,6 @@ declare const PositionServices: {
     postCreatePosition: (body: CreateEditMasterDataBody) => Promise<AxiosResponse>;
     putEditPosition: (id: string, body: CreateEditMasterDataBody) => Promise<AxiosResponse>;
     deletePositions: (ids: string[]) => Promise<AxiosResponse>;
+    getAvailablePosition: (name: string) => Promise<AxiosResponse>;
 };
 export default PositionServices;

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

@@ -1,12 +1,15 @@
 import { AxiosResponse } from 'axios';
-import { CreateUserBody, EditUserBody, GetUserDetailResponse, GetUserOptionsParam, GetUserOptionsResponse, GetUserSystemLogOptionsParam, GetUserSystemLogOptionsResponse, PostResendEmailBody, PutChangePasswordBody, PutToggleStatusUsersBody } from '../dto/user.dto';
+import { CreateUserBody, EditUserBody, GetUserDetailResponse, GetUserOptionsParam, GetUserOptionsResponse, GetUserSystemLogOptionsResponse, PostResendEmailBody, PutChangePasswordBody, PutToggleStatusUsersBody, GetUserSystemLogOptionsParam } from '../dto/user.dto';
 import { FetchListResponse, QueryParams } from '../types/fetchResponse.type';
 import { SystemLog, UserItem } from '../types/user.type';
 declare const SettingUserGlobalServices: {
     getUsers: (params?: QueryParams) => Promise<AxiosResponse<FetchListResponse<UserItem>>>;
     getUserDetail: (id: string) => Promise<AxiosResponse<GetUserDetailResponse>>;
     getUserSystemLogs: (id: string, params: QueryParams) => Promise<AxiosResponse<FetchListResponse<SystemLog>>>;
-    getUserSystemLogOptions: (id: string, optionField: keyof GetUserSystemLogOptionsParam) => Promise<AxiosResponse<GetUserSystemLogOptionsResponse>>;
+    getUserSystemLogOptions: (params: GetUserSystemLogOptionsParam & {
+        userId: string;
+        module?: "Fixed Asset" | "Global Settings";
+    }) => Promise<AxiosResponse<GetUserSystemLogOptionsResponse>>;
     postCreateUser: (body: CreateUserBody) => Promise<AxiosResponse>;
     putEditUser: (id: string, body: EditUserBody) => Promise<AxiosResponse>;
     deleteUsers: (ids: string[]) => Promise<AxiosResponse>;

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

@@ -18,6 +18,10 @@ export type FileManagerType = {
             view: boolean;
         };
     };
+    user: {
+        _id: string;
+        name: string;
+    };
     modifiedBy: string;
     transactionId: string;
 };

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

@@ -93,7 +93,8 @@ export interface UserCustomField {
     dataType: DataType;
     isRequired: boolean;
     optionValue: string[];
-    value: string | number | string[] | Date;
+    value: string | number | Date;
+    decimalPlaces?: number;
 }
 export interface GlobalUserDetail {
     _id: string;
@@ -167,7 +168,7 @@ export interface CustomField {
     optionValue: string[];
     usedOptions: string[];
     isActive: boolean;
-    isRequired: 'Yes' | 'No' | BaseString;
+    isRequired: boolean;
     createdAt: string;
     updatedAt: string;
     decimalPlaces?: number;
@@ -177,7 +178,7 @@ export interface ActiveCustomField {
     name: string;
     dataType: DataType;
     optionValue: string[];
-    isRequired: 'Yes' | 'No' | BaseString;
+    isRequired: boolean;
     decimalPlaces?: number;
 }
 export interface CustomFieldList {

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

@@ -5,3 +5,11 @@ export interface MasterDataItem {
     createdAt: string;
     updatedAt: string;
 }
+export interface CustomField {
+    _id: string;
+    name: string;
+    dataType: string;
+    decimalPlaces: number;
+    optionValue: string[];
+    isRequired: boolean;
+}

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

@@ -1,3 +1,4 @@
+import { UserCustomField } from './iam.type';
 export type UserType = 'Basic' | 'Admin';
 export type User = {
     _id: string;
@@ -9,7 +10,6 @@ export type User = {
     division: string;
     email: string;
     employeeId: string;
-    phoneNumber: string;
     modifiedBy: {
         _id: string;
         fullName: string;
@@ -40,11 +40,11 @@ export type UserDetail = {
     position?: string;
     division: string;
     employeeId?: string;
-    phoneNumber: string;
     isTemporary: boolean;
     expiryDate: string;
     access: string[];
     isConfirmed: boolean;
+    customFields: UserCustomField[];
     name: string;
     userTag?: string;
     isSelf?: boolean;
@@ -60,7 +60,6 @@ export type UserItem = {
     position: string;
     division: string;
     employeeId: string;
-    phoneNumber: string;
     modifiedBy: ModifiedBy;
     lastUpdate: string;
     isEmailConfirmed: boolean;