aq-fe-framework 0.1.1087 → 0.1.1089

package/dist/{chunk-YIXR7XL3.mjs → chunk-WNS27PWD.mjs}

@@ -1,5 +1,5 @@
 import {
-  createGenericStore,
+  createGenericStore as createGenericStore2,
   useAppStore,
   useStore_Permission,
   useStore_ProjectInfo
@@ -27,7 +27,7 @@ import {
   utils_text
 } from "./chunk-7ZI7IOEP.mjs";
 import {
-  createGenericStore as createGenericStore2
+  createGenericStore
 } from "./chunk-BTITP4TN.mjs";
 import {
   const_object_colors,
@@ -609,8 +609,6 @@ function MyButtonCreateUpdate({
   submitButtonProps,
   form,
   onSubmit,
-  onSuccess,
-  onError,
   ignoreDefaultOnError,
   ignoreDefaultOnSuccess,
   closeModalWhenSubmit = true,
@@ -631,34 +629,38 @@ function MyButtonCreateUpdate({
     },
     mutationType: isUpdate ? "update" : "create"
   }, useMyReactMutationProps), {
-    options: __spreadProps(__spreadValues({
-      onError: (error) => {
-        let parsed;
-        try {
-          parsed = JSON.parse(error.message);
-        } catch (e4) {
-          parsed = null;
-        }
-        if (parsed == null ? void 0 : parsed.data) {
-          Object.entries(parsed.data).forEach(([field, message]) => {
-            form.setFieldError(field.charAt(0).toLowerCase() + field.slice(1), message);
-          });
-          const errorMessages = Object.values(parsed.data).join(", ");
-          notifications.show({
-            title: "Kh\xF4ng th\u1EC3 l\u01B0u d\u1EEF li\u1EC7u",
-            message: errorMessages,
-            color: "red"
-          });
-          return;
+    options: __spreadProps(__spreadValues({}, useMyReactMutationProps == null ? void 0 : useMyReactMutationProps.options), {
+      onError: (error, variables, context) => {
+        var _a, _b;
+        if (!ignoreDefaultOnError) {
+          let parsed;
+          try {
+            parsed = JSON.parse(error.message);
+          } catch (e4) {
+            parsed = null;
+          }
+          if (parsed == null ? void 0 : parsed.data) {
+            Object.entries(parsed.data).forEach(([field, message]) => {
+              form.setFieldError(field.charAt(0).toLowerCase() + field.slice(1), message);
+            });
+            const errorMessages = Object.values(parsed.data).join(", ");
+            notifications.show({
+              title: "Kh\xF4ng th\u1EC3 l\u01B0u d\u1EEF li\u1EC7u",
+              message: errorMessages,
+              color: "red"
+            });
+            return;
+          }
         }
-      }
-    }, useMyReactMutationProps == null ? void 0 : useMyReactMutationProps.options), {
+        (_b = (_a = useMyReactMutationProps == null ? void 0 : useMyReactMutationProps.options) == null ? void 0 : _a.onError) == null ? void 0 : _b.call(_a, error, variables, context);
+      },
       onSuccess: (...args) => {
+        var _a, _b;
         if (!ignoreDefaultOnSuccess) {
           if (closeModalWhenSubmit) disclosure[1].close();
           if (resetFormWhenSubmit) form.reset();
         }
-        onSuccess == null ? void 0 : onSuccess(...args);
+        (_b = (_a = useMyReactMutationProps == null ? void 0 : useMyReactMutationProps.options) == null ? void 0 : _a.onSuccess) == null ? void 0 : _b.call(_a, ...args);
       }
     })
   }));
@@ -1883,7 +1885,7 @@ import { IconArrowBackUp, IconArrowBigLeft, IconArrowBigRight, IconSquareRounded
 // src/components/Button/ButtonImport/useS_ButtonImport.ts
 import { useEffect as useEffect5, useMemo as useMemo2 } from "react";
 import * as XLSX2 from "xlsx";
-var useStore = createGenericStore2({
+var useStore = createGenericStore({
   initialState: {
     data: [],
     title: [],
@@ -7898,7 +7900,7 @@ function AQStatCard2({
 import { useEffect as useEffect9 } from "react";
 
 // src/components/Layouts/BasicAppShell/useStore_BasicAppShell.ts
-var useStore2 = createGenericStore2({
+var useStore2 = createGenericStore({
   initialState: {
     menuCode: "",
     moduleCode: "Module code",
@@ -10351,7 +10353,7 @@ import { IconSearch as IconSearch4 } from "@tabler/icons-react";
 import { useEffect as useEffect20, useMemo as useMemo9, useState as useState18 } from "react";
 
 // src/modules-features/admin/core/accountManagement/useStore_AccountManagement.ts
-var useStore3 = createGenericStore({
+var useStore3 = createGenericStore2({
   initialState: {}
 });
 function useStore_AccountManagement() {
@@ -14101,6 +14103,10 @@ import { Group as Group26 } from "@mantine/core";
 import { useMemo as useMemo23 } from "react";
 import { jsx as jsx154, jsxs as jsxs90 } from "react/jsx-runtime";
 function LecturerListTable() {
+  const query = useMyReactQuery({
+    queryKey: ["lecturers"],
+    axiosFn: service_account.getEdusoftNetAccount
+  });
   const columns = useMemo23(() => [
     {
       header: "M\xE3 vi\xEAn ch\u1EE9c",
@@ -14155,10 +14161,7 @@ function LecturerListTable() {
   return /* @__PURE__ */ jsx154(
     CustomDataTableAPI,
     {
-      reactQueryProps: {
-        queryKey: ["lecturers"],
-        axiosFn: service_account.getEdusoftNetAccount
-      },
+      query,
       enableRowSelection: true,
       renderTopToolbarCustomActions: ({ table }) => /* @__PURE__ */ jsxs90(Group26, { children: [
         /* @__PURE__ */ jsx154(LecturerListSyncFromEdusoft, {}),
@@ -14411,7 +14414,7 @@ import { useEffect as useEffect28 } from "react";
 import { useMutation as useMutation3 } from "@tanstack/react-query";
 
 // src/modules-features/admin/core/moduleConfig/useS_moduleConfig.ts
-var useStore4 = createGenericStore2({
+var useStore4 = createGenericStore({
   initialState: {}
 });
 function useS_moduleConfig() {
@@ -16577,7 +16580,7 @@ import { useRouter as useRouter4 } from "next/navigation.js";
 import { useEffect as useEffect36 } from "react";
 
 // src/modules-features/authenticate/useStore_Authenticate.ts
-var useStore5 = createGenericStore2({
+var useStore5 = createGenericStore({
   initialState: { token: "", saveLogin: false, username: "", password: "", workingUnitId: 0, roleIds: [] },
   storageKey: "useStore_Authenticate"
 });
@@ -17402,7 +17405,7 @@ import Link4 from "next/link.js";
 import classes from "./css.module-4ICLUKPO.module.css";
 
 // src/components/Layouts/HeaderMegaMenu/HeaderMegaMenuStore.ts
-var useStore6 = createGenericStore2({
+var useStore6 = createGenericStore({
   initialState: { name: "\u0110\u0103ng k\xFD kh\xF3a h\u1ECDc" },
   storageKey: "HeaderMegaMenuStore"
 });
@@ -18675,7 +18678,7 @@ function CustomDataTableAPI(_a) {
     deleteFn,
     deleteListFn,
     buttonCreateUpdateProps,
-    reactQueryProps,
+    query: query,
     renderCreateUpdateContent,
     getInitValues,
     enableCreate,
@@ -18684,13 +18687,13 @@ function CustomDataTableAPI(_a) {
     "deleteFn",
     "deleteListFn",
     "buttonCreateUpdateProps",
-    "reactQueryProps",
+    // reactQueryProps,
+    "query",
     "renderCreateUpdateContent",
     "getInitValues",
     "enableCreate",
     "enableUpdate"
   ]);
-  const query = useMyReactQuery(reactQueryProps);
   return /* @__PURE__ */ jsx245(
     MyDataTable,
     __spreadProps(__spreadValues({

package/dist/components/index.mjs

@@ -69,7 +69,7 @@ import {
   useHeaderMegaMenuStore,
   useS_ButtonImport,
   useStore_BasicAppShell
-} from "../chunk-YIXR7XL3.mjs";
+} from "../chunk-WNS27PWD.mjs";
 import "../chunk-WW55EZ4B.mjs";
 import "../chunk-KGBXMHKR.mjs";
 import "../chunk-7ZI7IOEP.mjs";

package/dist/core/index.d.mts

@@ -18,7 +18,7 @@ import { UseEditorOptions } from '@tiptap/react';
 import { M as MySelectProps } from '../MySelect-CEgpggSF.mjs';
 export { a as MySelect } from '../MySelect-CEgpggSF.mjs';
 import { I as IBaseEntity } from '../IBaseEntity-BVJRftBU.mjs';
-import { M as MyReactQueryProps } from '../useMyReactQuery-CqXIs4-6.mjs';
+import { u as useMyReactQuery } from '../useMyReactQuery-CqXIs4-6.mjs';
 import '../type_action-hMF6_2Mr.mjs';
 import '../type_mutation-CCtnyeP3.mjs';
 import '@tanstack/react-table';
@@ -70,8 +70,6 @@ interface MyButtonCreateUpdateProps<IReq, IRes> {
     scrollAreaAutosizeProps?: ScrollAreaAutosizeProps;
     isUpdate?: boolean;
     onSubmit: (values: IReq, isUpdate?: boolean) => Promise<AxiosResponse<MyApiResponse<IRes>>> | false | void;
-    onSuccess?: (...args: any[]) => void;
-    onError?: (...args: any[]) => void;
     ignoreDefaultOnSuccess?: boolean;
     ignoreDefaultOnError?: boolean;
     form: UseFormReturnType<IReq>;
@@ -83,7 +81,7 @@ interface MyButtonCreateUpdateProps<IReq, IRes> {
     useMyReactMutationProps?: Omit<MyReactMutationProps<Promise<AxiosResponse<MyApiResponse<IRes>, any>>, IRes>, "axiosFn">;
     initValues?: IReq;
 }
-declare function MyButtonCreateUpdate<IReq, IRes>({ modalProps, actionIconProps, toolTipProps, buttonProps, submitButtonProps, form, onSubmit, onSuccess, onError, ignoreDefaultOnError, ignoreDefaultOnSuccess, closeModalWhenSubmit, resetFormWhenSubmit, children, disclosure: externalDisclosure, isUpdate, scrollAreaAutosizeProps, useMyReactMutationProps, initValues }: MyButtonCreateUpdateProps<IReq, IRes>): react_jsx_runtime.JSX.Element;
+declare function MyButtonCreateUpdate<IReq, IRes>({ modalProps, actionIconProps, toolTipProps, buttonProps, submitButtonProps, form, onSubmit, ignoreDefaultOnError, ignoreDefaultOnSuccess, closeModalWhenSubmit, resetFormWhenSubmit, children, disclosure: externalDisclosure, isUpdate, scrollAreaAutosizeProps, useMyReactMutationProps, initValues }: MyButtonCreateUpdateProps<IReq, IRes>): react_jsx_runtime.JSX.Element;
 
 interface CustomThemeIconSquareCheckProps {
     checked?: boolean;
@@ -306,7 +304,7 @@ interface ValidationResult {
 }
 
 interface CustomDataTableAPIProps<TData extends MRT_RowData, IReq, IResQuery, IResMutation> extends Omit<MyDataTableProps<TData>, "data"> {
-    reactQueryProps: MyReactQueryProps<IResQuery, IReq, TData[]>;
+    query: ReturnType<typeof useMyReactQuery<IResQuery, IReq, TData[]>>;
     deleteFn?: (id: number) => Promise<any> | void;
     deleteListFn?: (ids: number[]) => Promise<any> | void;
     buttonCreateUpdateProps?: MyButtonCreateUpdateProps<IReq, IResMutation>;
@@ -315,7 +313,7 @@ interface CustomDataTableAPIProps<TData extends MRT_RowData, IReq, IResQuery, IR
     enableCreate?: boolean;
     enableUpdate?: boolean;
 }
-declare function CustomDataTableAPI<TData extends MRT_RowData, IReq = any, IResQuery = TData[], IResMutation = TData>({ deleteFn, deleteListFn, buttonCreateUpdateProps, reactQueryProps, renderCreateUpdateContent, getInitValues, enableCreate, enableUpdate, ...rest }: CustomDataTableAPIProps<TData, IReq, IResQuery, IResMutation>): react_jsx_runtime.JSX.Element;
+declare function CustomDataTableAPI<TData extends MRT_RowData, IReq = any, IResQuery = TData[], IResMutation = TData>({ deleteFn, deleteListFn, buttonCreateUpdateProps, query, renderCreateUpdateContent, getInitValues, enableCreate, enableUpdate, ...rest }: CustomDataTableAPIProps<TData, IReq, IResQuery, IResMutation>): react_jsx_runtime.JSX.Element;
 
 interface CustomDeleteListAPIProps<TData extends MRT_RowData> extends Omit<MyButtonDeleteListProps, "onSubmit"> {
     table: MRT_TableInstance<TData>;

package/dist/core/index.mjs

@@ -34,7 +34,7 @@ import {
   MyStatsCard,
   MyTextInput2 as MyTextInput,
   MyWeeklySessionSchedulerPicker
-} from "../chunk-YIXR7XL3.mjs";
+} from "../chunk-WNS27PWD.mjs";
 import "../chunk-WW55EZ4B.mjs";
 import "../chunk-KGBXMHKR.mjs";
 import "../chunk-7ZI7IOEP.mjs";

package/dist/interfaces/index.d.mts

@@ -1,6 +1,6 @@
 export { A as AcademicYearUpdateDto, I as IAcademicYear, a as IEmailConfig, b as IEmailTemplate } from '../IEmailTemplate-D2se2igm.mjs';
-import { I as IBaseEntity } from '../IBaseEntity-BVJRftBU.mjs';
 import { I as IAQFileDetail } from '../utils_file-JlhzjLGS.mjs';
+import { I as IBaseEntity } from '../IBaseEntity-BVJRftBU.mjs';
 export { I as IAQModule } from '../IAQModule-DbiJ8E6q.mjs';
 export { I as IBaseDomain } from '../IBaseDomain-BG4Sm7_Z.mjs';
 export { I as IPagePermission } from '../IPagePermission-992CbJhp.mjs';
@@ -13,7 +13,7 @@ interface IUserSkillCenters extends IBaseEntity {
 interface IWorkingUnit extends IBaseEntity {
 }
 
-interface IAccount extends IBaseEntity {
+interface IUser extends IBaseEntity {
     password?: string;
     passwordHash?: string;
     userName?: string;
@@ -34,6 +34,9 @@ interface IAccount extends IBaseEntity {
     isExternal?: boolean;
 }
 
+interface IAccount extends IUser {
+}
+
 interface ICodeFormula extends IBaseEntity {
     operationType?: number;
     frequency?: number;
@@ -143,14 +146,6 @@ interface IRole extends IBaseEntity {
     note?: string;
 }
 
-interface IUser extends IBaseEntity {
-    userName?: string;
-    fullName?: string;
-    email?: string;
-    workingUnitId?: number;
-    workingUnitName?: string;
-}
-
 interface IPageContent extends IBaseEntity {
     description?: string;
 }

package/dist/modules-features/index.mjs

@@ -97,7 +97,7 @@ import {
   MailTemplateDeleteButton,
   useS_moduleConfig,
   useStore_Authenticate
-} from "../chunk-YIXR7XL3.mjs";
+} from "../chunk-WNS27PWD.mjs";
 import "../chunk-WW55EZ4B.mjs";
 import "../chunk-KGBXMHKR.mjs";
 import "../chunk-7ZI7IOEP.mjs";

package/dist/shared/index.mjs

@@ -1,6 +1,6 @@
 import {
   MySelect
-} from "../chunk-YIXR7XL3.mjs";
+} from "../chunk-WNS27PWD.mjs";
 import "../chunk-WW55EZ4B.mjs";
 import "../chunk-KGBXMHKR.mjs";
 import {

package/dist/utils/index.d.mts

@@ -1,5 +1,5 @@
-import { I as IBaseDomain } from '../IBaseDomain-BG4Sm7_Z.mjs';
 import { I as IBaseEntity } from '../IBaseEntity-BVJRftBU.mjs';
+import { I as IBaseDomain } from '../IBaseDomain-BG4Sm7_Z.mjs';
 import ExcelJS from 'exceljs';
 export { I as IAQFileDetail, a as utils_file_AQDocumentTypeToFile, c as utils_file_base64ToFile, b as utils_file_docxtemplaterDownload, u as utils_file_fileToAQDocumentType } from '../utils_file-JlhzjLGS.mjs';
 import { DefaultMantineColor } from '@mantine/core';

package/package.json

@@ -58,7 +58,7 @@
       "types": "./dist/zod-schemas/index.d.mts"
     }
   },
-  "version": "0.1.1087",
+  "version": "0.1.1089",
   "private": false,
   "files": [
     "dist"