aq-fe-framework 0.1.262 → 0.1.264

package/dist/{chunk-33OCBXSX.mjs → chunk-QAIXZSQA.mjs}

@@ -83,6 +83,7 @@ var useLoadAxiosConfig = ({ axiosInstance = baseAxios_default }) => {
 import { useQueryClient } from "@tanstack/react-query";
 
 // src/hooks/custom-hooks/useMyReactMutation.ts
+import { notifications } from "@mantine/notifications";
 import { useMutation } from "@tanstack/react-query";
 function useMyReactMutation({
   axiosFn,
@@ -93,6 +94,19 @@ function useMyReactMutation({
       const res = await axiosFn(values);
       if (res.data.isSuccess == 0) throw new Error(res.data.message);
       return res.data.data;
+    },
+    onError: (e) => {
+      if (e.message == null) {
+        notifications.show({
+          message: "Kh\xF4ng th\u1EC3 thao t\xE1c, l\u1ED7i ch\u01B0a x\xE1c \u0111\u1ECBnh!",
+          color: "red"
+        });
+        return;
+      }
+      notifications.show({
+        message: e.message,
+        color: "red"
+      });
     }
   }, options));
 }

package/dist/{chunk-CC2N6SZ6.mjs → chunk-TOSMACJI.mjs}

@@ -8,7 +8,7 @@ import {
   baseAxios_default,
   useMyReactMutation,
   useQ_AQ_GetAQModule
-} from "./chunk-33OCBXSX.mjs";
+} from "./chunk-QAIXZSQA.mjs";
 import {
   createGenericStore
 } from "./chunk-Y3YGC5IH.mjs";
@@ -274,7 +274,7 @@ function MyButton(_a) {
 // src/components/ActionIcons/ActionIconCRUD/MyActionIconDelete.tsx
 import { Group, Highlight } from "@mantine/core";
 import { useDisclosure as useDisclosure2 } from "@mantine/hooks";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { useQueryClient } from "@tanstack/react-query";
 import { useState as useState2 } from "react";
 
 // src/components/ActionIcons/ActionIconModal/MyActionIconModal.tsx
@@ -398,28 +398,27 @@ function MyActionIconDelete(_a) {
   const queryClient = useQueryClient();
   const disc = useDisclosure2();
   const loadingState = useState2();
-  const mutation = useMutation({
-    mutationFn: async () => await onSubmit(),
-    onSuccess: () => {
-      if (onSuccess) {
+  const mutation = useMyReactMutation({
+    axiosFn: () => onSubmit(),
+    options: __spreadValues(__spreadValues({
+      onSuccess: () => {
+        queryClient.invalidateQueries();
+        utils_notification_show({ crudType: "delete" });
+        disc[1].close();
+      }
+    }, onSuccess && {
+      onSuccess: () => {
         onSuccess();
-        return;
       }
-      queryClient.invalidateQueries();
-      loadingState[1](false);
-      utils_notification_show({ crudType: "delete" });
-      disc[1].close();
-    },
-    onError: () => {
-      if (onError) {
+    }), onError && {
+      onError: () => {
         onError();
-        return;
       }
-    }
+    })
   });
   function handleCLick() {
     loadingState[1](true);
-    mutation.mutate();
+    mutation.mutate(void 0);
   }
   return /* @__PURE__ */ jsxs4(
     MyActionIconModal,
@@ -465,7 +464,7 @@ function MyActionIconDelete(_a) {
 
 // src/components/ActionIcons/ActionIconCRUD/MyActionIconUpdate.tsx
 import { useDisclosure as useDisclosure3 } from "@mantine/hooks";
-import { useMutation as useMutation2, useQueryClient as useQueryClient2 } from "@tanstack/react-query";
+import { useQueryClient as useQueryClient2 } from "@tanstack/react-query";
 import { useEffect as useEffect2 } from "react";
 import { jsx as jsx11, jsxs as jsxs5 } from "react/jsx-runtime";
 function MyActionIconUpdate(_a) {
@@ -486,21 +485,23 @@ function MyActionIconUpdate(_a) {
   ]);
   const disc = useDisclosure3();
   const queryClient = useQueryClient2();
-  const mutation = useMutation2({
-    mutationFn: async (values) => {
-      await onSubmit(values);
-    },
-    onSuccess: () => {
-      if (onSuccess) {
+  const mutation = useMyReactMutation({
+    axiosFn: (values) => onSubmit(values),
+    options: __spreadValues(__spreadValues({
+      onSuccess: () => {
+        queryClient.invalidateQueries();
+        utils_notification_show({ crudType: "update" });
+        disc[1].close();
+      }
+    }, onSuccess && {
+      onSuccess: () => {
         onSuccess();
       }
-      queryClient.invalidateQueries();
-      utils_notification_show({ crudType: "update" });
-      disc[1].close();
-    },
-    onError: () => {
-      if (onError) onError();
-    }
+    }), onError && {
+      onError: () => {
+        onError();
+      }
+    })
   });
   useEffect2(() => {
     if (!resetFormWhenclose) return;
@@ -777,7 +778,7 @@ function MyAnchorViewPDF({ label, pdfLink }) {
 import { FileInput } from "@mantine/core";
 import { useDisclosure as useDisclosure6 } from "@mantine/hooks";
 import { IconFileTypeXls } from "@tabler/icons-react";
-import { useMutation as useMutation3, useQueryClient as useQueryClient3 } from "@tanstack/react-query";
+import { useMutation, useQueryClient as useQueryClient3 } from "@tanstack/react-query";
 import * as XLSX from "xlsx";
 
 // src/components/Buttons/ButtonModal/MyButtonModal.tsx
@@ -906,7 +907,7 @@ function AQButtonCreateByImportFile(_a) {
   ]);
   const disc = useDisclosure6();
   const queryClient = useQueryClient3();
-  const mutation = useMutation3({
+  const mutation = useMutation({
     mutationFn: async () => {
       return await onSubmit();
     },
@@ -1003,7 +1004,6 @@ function AQButtonExportData({
 
 // src/components/Buttons/ButtonCRUD/MyButtonCreate.tsx
 import { useDisclosure as useDisclosure7 } from "@mantine/hooks";
-import { notifications } from "@mantine/notifications";
 import { useQueryClient as useQueryClient4 } from "@tanstack/react-query";
 import { jsx as jsx21, jsxs as jsxs11 } from "react/jsx-runtime";
 function MyButtonCreate(_a) {
@@ -1031,11 +1031,8 @@ function MyButtonCreate(_a) {
   const queryClient = useQueryClient4();
   const mutation = useMyReactMutation({
     axiosFn: (values) => onSubmit(values),
-    options: {
+    options: __spreadValues(__spreadValues({
       onSuccess: () => {
-        if (onSuccess) {
-          onSuccess();
-        }
         queryClient.invalidateQueries();
         utils_notification_show({ crudType: "create" });
         disclosure[1].close();
@@ -1045,22 +1042,16 @@ function MyButtonCreate(_a) {
         if (notResetFormWhenSubmit == false) {
           form.reset();
         }
-      },
-      onError: (e4) => {
-        if (onError) onError();
-        if (e4.message == null) {
-          notifications.show({
-            message: "Kh\xF4ng th\u1EC3 thao t\xE1c, l\u1ED7i ch\u01B0a x\xE1c \u0111\u1ECBnh!",
-            color: "red"
-          });
-          return;
-        }
-        notifications.show({
-          message: e4.message,
-          color: "red"
-        });
       }
-    }
+    }, onSuccess && {
+      onSuccess: () => {
+        onSuccess();
+      }
+    }), onError && {
+      onError: () => {
+        onError();
+      }
+    })
   });
   return /* @__PURE__ */ jsx21(MyButtonModal, __spreadProps(__spreadValues({ disclosure, crudType: "create" }, rest), { children: /* @__PURE__ */ jsx21("form", { onSubmit: form.onSubmit((values) => {
     mutation.mutate(values);
@@ -1073,7 +1064,7 @@ function MyButtonCreate(_a) {
 // src/components/Buttons/ButtonCRUD/MyButtonDeleteList.tsx
 import { Group as Group5, Highlight as Highlight2 } from "@mantine/core";
 import { useDisclosure as useDisclosure8 } from "@mantine/hooks";
-import { useMutation as useMutation4, useQueryClient as useQueryClient5 } from "@tanstack/react-query";
+import { useMutation as useMutation2, useQueryClient as useQueryClient5 } from "@tanstack/react-query";
 import { useState as useState7 } from "react";
 import { jsx as jsx22, jsxs as jsxs12 } from "react/jsx-runtime";
 function MyButtonDeleteList(_a) {
@@ -1091,7 +1082,7 @@ function MyButtonDeleteList(_a) {
   const queryClient = useQueryClient5();
   const disc = useDisclosure8();
   const loadingState = useState7();
-  const mutation = useMutation4({
+  const mutation = useMutation2({
     mutationFn: async () => await onSubmit(),
     onSuccess: () => {
       if (onSuccess) {

package/dist/components/index.d.mts

@@ -1,12 +1,12 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import React$1, { ReactNode, ComponentProps } from 'react';
 import { MantineSize, ActionIconProps, ButtonProps, useModalsStack, CheckboxProps, SelectProps, NumberFormatterProps, FieldsetProps, FileInputProps, NumberInputProps, TextareaProps, TextInputProps, ContainerProps, FlexProps, GroupProps, TypographyStylesProviderProps, TabsProps, SkeletonProps } from '@mantine/core';
+import { M as MyApiResponse } from '../createBaseApi-BJ2TH3XA.mjs';
+import { AxiosResponse } from 'axios';
 import { useDisclosure, useListState } from '@mantine/hooks';
 import { UseFormReturnType, useForm } from '@mantine/form';
 import { I as I_BasicAppShell_LinkItem } from '../BasicAppShell-CGKvZ5wV.mjs';
 export { a as BasicAppShell, B as BasicAppShell_transformMenuToEnum, g as groupToTwoLevels, u as utils_layout_getItemsWithoutLinks } from '../BasicAppShell-CGKvZ5wV.mjs';
-import { M as MyApiResponse } from '../createBaseApi-BJ2TH3XA.mjs';
-import { AxiosResponse } from 'axios';
 import { I as IUtils_Excel_ColumnConfig, a as IAQFileDetail } from '../utils_file-G8NTHCO-.mjs';
 import { MRT_ColumnDef, MRT_RowData, MRT_TableOptions, MRT_TableInstance } from 'mantine-react-table';
 import { ConfigOptions } from 'export-to-csv';
@@ -55,24 +55,24 @@ interface IMyActionIconModal extends Omit<React.ButtonHTMLAttributes<HTMLButtonE
 }
 declare function MyActionIconModal({ fullScreen, crudType, disclosure, modalSize, title, children, icon, ...rest }: IMyActionIconModal): react_jsx_runtime.JSX.Element | undefined;
 
-interface IActionIconDelete extends Omit<ComponentProps<typeof MyActionIconModal>, "disclosure"> {
-    onSubmit: () => void;
+interface IActionIconDelete<IRes> extends Omit<ComponentProps<typeof MyActionIconModal>, "disclosure" | "onSubmit"> {
+    onSubmit: () => Promise<AxiosResponse<MyApiResponse<IRes>>>;
     onSuccess?: () => void;
     onError?: () => void;
     contextData?: string;
     loading?: boolean;
 }
-declare function MyActionIconDelete({ onSubmit, onSuccess, onError, contextData, ...rest }: IActionIconDelete): react_jsx_runtime.JSX.Element;
+declare function MyActionIconDelete<IRes>({ onSubmit, onSuccess, onError, contextData, ...rest }: IActionIconDelete<IRes>): react_jsx_runtime.JSX.Element;
 
-interface IActionIconUpdate<T> extends Omit<ComponentProps<typeof MyActionIconModal>, "form" | "disclosure" | "onSubmit"> {
+interface IActionIconUpdate<IReq, IRes> extends Omit<ComponentProps<typeof MyActionIconModal>, "form" | "disclosure" | "onSubmit"> {
     resetFormWhenclose?: boolean;
-    onSubmit: (values: T) => void;
+    onSubmit: (values: IReq) => Promise<AxiosResponse<MyApiResponse<IRes>>>;
     onSuccess?: () => void;
     onError?: () => void;
-    form: UseFormReturnType<T>;
+    form: UseFormReturnType<IReq>;
     disclosure?: ReturnType<typeof useDisclosure>;
 }
-declare function MyActionIconUpdate<T>({ resetFormWhenclose, form, onSubmit, onSuccess, onError, children, ...rest }: IActionIconUpdate<T>): react_jsx_runtime.JSX.Element;
+declare function MyActionIconUpdate<IReq, IRes>({ resetFormWhenclose, form, onSubmit, onSuccess, onError, children, ...rest }: IActionIconUpdate<IReq, IRes>): react_jsx_runtime.JSX.Element;
 
 declare function MyActionIconDownloadPDF({ pdfLink }: {
     pdfLink: string;
@@ -141,7 +141,7 @@ interface AQButtonExportDataProps {
 declare function AQButtonExportData({ isAllData, objectName, data, exportConfig }: AQButtonExportDataProps): react_jsx_runtime.JSX.Element;
 
 interface IMyButtonCreate<IReq, IRes> extends Omit<ComponentProps<typeof MyButtonModal>, "disclosure" | "form" | "onSubmit"> {
-    onSubmit: (variables: IReq) => Promise<AxiosResponse<MyApiResponse<IRes>>>;
+    onSubmit: (values: IReq) => Promise<AxiosResponse<MyApiResponse<IRes>>>;
     onSuccess?: () => void;
     onError?: () => void;
     form: UseFormReturnType<IReq>;

package/dist/components/index.mjs

@@ -68,10 +68,10 @@ import {
   useS_BasicAppShell,
   useS_ButtonImport,
   utils_layout_getItemsWithoutLinks
-} from "../chunk-CC2N6SZ6.mjs";
+} from "../chunk-TOSMACJI.mjs";
 import "../chunk-NWBLJ3W3.mjs";
 import "../chunk-K6S7R6LU.mjs";
-import "../chunk-33OCBXSX.mjs";
+import "../chunk-QAIXZSQA.mjs";
 import "../chunk-Y3YGC5IH.mjs";
 import "../chunk-5U2JSHSJ.mjs";
 import "../chunk-7ZCOFATU.mjs";

package/dist/hooks/index.mjs

@@ -4,7 +4,7 @@ import {
   useMyReactMutation,
   useMyReactQuery,
   useQ_AQ_GetAQModule
-} from "../chunk-33OCBXSX.mjs";
+} from "../chunk-QAIXZSQA.mjs";
 import "../chunk-7ZCOFATU.mjs";
 import "../chunk-FWCSY2DS.mjs";
 export {

package/dist/modules-features/index.mjs

@@ -24,7 +24,7 @@ import {
   useS_BasicAppShell,
   useS_authenticate,
   utils_layout_getItemsWithoutLinks
-} from "../chunk-CC2N6SZ6.mjs";
+} from "../chunk-TOSMACJI.mjs";
 import {
   const_object_documentTypes
 } from "../chunk-GFEMKKFH.mjs";
@@ -39,7 +39,7 @@ import {
   baseAxios_default,
   useQ_AQ_GetAQModule,
   useQ_SkillCenter_GetAll
-} from "../chunk-33OCBXSX.mjs";
+} from "../chunk-QAIXZSQA.mjs";
 import {
   createGenericStore
 } from "../chunk-Y3YGC5IH.mjs";

package/package.json

@@ -34,7 +34,7 @@
       "types": "./dist/enum/index.d.mts"
     }
   },
-  "version": "0.1.262",
+  "version": "0.1.264",
   "private": false,
   "files": [
     "dist"