awing-library 2.1.5 → 2.1.6

package/lib/ACM-AXN/Notifications/Constant.js

@@ -15,7 +15,7 @@ exports.Constants = {
     ALL: 'All',
     ALL_STATUS: undefined,
     UNREAD: 'Unread',
-    UNREAD_STATUS: 1,
+    UNREAD_STATUS: 0,
     SELECT_ALL: 'SelectAll',
     NOTIFICATIONS_PATH: 'Notifications',
     NOTIFICATION_SETTING_SCREEN_PATH: 'Notification',

package/lib/ACM-AXN/Notifications/NotificationDetail/HeaderInfo/ButtonTabs.js

@@ -14,8 +14,10 @@ var ButtonTabs = function (props) {
     };
     return ((0, jsx_runtime_1.jsxs)(material_1.Box, { mt: 2, component: "div", children: [(0, jsx_runtime_1.jsx)(material_1.Button, { onClick: handleUpdateTabs, sx: [
                     {
-                        fontWeight: '600',
+                        fontSize: '14px',
+                        fontWeight: 700,
                         borderRadius: '24px',
+                        textTransform: 'none',
                         color: tabActive === Constant_1.Constants.ALL ? '#FFF' : '#000',
                         backgroundColor: tabActive === Constant_1.Constants.ALL ? '#ED1D25' : 'inherit',
                     },
@@ -26,11 +28,13 @@ var ButtonTabs = function (props) {
                                 : 'inherit',
                         },
                     },
-                ], "data-tabs": Constant_1.Constants.ALL, children: t('Common.All') }), (0, jsx_runtime_1.jsx)(material_1.Button, { onClick: handleUpdateTabs, "data-tabs": Constant_1.Constants.UNREAD, sx: [
+                ], "data-tabs": Constant_1.Constants.ALL, children: t('Notification.All') }), (0, jsx_runtime_1.jsx)(material_1.Button, { onClick: handleUpdateTabs, "data-tabs": Constant_1.Constants.UNREAD, sx: [
                     {
+                        fontSize: '14px',
                         marginLeft: '8px',
-                        fontWeight: '600',
+                        fontWeight: 700,
                         borderRadius: '24px',
+                        textTransform: 'none',
                         color: tabActive === Constant_1.Constants.UNREAD ? '#FFF' : '#000',
                         backgroundColor: tabActive === Constant_1.Constants.UNREAD
                             ? '#ED1D25'
@@ -43,6 +47,6 @@ var ButtonTabs = function (props) {
                                 : 'inherit',
                         },
                     },
-                ], children: t('Common.Unread') })] }));
+                ], children: t('Notification.Unread') })] }));
 };
 exports.default = ButtonTabs;

package/lib/ACM-AXN/Notifications/NotificationDetail/HeaderInfo/MenuNotification.js

@@ -73,6 +73,6 @@ var MenuNotification = function (props) {
                 }, children: menuData().map(function (item) { return ((0, jsx_runtime_1.jsxs)(material_1.MenuItem, { onClick: selectMenuItem, "data-value": item.value, children: [(0, jsx_runtime_1.jsx)(material_1.Box, { mr: 2, style: {
                                 display: 'flex',
                                 justifyContent: 'center',
-                            }, children: (item === null || item === void 0 ? void 0 : item.icon) && ((0, jsx_runtime_1.jsx)("img", { alt: "", src: item.icon, style: { width: '20px', height: '20px' } })) }), (0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "inherit", children: item.title })] }, item.id)); }) })] }));
+                            }, children: (item === null || item === void 0 ? void 0 : item.icon) && ((0, jsx_runtime_1.jsx)("img", { alt: "", src: item.icon, style: { width: '20px', height: '20px' } })) }), (0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "inherit", sx: { fontSize: '15px', fontWeight: 400 }, children: item.title })] }, item.id)); }) })] }));
 };
 exports.default = react_1.default.memo(MenuNotification);

package/lib/ACM-AXN/Notifications/NotificationDetail/HeaderInfo/index.d.ts

@@ -10,6 +10,7 @@ interface PropsHeaderInfo {
         textSearch: string;
         tabs: string;
     };
+    onClosePopover?: () => void;
     onUpdateStatus: (dataSent: IValueItem | string) => void;
     onValueFilter: (textSearch: string, tabs: string) => void;
 }

package/lib/ACM-AXN/Notifications/NotificationDetail/HeaderInfo/index.js

@@ -20,11 +20,15 @@ var Router_1 = require("../../../../AWING/Router");
 var HeaderInfo = function (props) {
     var navigate = (0, Router_1.useNavigate)();
     var t = (0, react_i18next_1.useTranslation)().t;
-    var valueFilter = props.valueFilter, _a = props.onValueFilter, onValueFilter = _a === void 0 ? function () { return null; } : _a, _b = props.onUpdateStatus, onUpdateStatus = _b === void 0 ? function () { return null; } : _b;
+    var valueFilter = props.valueFilter, _a = props.onValueFilter, onValueFilter = _a === void 0 ? function () { return null; } : _a, _b = props.onUpdateStatus, onUpdateStatus = _b === void 0 ? function () { return null; } : _b, _c = props.onClosePopover, onClosePopover = _c === void 0 ? function () { return null; } : _c;
     var handleUpdateMenuItem = function (value) {
         if (value === Constant_1.Constants.SELECT_ALL) {
             onUpdateStatus(Constant_1.Constants.ALL);
         }
+        else if (value === Constant_1.Constants.NOTIFICATION_SETTING_SCREEN_PATH) {
+            navigate("".concat(value));
+            onClosePopover();
+        }
         else {
             // Chuyển đến trang tương ứng
             navigate("".concat(value));
@@ -40,15 +44,10 @@ var HeaderInfo = function (props) {
                     display: 'flex',
                     flexDirection: 'row',
                     justifyContent: 'space-between',
-                }, children: [(0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "h1", style: {
-                            fontWeight: '700',
-                            fontSize: '1.5em',
-                        }, children: t('Common.Notification') }), (0, jsx_runtime_1.jsx)(MenuNotification_1.default, { onUpdateMenuItem: handleUpdateMenuItem })] }), (0, jsx_runtime_1.jsx)(SearchBox_1.default, { variantPaper: "outlined", onSearch: handleKeyWordPassing, stylePaper: {
+                }, children: [(0, jsx_runtime_1.jsx)(material_1.Typography, { component: "h1", variant: "h5", color: "inherit", noWrap: true, fontWeight: 'bold', children: t('Common.Notification') }), (0, jsx_runtime_1.jsx)(MenuNotification_1.default, { onUpdateMenuItem: handleUpdateMenuItem })] }), (0, jsx_runtime_1.jsx)(SearchBox_1.default, { onSearch: handleKeyWordPassing, stylePaper: {
                     flex: 1,
                     width: 'auto',
                     maxWidth: '100%',
-                    borderRadius: '24px',
-                    padding: '2px 20px 2px 10px',
                 } }), (0, jsx_runtime_1.jsx)(ButtonTabs_1.default, { tabActive: valueFilter.tabs, onUpdateTabActive: handleUpdateTabActive })] }));
 };
 exports.default = HeaderInfo;

package/lib/ACM-AXN/Notifications/NotificationDetail/NotificationList/NotificationEmpty.js

@@ -24,9 +24,9 @@ var NotificationEmpty = function (props) {
             alignItems: 'center',
             justifyContent: 'space-between',
         }, children: [(0, jsx_runtime_1.jsx)("img", { src: (isSearch ? binoculars_svg_1.default : bell_svg_1.default), alt: isSearch ? 'iconBinoculars' : 'iconBell', style: { width: '80px', height: '80px' } }), (0, jsx_runtime_1.jsx)(material_1.Typography, { style: {
-                    fontSize: '1.3em',
+                    fontSize: '20px',
                     color: '#65676B',
-                    fontWeight: '600',
+                    fontWeight: 600,
                     marginTop: '10px',
                     textAlign: 'center',
                 }, children: isSearch

package/lib/ACM-AXN/Notifications/NotificationDetail/NotificationList/NotificationItem/NotificationAvatar.js

@@ -25,8 +25,8 @@ var material_1 = require("@mui/material");
 var NotificationAvatar = function (props) {
     var url = props.url, name = props.name;
     var styleAvatar = {
-        width: '56px',
-        height: '56px',
+        width: '54px',
+        height: '54px',
         border: '1px solid #0000001a',
     };
     if (!url) {

package/lib/ACM-AXN/Notifications/NotificationDetail/NotificationList/NotificationItem/NotificationContent.js

@@ -29,23 +29,26 @@ var NotificationContent = function (props) {
                         textOverflow: 'ellipsis',
                         display: '-webkit-box',
                         WebkitBoxOrient: 'vertical',
-                        WebkitLineClamp: 2,
+                        WebkitLineClamp: 5,
                         margin: '0 0 2px 0',
                         lineHeight: 1.2,
-                        fontSize: '1rem',
+                        fontSize: '14px',
+                        fontWeight: 400,
                         justifyContent: 'space-between',
                     },
                     {
                         '& h1, h2, h3, h4, h5, h6, p, span, b, strong, small, em, i, big': {
                             marginTop: 0,
                             marginBottom: 0,
-                            fontSize: '1rem',
+                            fontSize: '14px',
+                            fontWeight: 400,
                             textAlign: 'justify',
                         },
                         '& a': {
                             color: '#1a0dab',
                             textDecoration: 'none',
-                            fontSize: '1rem',
+                            fontSize: '14px',
+                            fontWeight: 400,
                             textAlign: 'justify',
                         },
                     },

package/lib/ACM-AXN/Notifications/NotificationDetail/NotificationList/NotificationItem/index.js

@@ -25,10 +25,10 @@ var NotificationItem = function (props) {
     };
     var handleClickNotification = function () {
         navigate((0, Message_1.getFullDescription)(sagaTransactionType, t, fields).url);
-        status === Types_1.NotificationMessageStatus.Read &&
+        status === Types_1.NotificationMessageStatus.Unread &&
             onUpdateStatus({ id: id, status: status });
     };
-    var itemStatus = status === Types_1.NotificationMessageStatus.Read;
+    var itemStatus = status === Types_1.NotificationMessageStatus.Unread;
     return ((0, jsx_runtime_1.jsxs)(material_1.Box, { color: "inherit", onClick: handleClickNotification, sx: [
             {
                 display: 'flex',

package/lib/ACM-AXN/Notifications/NotificationDetail/NotificationList/index.js

@@ -44,7 +44,7 @@ var NotificationList = function (props) {
     var _c = (0, react_1.useState)(notificationMessage), notifications = _c[0], setNotifications = _c[1];
     (0, react_1.useLayoutEffect)(function () {
         setNotifications(valueFilter.tabs === Constant_1.Constants.UNREAD
-            ? notificationMessage.filter(function (item) { return item.status === Types_1.NotificationMessageStatus.Read; })
+            ? notificationMessage.filter(function (item) { return item.status === Types_1.NotificationMessageStatus.Unread; })
             : notificationMessage);
     }, [notificationMessage, valueFilter.tabs]);
     if (!notifications.length && !isLoading) {

package/lib/ACM-AXN/Notifications/NotificationDetail/index.d.ts

@@ -3,6 +3,9 @@
  * @author dauquan1108@gmail.com on 11/27/2023.
  *
  **/
-import React from 'react';
-declare const NotificationDetail: React.FC;
+/// <reference types="react" />
+interface NotificationDetailProps {
+    onClosePopover?: () => void;
+}
+declare const NotificationDetail: (props: NotificationDetailProps) => JSX.Element;
 export default NotificationDetail;

package/lib/ACM-AXN/Notifications/NotificationDetail/index.js

@@ -61,8 +61,9 @@ var Constant_1 = require("../Constant");
 var Hooks_1 = __importDefault(require("../Hooks"));
 var NotificationList_1 = __importDefault(require("./NotificationList"));
 var Types_1 = require("../Types");
-var NotificationDetail = function () {
+var NotificationDetail = function (props) {
     var service = (0, Hooks_1.default)().service;
+    var onClosePopover = props.onClosePopover;
     var _a = (0, react_1.useState)({
         textSearch: '',
         tabs: Constant_1.Constants.ALL,
@@ -71,6 +72,7 @@ var NotificationDetail = function () {
     var _b = react_1.default.useState(false), isLoading = _b[0], setIsLoading = _b[1];
     var _c = react_1.default.useState(-1), count = _c[0], setCount = _c[1];
     var _d = (0, react_1.useState)([]), notificationMessage = _d[0], setNotificationMessage = _d[1];
+    var totalItemCount = (0, react_1.useRef)(0);
     (0, react_1.useEffect)(function () {
         var observer = new IntersectionObserver(handleIntersection);
         var lastItem = document.getElementById('last-Item');
@@ -85,7 +87,9 @@ var NotificationDetail = function () {
         };
     }, []);
     (0, react_1.useEffect)(function () {
-        if (count >= 0) {
+        if (count >= 0 &&
+            (totalItemCount.current > notificationMessage.length ||
+                notificationMessage.length === 0)) {
             setIsLoading(true);
             service
                 .notificationsPaging(count, Constant_1.Constants.PAGE_SIZE_DEFAULT, valueFilter.textSearch, valueFilter.status, [])
@@ -96,6 +100,7 @@ var NotificationDetail = function () {
                     });
                     return __spreadArray(__spreadArray([], prevMessages, true), newItems, true);
                 });
+                totalItemCount.current = res.totalItemCount;
             })
                 .finally(function () {
                 setIsLoading(false);
@@ -112,6 +117,7 @@ var NotificationDetail = function () {
     var handleValueFilter = function (textSearch, tabs) {
         textSearch.length === 0 ? setCount(0) : setCount(-1);
         setNotificationMessage([]);
+        totalItemCount.current = 0;
         setValueFilter({
             textSearch: textSearch,
             tabs: tabs,
@@ -123,12 +129,12 @@ var NotificationDetail = function () {
     var handleUpdateStatus = (0, react_1.useCallback)(function (dataSent) {
         if (typeof dataSent === 'string') {
             var isCheckStatus = notificationMessage.some(function (item) {
-                return item.status === Types_1.NotificationMessageStatus.Read;
+                return item.status === Types_1.NotificationMessageStatus.Unread;
             });
             if (isCheckStatus) {
                 service.notificationsReadAll().then(function () {
                     setNotificationMessage(function (prevNotifications) {
-                        return prevNotifications.map(function (item) { return (__assign(__assign({}, item), { status: Types_1.NotificationMessageStatus.Unread })); });
+                        return prevNotifications.map(function (item) { return (__assign(__assign({}, item), { status: Types_1.NotificationMessageStatus.Read })); });
                     });
                 });
             }
@@ -153,6 +159,6 @@ var NotificationDetail = function () {
                 });
         }
     }, [notificationMessage, service]);
-    return ((0, jsx_runtime_1.jsxs)(react_i18next_1.I18nextProvider, { i18n: i18n_1.default, children: [(0, jsx_runtime_1.jsx)(Box_1.default, { pt: 2, pl: 2, pr: 2, pb: 1, component: "div", children: (0, jsx_runtime_1.jsx)(HeaderInfo_1.default, { valueFilter: valueFilter, onValueFilter: handleValueFilter, onUpdateStatus: handleUpdateStatus }) }), (0, jsx_runtime_1.jsx)(Box_1.default, { pl: 1, pr: 1, pb: 1, component: "div", children: (0, jsx_runtime_1.jsx)(NotificationList_1.default, { isLoading: isLoading, valueFilter: valueFilter, notificationMessage: notificationMessage, onUpdateStatus: handleUpdateStatus }) }), (0, jsx_runtime_1.jsx)(Box_1.default, { id: "last-Item", component: "div", sx: { height: '20px' } })] }));
+    return ((0, jsx_runtime_1.jsxs)(react_i18next_1.I18nextProvider, { i18n: i18n_1.default, children: [(0, jsx_runtime_1.jsx)(Box_1.default, { pt: 2, pl: 2, pr: 2, pb: 1, component: "div", children: (0, jsx_runtime_1.jsx)(HeaderInfo_1.default, { valueFilter: valueFilter, onClosePopover: onClosePopover, onValueFilter: handleValueFilter, onUpdateStatus: handleUpdateStatus }) }), (0, jsx_runtime_1.jsx)(Box_1.default, { pl: 1, pr: 1, pb: 1, component: "div", children: (0, jsx_runtime_1.jsx)(NotificationList_1.default, { isLoading: isLoading, valueFilter: valueFilter, notificationMessage: notificationMessage, onUpdateStatus: handleUpdateStatus }) }), (0, jsx_runtime_1.jsx)(Box_1.default, { id: "last-Item", component: "div", sx: { height: '20px' } })] }));
 };
 exports.default = NotificationDetail;

package/lib/ACM-AXN/Notifications/NotificationPopover/Container.js

@@ -144,6 +144,6 @@ var Container = function () {
                                 backgroundColor: '#c1c1c1',
                             },
                         },
-                    ], children: (0, jsx_runtime_1.jsx)(NotificationDetail_1.default, {}) }) })] }));
+                    ], children: (0, jsx_runtime_1.jsx)(NotificationDetail_1.default, { onClosePopover: handleClose }) }) })] }));
 };
 exports.default = Container;

package/lib/ACM-AXN/Page/CreateOrEdit/Utils.d.ts

@@ -4,7 +4,7 @@ export declare const isObjectType: (value: unknown) => value is object;
 export declare const isObject: <T extends object>(value: unknown) => value is T;
 export declare const composeKey: <F extends (...p: any[]) => any, G extends (...p: any[]) => any>(f: F, g: G) => F;
 export declare const concatKey: (parent: string | string[]) => (child: string | string[]) => string[];
-export declare const setObject: <O extends {}>(obj: O, arrKey: Array<keyof O>, value: unknown) => void;
+export declare const setObject: <O extends {}>(obj: O, arrKey: (keyof O)[], value: unknown) => void;
 export declare const convertTreeArrayToFlatArray: (treeArray: DataObject[]) => any[];
 export declare const convertValueByType: (type: string, val: any) => any;
 export declare const getFieldsValid: (templateDatas: TemplateData[]) => boolean[];

package/lib/translate/en/translation.json

@@ -657,6 +657,8 @@
         "CampaignDefault": "Campaign Default"
     },
     "Notification": {
+        "All": "All",
+        "Unread": "Unread",
         "TitleManagement": "Notification Management",
         "TitleDetail": "Reciever detail",
         "TitleAddReceiver": "Add User/Group User",

package/lib/translate/vi/translation.json

@@ -659,6 +659,8 @@
         "CampaignDefault": "Chiến dịch mặc định"
     },
     "Notification": {
+        "All": "Tất cả",
+        "Unread": "Chưa đọc",
         "TitleManagement": "Quản trị thông báo",
         "TitleDetail": "Chi tiết người nhận thông báo",
         "TitleAddReceiver": "Thêm người dùng/nhóm người dùng",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "awing-library",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",