aq-fe-framework 0.1.596 → 0.1.598

package/dist/{chunk-5NR2OP5O.mjs → chunk-AR64BQSX.mjs}

@@ -194,6 +194,7 @@ import { useQueryClient } from "@tanstack/react-query";
 import { notifications } from "@mantine/notifications";
 import { useMutation, useQueryClient as useQueryClient2 } from "@tanstack/react-query";
 function useMyReactMutation({
+  isPrototype,
   axiosFn,
   options,
   mutationType = "create",
@@ -204,6 +205,9 @@ function useMyReactMutation({
   const queryClient = useQueryClient2();
   return useMutation(__spreadProps(__spreadValues({
     mutationFn: async (values) => {
+      if (isPrototype) {
+        return [];
+      }
       const res = await axiosFn(values);
       if (res.data.isSuccess == 0) throw new Error(res.data.message);
       return res.data.data;

package/dist/{chunk-VGZ2UE3K.mjs → chunk-BCTZIPA2.mjs}

@@ -14,7 +14,7 @@ import {
   baseAxios_default,
   useMyReactMutation,
   useQ_AQ_GetAQModule
-} from "./chunk-5NR2OP5O.mjs";
+} from "./chunk-AR64BQSX.mjs";
 import {
   utils_notification_show
 } from "./chunk-7ZCOFATU.mjs";
@@ -477,7 +477,7 @@ function MyActionIconDelete(_a) {
             {
               crudType: "delete",
               onClick: handleCLick,
-              loading: loadingState[0]
+              loading: mutation.isPending
             }
           ),
           /* @__PURE__ */ jsx10(
@@ -575,7 +575,8 @@ function MyActionIconUpdate(_a) {
           MyButton,
           {
             type: "submit",
-            crudType: "save"
+            crudType: "save",
+            loading: mutation.isPending
           }
         )
       ] }) })
@@ -1139,7 +1140,7 @@ function MyButtonCreate(_a) {
         mutation.mutate(values);
       }), children: /* @__PURE__ */ jsxs11(MyFlexColumn, { children: [
         children,
-        /* @__PURE__ */ jsx21(MyButton, { type: "submit", crudType: "save" })
+        /* @__PURE__ */ jsx21(MyButton, { type: "submit", crudType: "save", loading: mutation.isPending })
       ] }) })
     })
   );

package/dist/{chunk-YXBTBZCE.mjs → chunk-GFW64WZ2.mjs}

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

package/dist/{chunk-TM5KDO5S.mjs → chunk-S4K4K3X3.mjs}

@@ -3,7 +3,7 @@ import {
   MyFieldset,
   MyFlexColumn,
   MyFlexRow
-} from "./chunk-VGZ2UE3K.mjs";
+} from "./chunk-BCTZIPA2.mjs";
 import {
   useStore_Permission
 } from "./chunk-PW6WTEVB.mjs";
@@ -17,7 +17,7 @@ import {
   baseAxios_default,
   useMyReactMutation,
   useMyReactQuery
-} from "./chunk-5NR2OP5O.mjs";
+} from "./chunk-AR64BQSX.mjs";
 import {
   utils_notification_show
 } from "./chunk-7ZCOFATU.mjs";

package/dist/components/index.d.mts

@@ -6,7 +6,7 @@ import { AxiosResponse } from 'axios';
 import { M as MyApiResponse } from '../createBaseApi-75GHCO22.mjs';
 import { useDisclosure, useListState } from '@mantine/hooks';
 import { UseFormReturnType, useForm } from '@mantine/form';
-import { M as MyReactMutationProps } from '../useMyReactMutation-DdCNebJI.mjs';
+import { M as MyReactMutationProps } from '../useMyReactMutation-CqcrOOF9.mjs';
 import { I as I_BasicAppShell_LinkItem, B as BasicAppShellProps } from '../types-DcfN8y1h.mjs';
 import { I as IUtils_Excel_ColumnConfig } from '../utils_excel-BYB9qbHd.mjs';
 import { MRT_ColumnDef, MRT_RowData, MRT_TableOptions, MRT_TableInstance } from 'mantine-react-table';

package/dist/components/index.mjs

@@ -68,12 +68,12 @@ import {
   useHeaderMegaMenuStore,
   useS_ButtonImport,
   useStore_BasicAppShell
-} from "../chunk-VGZ2UE3K.mjs";
+} from "../chunk-BCTZIPA2.mjs";
 import "../chunk-PW6WTEVB.mjs";
 import "../chunk-5COIJ2CE.mjs";
 import "../chunk-EWDS5IOF.mjs";
 import "../chunk-OMJJAHOC.mjs";
-import "../chunk-5NR2OP5O.mjs";
+import "../chunk-AR64BQSX.mjs";
 import "../chunk-WZ6PXGGC.mjs";
 import "../chunk-7ZCOFATU.mjs";
 import "../chunk-FWCSY2DS.mjs";

package/dist/core/index.d.mts

@@ -6,7 +6,7 @@ import { UseFormReturnType } from '@mantine/form';
 import { AxiosResponse } from 'axios';
 import { M as MyApiResponse } from '../createBaseApi-75GHCO22.mjs';
 import { useDisclosure } from '@mantine/hooks';
-import { M as MyReactMutationProps } from '../useMyReactMutation-DdCNebJI.mjs';
+import { M as MyReactMutationProps } from '../useMyReactMutation-CqcrOOF9.mjs';
 import { UseReactToPrintOptions } from 'react-to-print';
 import { UseQueryResult, QueryKey, UseQueryOptions } from '@tanstack/react-query';
 import { MRT_RowData, MRT_ColumnDef } from 'mantine-react-table';

package/dist/core/index.mjs

@@ -22,18 +22,18 @@ import {
   MyStatsCard,
   MyTextInput,
   MyWeeklySessionSchedulerPicker
-} from "../chunk-TM5KDO5S.mjs";
+} from "../chunk-S4K4K3X3.mjs";
 import "../chunk-GFEMKKFH.mjs";
 import {
   MyModalDelete
-} from "../chunk-YXBTBZCE.mjs";
-import "../chunk-VGZ2UE3K.mjs";
+} from "../chunk-GFW64WZ2.mjs";
+import "../chunk-BCTZIPA2.mjs";
 import "../chunk-PW6WTEVB.mjs";
 import "../chunk-5COIJ2CE.mjs";
 import "../chunk-EWDS5IOF.mjs";
 import "../chunk-OMJJAHOC.mjs";
 import "../chunk-K6S7R6LU.mjs";
-import "../chunk-5NR2OP5O.mjs";
+import "../chunk-AR64BQSX.mjs";
 import "../chunk-WZ6PXGGC.mjs";
 import "../chunk-7ZCOFATU.mjs";
 import "../chunk-FWCSY2DS.mjs";

package/dist/coreService/index.mjs

@@ -1,14 +1,14 @@
 import {
   MyModalDelete
-} from "../chunk-YXBTBZCE.mjs";
-import "../chunk-VGZ2UE3K.mjs";
+} from "../chunk-GFW64WZ2.mjs";
+import "../chunk-BCTZIPA2.mjs";
 import "../chunk-PW6WTEVB.mjs";
 import "../chunk-5COIJ2CE.mjs";
 import "../chunk-EWDS5IOF.mjs";
 import "../chunk-OMJJAHOC.mjs";
 import {
   useMyReactMutation
-} from "../chunk-5NR2OP5O.mjs";
+} from "../chunk-AR64BQSX.mjs";
 import "../chunk-WZ6PXGGC.mjs";
 import "../chunk-7ZCOFATU.mjs";
 import {

package/dist/hooks/index.d.mts

@@ -7,7 +7,7 @@ import { M as MyApiResponse } from '../createBaseApi-75GHCO22.mjs';
 export { I as IPagingParams, c as createBaseApi } from '../createBaseApi-75GHCO22.mjs';
 import * as next_dist_shared_lib_app_router_context_shared_runtime from 'next/dist/shared/lib/app-router-context.shared-runtime';
 import * as React from 'react';
-export { M as MyReactMutationProps, u as useMyReactMutation } from '../useMyReactMutation-DdCNebJI.mjs';
+export { M as MyReactMutationProps, u as useMyReactMutation } from '../useMyReactMutation-CqcrOOF9.mjs';
 import { I as IAQModule } from '../IAQModule-4U3n2emx.mjs';
 import '../IBaseEntity-ChMy9RzQ.mjs';
 import '../type_mutation-CCtnyeP3.mjs';

package/dist/hooks/index.mjs

@@ -8,7 +8,7 @@ import {
   useMyReactQuery,
   useMyRouter,
   useQ_AQ_GetAQModule
-} from "../chunk-5NR2OP5O.mjs";
+} from "../chunk-AR64BQSX.mjs";
 import "../chunk-WZ6PXGGC.mjs";
 import "../chunk-7ZCOFATU.mjs";
 import "../chunk-FWCSY2DS.mjs";

package/dist/modules-features/index.mjs

@@ -7,11 +7,11 @@ import {
   MyRichTextEditor,
   MySelect as MySelect2,
   MyTextInput as MyTextInput2
-} from "../chunk-TM5KDO5S.mjs";
+} from "../chunk-S4K4K3X3.mjs";
 import {
   const_object_documentTypes
 } from "../chunk-GFEMKKFH.mjs";
-import "../chunk-YXBTBZCE.mjs";
+import "../chunk-GFW64WZ2.mjs";
 import {
   F_authenticate_Logout,
   MyActionIconDelete,
@@ -34,7 +34,7 @@ import {
   MyTab,
   MyTextInput,
   useS_authenticate
-} from "../chunk-VGZ2UE3K.mjs";
+} from "../chunk-BCTZIPA2.mjs";
 import {
   createGenericStore,
   useStore_Permission
@@ -67,7 +67,7 @@ import {
   useMyRouter,
   useQ_AQ_GetAQModule,
   useQ_SkillCenter_GetAll
-} from "../chunk-5NR2OP5O.mjs";
+} from "../chunk-AR64BQSX.mjs";
 import "../chunk-WZ6PXGGC.mjs";
 import {
   utils_notification_show
@@ -187,6 +187,13 @@ var service_role = __spreadProps(__spreadValues({}, createBaseApi(CONTROLLER2, b
   },
   addUser: (params, roleIds) => {
     return baseAxios_default.post(CONTROLLER2 + "/AddUser", { params, body: roleIds });
+  },
+  addUsers: (params, userIds) => {
+    return baseAxios_default.post(
+      CONTROLLER2 + "/AddUsers",
+      userIds,
+      { params }
+    );
   }
 });
 
@@ -4388,7 +4395,7 @@ function F_pageContentConfig_Save({ menuValues }) {
       return service_pageContent.updateList([{ id: 1 }]);
     }
   });
-  return /* @__PURE__ */ jsx91(MyButton2, { actionType: "save", onClick: () => updatePageConfigMutation.mutate({}) });
+  return /* @__PURE__ */ jsx91(MyButton2, { actionType: "save", onClick: () => updatePageConfigMutation.mutate() });
 }
 
 // src/modules-features/admin/core/pageContentConfig/F_pageContentConfig_ReadMenu.tsx
@@ -4808,6 +4815,7 @@ function Adapter_UserTable(_a) {
   return /* @__PURE__ */ jsx104(
     UseCase_UserTable,
     __spreadValues({
+      getRowId: (row) => row.id,
       data: ((_a2 = adminAccountQuery.data) == null ? void 0 : _a2.map(mapper_user.mapToDomain)) || []
     }, rest)
   );
@@ -4823,15 +4831,8 @@ function Adapter_UserAddToRole({
   const disc = useDisclosure2();
   const userSelectedId = useState7({});
   const mutation = useMyReactMutation({
-    axiosFn: async ({ userId: roleId2 }) => {
-      return {
-        data: {
-          isSuccess: 1,
-          message: "Gi\u1EA3 l\u1EADp",
-          data: []
-          // <-- `void` hợp lệ
-        }
-      };
+    axiosFn: async ({ userIds, roleId: roleId2 }) => {
+      return service_role.addUsers({ roleId: roleId2 }, userIds);
     },
     successNotification: "Th\xEAm ng\u01B0\u1EDDi d\xF9ng v\xE0o nh\xF3m quy\u1EC1n th\xE0nh c\xF4ng! (Gi\u1EA3 l\u1EADp)",
     options: {
@@ -4860,7 +4861,7 @@ function Adapter_UserAddToRole({
               actionType: "select",
               onClick: () => mutation.mutate({
                 roleId,
-                userId: Object.keys(userSelectedId[0]).map(Number)
+                userIds: Object.keys(userSelectedId[0]).map(Number)
               })
             }
           )
@@ -4882,6 +4883,7 @@ import { Tabs as Tabs3 } from "@mantine/core";
 import { useDisclosure as useDisclosure3 } from "@mantine/hooks";
 import { jsx as jsx107, jsxs as jsxs59 } from "react/jsx-runtime";
 function Feat_CreateUpdateRole({ values }) {
+  const isUpdate = values != void 0;
   const disc = useDisclosure3();
   return /* @__PURE__ */ jsx107(
     MyButtonModal2,
@@ -4890,18 +4892,23 @@ function Feat_CreateUpdateRole({ values }) {
       buttonProps: { actionType: "create" },
       actionIconProps: { actionType: "update" },
       modalProps: { size: "80%", title: "Chi ti\u1EBFt nh\xF3m t\xE0i kho\u1EA3n" },
-      isActionIcon: !!values,
+      isActionIcon: isUpdate,
       children: /* @__PURE__ */ jsxs59(Tabs3, { defaultValue: "gallery", children: [
         /* @__PURE__ */ jsxs59(Tabs3.List, { children: [
           /* @__PURE__ */ jsx107(Tabs3.Tab, { value: "gallery", children: "Th\xF4ng tin chung" }),
-          /* @__PURE__ */ jsx107(Tabs3.Tab, { value: "messages", children: "Danh s\xE1ch th\xE0nh vi\xEAn" })
+          /* @__PURE__ */ jsx107(Tabs3.Tab, { value: "messages", hidden: !isUpdate, children: "Danh s\xE1ch th\xE0nh vi\xEAn" })
         ] }),
         /* @__PURE__ */ jsx107(Tabs3.Panel, { value: "gallery", pt: "md", children: /* @__PURE__ */ jsx107(Adapter_RoleForm, { onSuccess: disc[1].close, values }) }),
         /* @__PURE__ */ jsx107(Tabs3.Panel, { value: "messages", pt: "md", children: /* @__PURE__ */ jsx107(MyFieldset, { title: "Danh s\xE1ch t\xE0i kho\u1EA3n ng\u01B0\u1EDDi d\xF9ng thu\u1ED9c nh\xF3m", children: /* @__PURE__ */ jsx107(
           Adapter_UserTable,
           {
             visibleFields: ["code", "userFullName", "unit"],
-            renderTopToolbarCustomActions: () => /* @__PURE__ */ jsx107(Adapter_UserAddToRole, { roleId: 2 }),
+            renderTopToolbarCustomActions: () => /* @__PURE__ */ jsx107(
+              Adapter_UserAddToRole,
+              {
+                roleId: Number(values == null ? void 0 : values.id)
+              }
+            ),
             renderRowActions: () => /* @__PURE__ */ jsx107(MyCenterFull, { children: /* @__PURE__ */ jsx107(Adapter_UserDelete, {}) })
           }
         ) }) })

package/dist/{useMyReactMutation-DdCNebJI.d.mts → useMyReactMutation-CqcrOOF9.d.mts}

@@ -4,7 +4,8 @@ import { t as type_mutation } from './type_mutation-CCtnyeP3.mjs';
 import { AxiosResponse } from 'axios';
 import { M as MyApiResponse } from './createBaseApi-75GHCO22.mjs';
 
-interface MyReactMutationProps<IReq, IRes> {
+interface MyReactMutationProps<IReq = void, IRes = void> {
+    isPrototype?: boolean;
     axiosFn: (values: IReq) => Promise<AxiosResponse<MyApiResponse<IRes>>>;
     options?: UseMutationOptions<IRes, Error, IReq>;
     mutationType?: type_mutation;
@@ -12,6 +13,6 @@ interface MyReactMutationProps<IReq, IRes> {
     enableDefaultError?: boolean;
     successNotification?: string;
 }
-declare function useMyReactMutation<IReq, IRes>({ axiosFn, options, mutationType, enableDefaultSuccess, enableDefaultError, successNotification }: MyReactMutationProps<IReq, IRes>): _tanstack_react_query.UseMutationResult<IRes, Error, IReq, unknown>;
+declare function useMyReactMutation<IReq = void, IRes = void>({ isPrototype, axiosFn, options, mutationType, enableDefaultSuccess, enableDefaultError, successNotification }: MyReactMutationProps<IReq, IRes>): _tanstack_react_query.UseMutationResult<IRes, Error, IReq, unknown>;
 
 export { type MyReactMutationProps as M, useMyReactMutation as u };

package/package.json

@@ -50,7 +50,7 @@
       "types": "./dist/types/index.d.mts"
     }
   },
-  "version": "0.1.596",
+  "version": "0.1.598",
   "private": false,
   "files": [
     "dist"