awing-library 2.1.25 → 2.1.26

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

@@ -70,11 +70,14 @@ var NotificationDetail = function (props) {
         status: Constant_1.Constants.ALL_STATUS,
     }), valueFilter = _a[0], setValueFilter = _a[1];
     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 _c = react_1.default.useState(0), count = _c[0], setCount = _c[1];
+    var _d = react_1.default.useState(true), isInViewPort = _d[0], setIsInViewPort = _d[1];
+    var _e = (0, react_1.useState)([]), notificationMessage = _e[0], setNotificationMessage = _e[1];
     var totalItemCount = (0, react_1.useRef)(0);
     (0, react_1.useEffect)(function () {
-        var observer = new IntersectionObserver(handleIntersection);
+        var observer = new IntersectionObserver(function (entries) {
+            entries.map(function (entry) { return entry.isIntersecting; }).forEach(setIsInViewPort);
+        });
         var lastItem = document.getElementById('last-Item');
         if (observer && lastItem) {
             setIsLoading(true);
@@ -83,40 +86,40 @@ var NotificationDetail = function (props) {
         return function () {
             if (observer) {
                 observer.disconnect();
+                observer = null;
             }
         };
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     (0, react_1.useEffect)(function () {
-        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, [])
-                .then(function (res) {
-                setNotificationMessage(function (prevMessages) {
-                    var newItems = res.items.filter(function (newItem) {
-                        return !prevMessages.some(function (prevItem) { return prevItem.id === newItem.id; });
-                    });
-                    return __spreadArray(__spreadArray([], prevMessages, true), newItems, true);
+        setIsLoading(true);
+        service
+            .notificationsPaging(count, Constant_1.Constants.PAGE_SIZE_DEFAULT, valueFilter.textSearch, valueFilter.status, [])
+            .then(function (res) {
+            setNotificationMessage(function (prevMessages) {
+                var newItems = res.items.filter(function (newItem) {
+                    return !prevMessages.some(function (prevItem) { return prevItem.id === newItem.id; });
                 });
-                totalItemCount.current = res.totalItemCount;
-            })
-                .finally(function () {
-                setIsLoading(false);
+                return __spreadArray(__spreadArray([], prevMessages, true), newItems, true);
             });
-        }
+            totalItemCount.current = res.totalItemCount;
+        })
+            .finally(function () {
+            setIsLoading(false);
+        });
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [count, valueFilter.textSearch, valueFilter.status]);
-    var handleIntersection = (0, react_1.useCallback)(function (entries) {
-        var firsEntry = entries[0];
-        if (firsEntry.isIntersecting) {
+    (0, react_1.useEffect)(function () {
+        if (isInViewPort &&
+            notificationMessage.length < totalItemCount.current &&
+            !isLoading) {
             setCount(function (old) { return old + 1; });
         }
-    }, []);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [isInViewPort]);
     var handleValueFilter = function (textSearch, tabs) {
-        textSearch.length === 0 ? setCount(0) : setCount(-1);
         setNotificationMessage([]);
+        setCount(0);
         totalItemCount.current = 0;
         setValueFilter({
             textSearch: textSearch,

package/lib/ACM-AXN/Notifications/Types.d.ts

@@ -76,7 +76,7 @@ export interface NotificationMessageField {
 export interface PagedList_1OfNotificationMessage {
     items?: NotificationMessage[] | undefined;
     pageCount?: number;
-    totalItemCount?: number;
+    totalItemCount: number;
     pageNumber?: number;
     pageSize?: number;
     hasPreviousPage?: boolean;

package/lib/ACM-AXN/Page/CreateOrEdit/Tabview/ViewContent.js

@@ -116,7 +116,7 @@ var ViewContent = function (_a) {
     }, [events]);
     var handleResData = function (res) {
         onChange(['viewDatas'], (0, Utils_1.getTemplateDatas)(res.templateParameters, viewInfoData, pageId, viewNumber));
-        setEvent(function (prev) { return __spreadArray(__spreadArray([], res.templateEvents.map(function (item) { return ({ id: item.id, event: item.event, viewNumber: viewNumber + 1, pageId: pageId, protected: true }); }), true), prev, true); });
+        setEvent(function (prev) { var _a; return __spreadArray(__spreadArray([], (_a = res === null || res === void 0 ? void 0 : res.templateEvents) === null || _a === void 0 ? void 0 : _a.map(function (item) { return ({ id: item.id, event: item.event, viewNumber: viewNumber + 1, pageId: pageId, protected: true }); }), true), prev, true); });
         isUniq.current = false;
         onChange(['templateValidation'], res.template.validation);
         onChange(['templateHandleEvent'], res.template.autoField);

package/lib/translate/en/translation.json

@@ -161,7 +161,7 @@
     },
     "InvalidMessage": {
         "InvalidNotExistedUsername": "Username is invalid or not existed",
-        "InvalidAccountConnected": "Account has been added to this domain!"
+        "InvalidAccountConnected": "Account is already existed!"
     },
     "ViewTemplate": {
         "Value": "Value",

package/lib/translate/vi/translation.json

@@ -125,7 +125,7 @@
     },
     "InvalidMessage": {
         "InvalidNotExistedUsername": "Tài khoản không tồn tại",
-        "InvalidAccountConnected": "Tài khoản đã được gắn vào domain này rồi!"
+        "InvalidAccountConnected": "Tài khoản đã tồn tại!"
     },
     "User": {
         "Username": "Tài khoản",

package/package.json

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