aq-fe-framework 0.1.561 → 0.1.563

package/dist/{chunk-YUS7RADW.mjs → chunk-HETWN2YJ.mjs}

@@ -491,7 +491,6 @@ function MyActionIconDelete(_a) {
 
 // src/components/ActionIcons/ActionIconCRUD/MyActionIconUpdate.tsx
 import { useDisclosure as useDisclosure3 } from "@mantine/hooks";
-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) {
@@ -513,61 +512,45 @@ function MyActionIconUpdate(_a) {
     "useMyReactMutationProps"
   ]);
   const disc = useDisclosure3();
-  const queryClient = useQueryClient2();
   const mutation = useMyReactMutation(__spreadValues({
     axiosFn: (values) => {
-      if (process.env.NEXT_PUBLIC_APP_PROTOTYPE == "1") {
-        console.log("S\u1EEDa th\xE0nh c\xF4ng (gi\u1EA3 l\u1EADp)");
-        return Promise.resolve({
-          data: {
-            message: "S\u1EEDa th\xE0nh c\xF4ng (gi\u1EA3 l\u1EADp)",
-            data: {},
-            isSuccess: 1
-          },
-          status: 200,
-          statusText: "OK",
-          headers: {},
-          config: {}
-        });
-      }
-      const result = onSubmit(values);
-      if (result === void 0) {
-        return Promise.resolve({
-          data: {
-            message: "S\u1EEDa th\xE0nh c\xF4ng (gi\u1EA3 l\u1EADp)",
-            data: {},
-            isSuccess: 1
-          },
-          status: 200,
-          statusText: "OK",
-          headers: {},
-          config: {}
-        });
-      }
-      return result;
+      return values;
     },
-    options: __spreadValues(__spreadValues({
-      onSuccess: () => {
-        queryClient.invalidateQueries();
-        disc[1].close();
-      }
-    }, onSuccess && {
-      onSuccess: () => {
-        onSuccess();
-      }
-    }), onError && {
-      onError: () => {
-        onError();
+    options: {
+      onSuccess: (...args) => {
+        onSuccess == null ? void 0 : onSuccess(...args);
+      },
+      onError: (...args) => {
+        onError == null ? void 0 : onError(...args);
       }
-    })
+    }
   }, useMyReactMutationProps));
   useEffect2(() => {
     if (!resetFormWhenclose) return;
     if (disc[0] == true) return;
     form.reset();
   }, [disc[0]]);
-  return /* @__PURE__ */ jsx11(MyActionIconModal, __spreadProps(__spreadValues({ disclosure: disc, crudType: "update" }, rest), { children: /* @__PURE__ */ jsx11("form", { onSubmit: form.onSubmit((values) => {
-    mutation.mutate(values);
+  return /* @__PURE__ */ jsx11(MyActionIconModal, __spreadProps(__spreadValues({ disclosure: disc, crudType: "update" }, rest), { children: /* @__PURE__ */ jsx11("form", { onSubmit: form.onSubmit((values, event) => {
+    event.stopPropagation();
+    const result = onSubmit(values);
+    let axiosPromise;
+    if (result == false) return;
+    if (result == void 0) {
+      axiosPromise = Promise.resolve({
+        data: {
+          message: "T\u1EA1o th\xE0nh c\xF4ng (gi\u1EA3 l\u1EADp)",
+          data: {},
+          isSuccess: 1
+        },
+        status: 200,
+        statusText: "OK",
+        headers: {},
+        config: {}
+      });
+    } else {
+      axiosPromise = result;
+    }
+    mutation.mutate(axiosPromise);
   }), children: /* @__PURE__ */ jsxs5(MyFlexColumn, { children: [
     children,
     /* @__PURE__ */ jsx11(
@@ -836,7 +819,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, useQueryClient as useQueryClient3 } from "@tanstack/react-query";
+import { useMutation, useQueryClient as useQueryClient2 } from "@tanstack/react-query";
 import * as XLSX from "xlsx";
 
 // src/components/Button/ButtonModal/MyButtonModal.tsx
@@ -964,7 +947,7 @@ function AQButtonCreateByImportFile(_a) {
     "setImportedData"
   ]);
   const disc = useDisclosure6();
-  const queryClient = useQueryClient3();
+  const queryClient = useQueryClient2();
   const mutation = useMutation({
     mutationFn: async () => {
       return await onSubmit();
@@ -1062,7 +1045,7 @@ function AQButtonExportData({
 
 // src/components/Button/ButtonCRUD/MyButtonCreate.tsx
 import { useDisclosure as useDisclosure7 } from "@mantine/hooks";
-import { useQueryClient as useQueryClient4 } from "@tanstack/react-query";
+import { useQueryClient as useQueryClient3 } from "@tanstack/react-query";
 import { jsx as jsx21, jsxs as jsxs11 } from "react/jsx-runtime";
 function MyButtonCreate(_a) {
   var _b = _a, {
@@ -1086,7 +1069,7 @@ function MyButtonCreate(_a) {
   ]);
   const defaultDisclosure = useDisclosure7();
   const disclosure = externalDisclosure != null ? externalDisclosure : defaultDisclosure;
-  const queryClient = useQueryClient4();
+  const queryClient = useQueryClient3();
   const mutation = useMyReactMutation({
     axiosFn: (values) => {
       const result = onSubmit(values);
@@ -1138,7 +1121,7 @@ function MyButtonCreate(_a) {
 // src/components/Button/ButtonCRUD/MyButtonDeleteList.tsx
 import { Group as Group5, Highlight as Highlight2 } from "@mantine/core";
 import { useDisclosure as useDisclosure8 } from "@mantine/hooks";
-import { useMutation as useMutation2, useQueryClient as useQueryClient5 } from "@tanstack/react-query";
+import { useMutation as useMutation2, useQueryClient as useQueryClient4 } from "@tanstack/react-query";
 import { useState as useState7 } from "react";
 import { jsx as jsx22, jsxs as jsxs12 } from "react/jsx-runtime";
 function MyButtonDeleteList(_a) {
@@ -1153,7 +1136,7 @@ function MyButtonDeleteList(_a) {
     "onError",
     "contextData"
   ]);
-  const queryClient = useQueryClient5();
+  const queryClient = useQueryClient4();
   const disc = useDisclosure8();
   const loadingState = useState7();
   const mutation = useMutation2({

package/dist/{chunk-7RR5RJTA.mjs → chunk-NJ3WGV35.mjs}

@@ -2,7 +2,7 @@ import {
   MyDataTable,
   MyFlexColumn,
   MyFlexRow
-} from "./chunk-YUS7RADW.mjs";
+} from "./chunk-HETWN2YJ.mjs";
 import {
   const_object_colors
 } from "./chunk-OMJJAHOC.mjs";

package/dist/{chunk-DCEXN776.mjs → chunk-RHSY3L7P.mjs}

@@ -1,6 +1,6 @@
 import {
   MyButton
-} from "./chunk-YUS7RADW.mjs";
+} from "./chunk-HETWN2YJ.mjs";
 import {
   __objRest,
   __spreadProps,

package/dist/components/index.d.mts

@@ -67,12 +67,12 @@ declare function MyActionIconDelete<IRes>({ onSubmit, onSuccess, onError, contex
 
 interface IActionIconUpdate<IReq, IRes> extends Omit<ComponentProps<typeof MyActionIconModal>, "form" | "disclosure" | "onSubmit"> {
     resetFormWhenclose?: boolean;
-    onSubmit: (values: IReq) => Promise<AxiosResponse<MyApiResponse<IRes>>> | void;
-    onSuccess?: () => void;
-    onError?: () => void;
+    onSubmit: (values: IReq) => Promise<AxiosResponse<MyApiResponse<IRes>>> | false | void;
+    onSuccess?: (...args: any[]) => void;
+    onError?: (...args: any[]) => void;
     form: UseFormReturnType<IReq>;
     disclosure?: ReturnType<typeof useDisclosure>;
-    useMyReactMutationProps?: Omit<MyReactMutationProps<IReq, IRes>, 'axiosFn'>;
+    useMyReactMutationProps?: Omit<MyReactMutationProps<Promise<AxiosResponse<MyApiResponse<IRes>, any>>, IRes>, "axiosFn">;
 }
 declare function MyActionIconUpdate<IReq, IRes>({ resetFormWhenclose, form, onSubmit, onSuccess, onError, children, useMyReactMutationProps, ...rest }: IActionIconUpdate<IReq, IRes>): react_jsx_runtime.JSX.Element;
 

package/dist/components/index.mjs

@@ -67,7 +67,7 @@ import {
   useS_BasicAppShell,
   useS_ButtonImport,
   utils_layout_getItemsWithoutLinks
-} from "../chunk-YUS7RADW.mjs";
+} from "../chunk-HETWN2YJ.mjs";
 import "../chunk-U62R2QKJ.mjs";
 import "../chunk-5U2JSHSJ.mjs";
 import "../chunk-OMJJAHOC.mjs";

package/dist/core/index.mjs

@@ -18,12 +18,12 @@ import {
   MyStatsCard,
   MyTextInput,
   MyWeeklySessionSchedulerPicker
-} from "../chunk-7RR5RJTA.mjs";
+} from "../chunk-NJ3WGV35.mjs";
 import "../chunk-GFEMKKFH.mjs";
 import {
   MyModalDelete
-} from "../chunk-DCEXN776.mjs";
-import "../chunk-YUS7RADW.mjs";
+} from "../chunk-RHSY3L7P.mjs";
+import "../chunk-HETWN2YJ.mjs";
 import "../chunk-U62R2QKJ.mjs";
 import "../chunk-5U2JSHSJ.mjs";
 import "../chunk-OMJJAHOC.mjs";

package/dist/coreService/index.mjs

@@ -1,7 +1,7 @@
 import {
   MyModalDelete
-} from "../chunk-DCEXN776.mjs";
-import "../chunk-YUS7RADW.mjs";
+} from "../chunk-RHSY3L7P.mjs";
+import "../chunk-HETWN2YJ.mjs";
 import "../chunk-U62R2QKJ.mjs";
 import "../chunk-5U2JSHSJ.mjs";
 import "../chunk-OMJJAHOC.mjs";

package/dist/modules-features/index.mjs

@@ -12,20 +12,20 @@ import {
   U0DateToDDMMYYYString
 } from "../chunk-EWDS5IOF.mjs";
 import {
-  MyButton,
+  MyButton as MyButton2,
   MyDataTableSelectOne,
   MyTextInput as MyTextInput2
-} from "../chunk-7RR5RJTA.mjs";
+} from "../chunk-NJ3WGV35.mjs";
 import {
   const_object_documentTypes
 } from "../chunk-GFEMKKFH.mjs";
-import "../chunk-DCEXN776.mjs";
+import "../chunk-RHSY3L7P.mjs";
 import {
   F_authenticate_Logout,
   MyActionIconDelete,
   MyActionIconUpdate,
   MyBoxesBackground,
-  MyButton as MyButton2,
+  MyButton,
   MyButtonCreate,
   MyButtonModal,
   MyButtonViewPDF,
@@ -45,7 +45,7 @@ import {
   groupToTwoLevels,
   useS_authenticate,
   utils_layout_getItemsWithoutLinks
-} from "../chunk-YUS7RADW.mjs";
+} from "../chunk-HETWN2YJ.mjs";
 import {
   createGenericStore
 } from "../chunk-U62R2QKJ.mjs";
@@ -210,7 +210,7 @@ function Permission_SaveMenuPermission({
     }
   });
   return /* @__PURE__ */ jsx3(
-    MyButton,
+    MyButton2,
     {
       onClick: () => {
         mutation.mutate((values == null ? void 0 : values.filter((item) => item.id != "0").map((item) => ({
@@ -831,7 +831,7 @@ function F_accessControl_Save() {
     }
     disable[1](false);
   }, [store.state.rolePermissions]);
-  return /* @__PURE__ */ jsx9(MyButton2, { disabled: disable[0], crudType: "save", onClick: handleSave });
+  return /* @__PURE__ */ jsx9(MyButton, { disabled: disable[0], crudType: "save", onClick: handleSave });
 }
 
 // src/modules-features/admin/core/accessControl/old/F_accessControl.tsx
@@ -1285,7 +1285,7 @@ function F_accessControlLevel_Save() {
     }
     disable[1](false);
   }, [store.state.rolePermissions]);
-  return /* @__PURE__ */ jsx16(MyButton2, { disabled: disable[0], crudType: "save", onClick: handleSave });
+  return /* @__PURE__ */ jsx16(MyButton, { disabled: disable[0], crudType: "save", onClick: handleSave });
 }
 
 // src/modules-features/admin/core/accessControlLevel/old/F_accessControlLevel.tsx
@@ -3056,7 +3056,7 @@ function F_core35923() {
       /* @__PURE__ */ jsx49(Grid5.Col, { span: { base: 12, md: 6 }, children: /* @__PURE__ */ jsx49(MyFileInput, { label: "Favicon (16px x 16px)" }) }),
       /* @__PURE__ */ jsx49(Grid5.Col, { span: { base: 12, md: 6 }, children: /* @__PURE__ */ jsx49(MyFileInput, { label: "Logo (330px x 115px)" }) })
     ] }),
-    /* @__PURE__ */ jsx49(MyFlexEnd, { children: /* @__PURE__ */ jsx49(MyButton2, { crudType: "save" }) })
+    /* @__PURE__ */ jsx49(MyFlexEnd, { children: /* @__PURE__ */ jsx49(MyButton, { crudType: "save" }) })
   ] });
 }
 
@@ -4443,7 +4443,7 @@ function F_moduleConfig_Save({
     });
   }
   return /* @__PURE__ */ jsx83(
-    MyButton2,
+    MyButton,
     {
       disabled: !form.isDirty(),
       crudType: "save",
@@ -4899,13 +4899,13 @@ import { useMemo as useMemo20 } from "react";
 // src/modules-features/admin/core/pageContentConfig/F_pageContentConfig_DeleteDescription.tsx
 import { jsx as jsx91 } from "react/jsx-runtime";
 function F_pageContentConfig_DeleteDescription() {
-  return /* @__PURE__ */ jsx91(MyButton, { actionType: "delete" });
+  return /* @__PURE__ */ jsx91(MyButton2, { actionType: "delete" });
 }
 
 // src/modules-features/admin/core/pageContentConfig/F_pageContentConfig_Export.tsx
 import { jsx as jsx92 } from "react/jsx-runtime";
 function F_pageContentConfig_Export() {
-  return /* @__PURE__ */ jsx92(MyButton, { actionType: "export" });
+  return /* @__PURE__ */ jsx92(MyButton2, { actionType: "export" });
 }
 
 // src/modules-features/admin/core/pageContentConfig/F_pageContentConfig_Save.tsx
@@ -4917,7 +4917,7 @@ function F_pageContentConfig_Save({ menuValues }) {
       return service_pageContent.updateList([{ id: 1 }]);
     }
   });
-  return /* @__PURE__ */ jsx93(MyButton, { actionType: "save", onClick: () => updatePageConfigMutation.mutate({}) });
+  return /* @__PURE__ */ jsx93(MyButton2, { actionType: "save", onClick: () => updatePageConfigMutation.mutate({}) });
 }
 
 // src/modules-features/admin/core/pageContentConfig/F_pageContentConfig_ReadMenu.tsx

package/package.json

@@ -46,7 +46,7 @@
       "types": "./dist/coreService/index.d.mts"
     }
   },
-  "version": "0.1.561",
+  "version": "0.1.563",
   "private": false,
   "files": [
     "dist"