@pnkx-lib/ui 1.9.521 → 1.9.524

package/es/ui/index.js

@@ -23835,6 +23835,7 @@ const TableForm = (props) => {
     rowKey,
     handleCancel,
     renderHeadingTable,
+    hideCountNewItem,
     // positionButton = "right",
     defaultValues,
     rowsSelected,
@@ -23913,7 +23914,7 @@ const TableForm = (props) => {
           }
         )
       ] }),
-      newItemsCount > 0 && /* @__PURE__ */ jsxs(Tag, { color: "blue", children: [
+      newItemsCount > 0 && !hideCountNewItem && /* @__PURE__ */ jsxs(Tag, { color: "blue", children: [
         newItemsCount,
         " mục mới"
       ] })
@@ -24077,7 +24078,13 @@ const ListDataConvert = ({
       content: "Bạn có chắc chắn muốn từ chối xác nhận không?",
       arrShow: [CATEGORY_PRICE_LIST_ENUM?.WAITING_APPROVAL],
       showTitle: true,
-      countLevel: [COUNT_LEVEL.TWO_LEVEL]
+      countLevel: [COUNT_LEVEL.TWO_LEVEL],
+      arrShows: [
+        {
+          status: [CATEGORY_PRICE_LIST_ENUM?.WAITING_APPROVAL],
+          level: [COUNT_LEVEL.TWO_LEVEL]
+        }
+      ]
     },
     {
       icon: /* @__PURE__ */ jsx(CancelSendConfirmIcon, { className: "w-6 -h-6", size: 22, color: "#B2B7C2" }),
@@ -24088,9 +24095,15 @@ const ListDataConvert = ({
       typeIcon: "error",
       title: "Xác nhận huỷ gửi xác nhận",
       content: "Bạn có chắc chắn muốn huỷ gửi xác nhận không?",
-      arrShow: [CATEGORY_PRICE_LIST_ENUM?.WAITING_CONFIRM],
+      arrShow: [CATEGORY_PRICE_LIST_ENUM?.CREATED],
       showTitle: true,
-      countLevel: [COUNT_LEVEL.TWO_LEVEL]
+      countLevel: [COUNT_LEVEL.TWO_LEVEL],
+      arrShows: [
+        {
+          status: [CATEGORY_PRICE_LIST_ENUM?.CREATED],
+          level: [COUNT_LEVEL.TWO_LEVEL]
+        }
+      ]
     },
     {
       icon: /* @__PURE__ */ jsx(ConfirmIcon, { className: "w-6 -h-6", size: 22, color: "#B2B7C2" }),
@@ -24103,7 +24116,13 @@ const ListDataConvert = ({
       content: "Bạn có chắc chắn muốn xác nhận không?",
       arrShow: [CATEGORY_PRICE_LIST_ENUM?.WAITING_APPROVAL],
       showTitle: true,
-      countLevel: [COUNT_LEVEL.TWO_LEVEL]
+      countLevel: [COUNT_LEVEL.TWO_LEVEL],
+      arrShows: [
+        {
+          status: [CATEGORY_PRICE_LIST_ENUM?.WAITING_APPROVAL],
+          level: [COUNT_LEVEL.TWO_LEVEL]
+        }
+      ]
     },
     {
       icon: /* @__PURE__ */ jsx(SendConfirmIcon, { className: "w-6 -h-6", size: 22, color: "#B2B7C2" }),
@@ -24116,7 +24135,13 @@ const ListDataConvert = ({
       content: "Bạn có chắc chắn muốn gửi xác nhận không?",
       arrShow: [CATEGORY_PRICE_LIST_ENUM?.WAITING_APPROVAL],
       showTitle: true,
-      countLevel: [COUNT_LEVEL.TWO_LEVEL]
+      countLevel: [COUNT_LEVEL.TWO_LEVEL],
+      arrShows: [
+        {
+          status: [CATEGORY_PRICE_LIST_ENUM?.WAITING_APPROVAL],
+          level: [COUNT_LEVEL.TWO_LEVEL]
+        }
+      ]
     },
     {
       icon: /* @__PURE__ */ jsx(SendApproveIcon, { className: "w-6 -h-6", size: 22, color: "#B2B7C2" }),
@@ -24129,7 +24154,17 @@ const ListDataConvert = ({
       content: "Bạn có chắc chắn muốn gửi duyệt không?",
       arrShow: [CATEGORY_PRICE_LIST_ENUM?.CREATED],
       showTitle: true,
-      countLevel: [COUNT_LEVEL.ONE_LEVEL]
+      countLevel: [COUNT_LEVEL.ONE_LEVEL],
+      arrShows: [
+        {
+          status: [CATEGORY_PRICE_LIST_ENUM?.CREATED],
+          level: [COUNT_LEVEL.ONE_LEVEL]
+        },
+        {
+          status: [CATEGORY_PRICE_LIST_ENUM?.WAITING_APPROVAL],
+          level: [COUNT_LEVEL.ONE_LEVEL]
+        }
+      ]
     },
     {
       icon: /* @__PURE__ */ jsx(CancelSendApproveIcon, { className: "w-6 -h-6", size: 22, color: "#B2B7C2" }),
@@ -24142,7 +24177,17 @@ const ListDataConvert = ({
       content: "Bạn có chắc chắn muốn hủy gửi duyệt không?",
       arrShow: [CATEGORY_PRICE_LIST_ENUM?.WAITING_CONFIRM],
       showTitle: true,
-      countLevel: [COUNT_LEVEL.ONE_LEVEL, COUNT_LEVEL.TWO_LEVEL]
+      countLevel: [COUNT_LEVEL.ONE_LEVEL, COUNT_LEVEL.TWO_LEVEL],
+      arrShows: [
+        {
+          status: [CATEGORY_PRICE_LIST_ENUM?.WAITING_APPROVAL],
+          level: [COUNT_LEVEL.ONE_LEVEL, COUNT_LEVEL.TWO_LEVEL]
+        },
+        {
+          status: [CATEGORY_PRICE_LIST_ENUM?.WAITING_CONFIRM],
+          level: [COUNT_LEVEL.ONE_LEVEL]
+        }
+      ]
     },
     {
       icon: /* @__PURE__ */ jsx(RejectApproveIcon, { className: "w-6 -h-6", size: 22, color: "#B2B7C2" }),
@@ -24155,7 +24200,17 @@ const ListDataConvert = ({
       content: "Bạn có chắc chắn muốn từ chối duyệt không? Hành động này không thể hoàn tác.",
       arrShow: [CATEGORY_PRICE_LIST_ENUM?.WAITING_CONFIRM],
       showTitle: true,
-      countLevel: [COUNT_LEVEL.ONE_LEVEL, COUNT_LEVEL.TWO_LEVEL]
+      countLevel: [COUNT_LEVEL.ONE_LEVEL, COUNT_LEVEL.TWO_LEVEL],
+      arrShows: [
+        {
+          status: [CATEGORY_PRICE_LIST_ENUM?.WAITING_APPROVAL],
+          level: [COUNT_LEVEL.ONE_LEVEL, COUNT_LEVEL.TWO_LEVEL]
+        },
+        {
+          status: [CATEGORY_PRICE_LIST_ENUM?.WAITING_CONFIRM],
+          level: [COUNT_LEVEL.ONE_LEVEL]
+        }
+      ]
     },
     {
       icon: /* @__PURE__ */ jsx(ApproveIcon, { className: "w-6 -h-6", size: 22, color: "#B2B7C2" }),
@@ -24189,19 +24244,25 @@ const DropListActions = ({
 }) => {
   //! State
   //! Function
-  const IsShow = (arrStatus, arrLevel) => {
-    return arrStatus.includes(status) && arrLevel.includes(countLevel);
+  const IsShow = (arrShows) => {
+    console.log("arrShows", arrShows);
+    if (!arrShows || arrShows.length === 0) return false;
+    return arrShows.some((cond) => {
+      const okStatus = !cond.status || cond.status.length === 0 || cond.status.includes(status);
+      const okLevel = !cond.level || cond.level.length === 0 || cond.level.includes(countLevel);
+      return okStatus && okLevel;
+    });
   };
   const renderContentPopover = () => {
     return /* @__PURE__ */ jsx("div", { className: "flex flex-col", children: !isEmpty(listIcon) && listIcon?.map(
-      (item, index) => item?.showTitle && IsShow(item?.arrShow, item?.countLevel) && /* @__PURE__ */ jsxs(
+      (item, index) => item?.showTitle && IsShow(item?.arrShows) && /* @__PURE__ */ jsxs(
         "button",
         {
           className: twMerge(
             "flex gap-4 px-3 py-2 rounded-sm  transition duration-200   hover:rounded-sm",
-            IsShow(item?.arrShow, item?.countLevel) ? "hover:bg-[#F5F6F7] cursor-pointer" : "text-[#B2B7C2] cursor-not-allowed"
+            IsShow(item?.arrShows) ? "hover:bg-[#F5F6F7] cursor-pointer" : "text-[#B2B7C2] cursor-not-allowed"
           ),
-          disabled: IsShow(item?.arrShow, item?.countLevel) ? false : true,
+          disabled: IsShow(item?.arrShows) ? false : true,
           onClick: () => {
             toggle();
             setNotifyContent({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pnkx-lib/ui",
   "private": false,
-  "version": "1.9.521",
+  "version": "1.9.524",
   "type": "module",
   "main": "./es/index.js",
   "module": "./es/index.js",

package/types/components/ui/CustomeBulkActions/ConvertData.d.ts

@@ -22,5 +22,9 @@ export type TListIcon = {
     name?: string;
     showTitle?: boolean;
     countLevel?: COUNT_LEVEL[];
+    arrShows?: {
+        status?: CATEGORY_PRICE_LIST_ENUM[];
+        level?: COUNT_LEVEL[];
+    }[];
 };
 export declare const ListDataConvert: ({ isApproved, typeService, handleBulkAction, handleBulkActionPrice, }: CustomeBulkActionsProps) => TListIcon[];

package/types/components/ui/CustomeBulkActions/DropListAction.d.ts

@@ -1,13 +1,17 @@
 import { ConfirmModalProps } from '../ConfirmModal';
-import { CATEGORY_LIST_ENUM, COUNT_LEVEL } from '../CategoryStatus';
+import { CATEGORY_LIST_ENUM, CATEGORY_PRICE_LIST_ENUM, COUNT_LEVEL } from '../CategoryStatus';
 export interface DropListActionsProps {
     listIcon: TListIcon[];
-    status?: unknown;
+    status: CATEGORY_PRICE_LIST_ENUM;
     setNotifyContent: React.Dispatch<React.SetStateAction<ConfirmModalProps>>;
     toggle: () => void;
     contentDropList?: React.ReactNode;
-    countLevel?: COUNT_LEVEL;
+    countLevel: COUNT_LEVEL;
 }
+export type typeArrShows = {
+    status?: CATEGORY_PRICE_LIST_ENUM[];
+    level?: COUNT_LEVEL[];
+};
 export type TListIcon = {
     icon: React.ReactNode;
     iconDisable: React.ReactNode;
@@ -20,5 +24,6 @@ export type TListIcon = {
     name?: string;
     showTitle?: boolean;
     countLevel: COUNT_LEVEL[];
+    arrShows: typeArrShows[];
 };
 export declare const DropListActions: ({ listIcon, status, setNotifyContent, toggle, contentDropList, countLevel, }: DropListActionsProps) => import("react/jsx-runtime").JSX.Element;

package/types/components/ui/CustomeBulkActions/index.d.ts

@@ -1,17 +1,17 @@
 import { TypeBulkActions, TypeCategoryBulkActions } from '../../../constants/bulkAction';
 import { default as React } from 'react';
 import { BulkActionHandlers, BulkActionPriceHandlers } from '@pnkx-lib/core';
-import { COUNT_LEVEL } from '../CategoryStatus';
+import { CATEGORY_PRICE_LIST_ENUM, COUNT_LEVEL } from '../CategoryStatus';
 interface CustomeBulkActionsProps {
     quantity?: number;
-    status?: unknown;
+    status: CATEGORY_PRICE_LIST_ENUM;
     isApproved?: boolean;
     typeBulkaction?: TypeBulkActions;
     typeService?: TypeCategoryBulkActions;
     handleBulkAction?: BulkActionHandlers;
     handleBulkActionPrice?: BulkActionPriceHandlers;
     contentDropList?: React.ReactNode;
-    countLevel?: COUNT_LEVEL;
+    countLevel: COUNT_LEVEL;
 }
 export declare const CustomeBulkActions: ({ quantity, status, isApproved, typeBulkaction, typeService, handleBulkAction, handleBulkActionPrice, contentDropList, countLevel, }: CustomeBulkActionsProps) => import("react/jsx-runtime").JSX.Element;
 declare const _default: React.MemoExoticComponent<({ quantity, status, isApproved, typeBulkaction, typeService, handleBulkAction, handleBulkActionPrice, contentDropList, countLevel, }: CustomeBulkActionsProps) => import("react/jsx-runtime").JSX.Element>;

package/types/components/ui/TableForm/index.d.ts

@@ -8,7 +8,7 @@ export interface TableFormProps<T> extends Omit<TableCommonProps<T>, "onChangePa
     handleSubmit?: () => Promise<void>;
     formFieldArray: UseFieldArrayReturn<any, any, any>;
     handleCancel?: () => void;
-    hideCreateButton?: boolean;
+    hideCountNewItem?: boolean;
     renderHeadingTable?: () => React.ReactNode;
     handleRemoveSelected?: () => void;
 }