awing-library 2.1.225-dev → 2.1.226-dev

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabApprove/RowTable.d.ts

@@ -6,12 +6,12 @@ interface TableRowProps {
     sub: ICammpaignItem;
     linkIndex: number;
     subIndex: number;
-    rowSelected: number[];
-    handleRowSelect: (id: number) => void;
-    updateRow: (row: {
+    rowSelected: string[];
+    handleRowSelect: (id: string) => void;
+    updateRow: (dataTableUpdate: {
         status: number;
         description: string;
-    }, id: number) => void;
+    }, rowId: string, linkId: string) => void;
 }
 declare const TableRowMemo: React.FC<TableRowProps>;
 export default TableRowMemo;

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabApprove/RowTable.js

@@ -56,7 +56,7 @@ var TableRowMemo = react_1.default.memo(function (_a) {
         updateRow({
             status: newStatus,
             description: valueInput
-        }, row.id);
+        }, row.id, link.id);
     }, [row, link]);
     var handleInputChange = (0, react_1.useCallback)(function (event) {
         var newValue = event.target.value;
@@ -64,7 +64,7 @@ var TableRowMemo = react_1.default.memo(function (_a) {
         updateRow({
             status: selectStatus,
             description: newValue
-        }, row.id);
+        }, row.id, link.id);
     }, [row, link]);
     return ((0, jsx_runtime_1.jsxs)(material_1.TableRow, { children: [linkIndex === 0 && subIndex === 0 && ((0, jsx_runtime_1.jsx)(material_1.TableCell, { rowSpan: row.detail.reduce(function (acc, curr) { return acc + curr.campaign.length; }, 0), style: { width: 60, padding: '0 0 0 4px' }, children: (0, jsx_runtime_1.jsx)(material_1.Box, { display: 'flex', children: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { checked: rowSelected.some(function (x) { return x === row.id; }), color: "primary", onChange: function () { return handleRowSelect(row.id); } }) }) })), linkIndex === 0 && subIndex === 0 && ((0, jsx_runtime_1.jsx)(material_1.TableCell, { rowSpan: row.detail.reduce(function (acc, curr) { return acc + curr.campaign.length; }, 0), children: row.domain.domainName })), subIndex === 0 && ((0, jsx_runtime_1.jsx)(material_1.TableCell, { rowSpan: link.campaign.length, style: { maxWidth: 400 }, children: (0, jsx_runtime_1.jsx)(material_1.Box, { sx: {
                         display: '-webkit-box',

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabApprove/RowTable.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabApprove/RowTable.test.js

@@ -1,74 +1,219 @@
 "use strict";
-// import { fireEvent, render, screen } from '@testing-library/react'
-// import { RowTable } from './RowTable'
-// jest.mock('react-i18next', () => ({
-//     useTranslation: () => ({ t: (key: any) => key }),
-// }))
-// // Mock the MUI components
-// jest.mock('@mui/material', () => ({
-//     ...jest.requireActual('@mui/material'),
-//     TableRow: ({ children }: any) => <tr>{children}</tr>,
-//     TableCell: ({ children }: any) => <td>{children}</td>,
-//     Box: ({ children }: any) => <div>{children}</div>,
-//     Link: ({ children, href }: any) => <a href={href}>{children}</a>,
-//     Chip: ({ label }: any) => <span>{label}</span>,
-//     FormControl: ({ children }: any) => <div>{children}</div>,
-//     Select: ({ children, value, onChange }: any) => (
-//         <select value={value} onChange={onChange}>
-//             {children}
-//         </select>
-//     ),
-//     MenuItem: ({ children, value }: any) => (
-//         <option value={value}>{children}</option>
-//     ),
-//     TextField: ({ value, onChange }: any) => (
-//         <input type="text" value={value} onChange={onChange} />
-//     ),
-// }))
-// const mockRow = {
-//     id: 1,
-//     linkPreview: 'https://example.com',
-//     subCampaigns: [
-//         { id: '1', name: 'Campaign 1' },
-//         { id: '2', name: 'Campaign 2' },
-//     ],
-//     description: 'Initial note',
-//     status: 0,
-// }
-// const renderUi = () =>
-//     render(<RowTable row={mockRow} id={1} updateRow={() => {}} />)
-// describe('RowTable', () => {
-//     it('renders the link correctly', () => {
-//         renderUi()
-//         const link = screen.getByRole('link', { name: 'https://example.com' })
-//         expect(link).toBeInTheDocument()
-//         expect(link).toHaveAttribute('href', 'https://example.com')
-//     })
-//     it('renders sub-campaigns as chips', () => {
-//         renderUi()
-//         expect(screen.getByText('Campaign 1')).toBeInTheDocument()
-//         expect(screen.getByText('Campaign 2')).toBeInTheDocument()
-//     })
-//     it('renders the select with correct initial value', () => {
-//         renderUi()
-//         const select = screen.getByRole('combobox')
-//         expect(select).toHaveValue('0')
-//     })
-//     it('changes the select value when a new option is chosen', () => {
-//         renderUi()
-//         const select = screen.getByRole('combobox')
-//         fireEvent.change(select, { target: { value: 0 } })
-//         expect(select).toHaveValue('0')
-//     })
-//     it('renders the text field with the initial note', () => {
-//         renderUi()
-//         const textField = screen.getByRole('textbox')
-//         expect(textField).toHaveValue('Initial note')
-//     })
-//     it('updates the text field value when typed into', () => {
-//         renderUi()
-//         const textField = screen.getByRole('textbox')
-//         fireEvent.change(textField, { target: { value: 'New note' } })
-//         expect(textField).toHaveValue('New note')
-//     })
-// })
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var jsx_runtime_1 = require("react/jsx-runtime");
+var react_1 = require("@testing-library/react");
+var Enum_1 = require("../../../../ACM-AXN/Campaign/Enum");
+var RowTable_1 = __importDefault(require("./RowTable"));
+var user_event_1 = __importDefault(require("@testing-library/user-event"));
+// Mock the useTranslation hook
+jest.mock('react-i18next', function () { return ({
+    useTranslation: function () { return ({ t: function (key) { return key; } }); },
+}); });
+var mockProps = {
+    row: {
+        id: '100',
+        domain: {
+            domainName: 'Vincom',
+            domainId: '100',
+        },
+        detail: [
+            {
+                id: '10c77e54-8aff-4e36-8334-70eca26d5a75',
+                linkPreview: 'http://connect.awifi.com.vn/Preview/Page?loginId=5122170857262705548&welcomeId=4841207366749869113&isNetworkCampaign=true&domainId=100',
+                campaign: [
+                    {
+                        subCampaigns: [
+                            {
+                                id: 1,
+                                name: 'Sub-Campaign 1',
+                            },
+                        ],
+                        ads: [
+                            {
+                                id: 1,
+                                name: 'Ad 1',
+                            },
+                            {
+                                id: 2,
+                                name: 'Ad 2',
+                            },
+                        ],
+                    },
+                ],
+                status: 0,
+                description: '',
+                loginId: '5122170857262705548',
+                welcomeId: '4841207366749869113',
+            },
+        ],
+    },
+    link: {
+        id: '10c77e54-8aff-4e36-8334-70eca26d5a75',
+        linkPreview: 'http://connect.awifi.com.vn/Preview/Page?loginId=5122170857262705548&welcomeId=4841207366749869113&isNetworkCampaign=true&domainId=100',
+        campaign: [
+            {
+                subCampaigns: [
+                    {
+                        id: 1,
+                        name: 'Sub-Campaign 1',
+                    },
+                ],
+                ads: [
+                    {
+                        id: 1,
+                        name: 'Ad 1',
+                    },
+                    {
+                        id: 2,
+                        name: 'Ad 2',
+                    },
+                ],
+            },
+        ],
+        status: 0,
+        description: '',
+        loginId: '5122170857262705548',
+        welcomeId: '4841207366749869113',
+    },
+    sub: {
+        subCampaigns: [
+            {
+                id: 1,
+                name: 'Sub-Campaign 1',
+            },
+        ],
+        ads: [
+            {
+                id: 1,
+                name: 'Ad 1',
+            },
+            {
+                id: 2,
+                name: 'Ad 2',
+            },
+        ],
+    },
+    linkIndex: 0,
+    subIndex: 0,
+    rowSelected: [],
+    handleRowSelect: jest.fn(),
+    updateRow: jest.fn(),
+};
+// Mock cho các component MUI
+jest.mock('@mui/material', function () { return (__assign(__assign({}, jest.requireActual('@mui/material')), { TableCell: function (_a) {
+        var children = _a.children;
+        return (0, jsx_runtime_1.jsx)("td", { children: children });
+    }, Chip: function (_a) {
+        var label = _a.label;
+        return (0, jsx_runtime_1.jsx)("span", { children: label });
+    }, FormControl: function (_a) {
+        var children = _a.children;
+        return (0, jsx_runtime_1.jsx)("div", { children: children });
+    }, Select: function (_a) {
+        var children = _a.children, value = _a.value, onChange = _a.onChange;
+        return ((0, jsx_runtime_1.jsx)("select", { value: value, onChange: onChange, children: children }));
+    }, MenuItem: function (_a) {
+        var children = _a.children, value = _a.value;
+        return ((0, jsx_runtime_1.jsx)("option", { value: value, children: children }));
+    }, TextField: function (_a) {
+        var value = _a.value, onChange = _a.onChange;
+        return ((0, jsx_runtime_1.jsx)("input", { type: "text", value: value, onChange: onChange }));
+    }, Link: function (_a) {
+        var children = _a.children, href = _a.href, target = _a.target;
+        return ((0, jsx_runtime_1.jsx)("a", { href: href, target: target, children: children }));
+    } })); });
+var renderUi = function () {
+    return (0, react_1.render)((0, jsx_runtime_1.jsx)("table", { children: (0, jsx_runtime_1.jsx)("tbody", { children: (0, jsx_runtime_1.jsx)(RowTable_1.default, __assign({}, mockProps)) }) }));
+};
+describe('TableRowMemo', function () {
+    it('renders correctly', function () {
+        renderUi();
+        expect(react_1.screen.getByText('Vincom')).toBeInTheDocument();
+        expect(react_1.screen.getByText('http://connect.awifi.com.vn/Preview/Page?loginId=5122170857262705548&welcomeId=4841207366749869113&isNetworkCampaign=true&domainId=100')).toBeInTheDocument();
+        expect(react_1.screen.getByText('Sub-Campaign 1')).toBeInTheDocument();
+        expect(react_1.screen.getByText('Ad 1')).toBeInTheDocument();
+    });
+    it('handles checkbox change', function () {
+        renderUi();
+        var checkbox = react_1.screen.getByRole('checkbox');
+        react_1.fireEvent.click(checkbox);
+        expect(mockProps.handleRowSelect).toHaveBeenCalledWith('100');
+    });
+    it('handles status change', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var select;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    renderUi();
+                    select = react_1.screen.getByRole('combobox');
+                    return [4 /*yield*/, user_event_1.default.selectOptions(select, Enum_1.CampaignApprovalStatus.Rejected.toString())];
+                case 1:
+                    _a.sent();
+                    expect(mockProps.updateRow).toHaveBeenCalledWith({
+                        status: Enum_1.CampaignApprovalStatus.Rejected.toString(),
+                        description: '',
+                    }, '100', '10c77e54-8aff-4e36-8334-70eca26d5a75');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('handles description change', function () {
+        renderUi();
+        var input = react_1.screen.getByRole('textbox');
+        react_1.fireEvent.change(input, { target: { value: 'New description' } });
+        expect(mockProps.updateRow).toHaveBeenCalledWith({
+            status: Enum_1.CampaignApprovalStatus.PendingApproval,
+            description: 'New description',
+        }, '100', '10c77e54-8aff-4e36-8334-70eca26d5a75');
+    });
+});

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabApprove/index.d.ts

@@ -7,15 +7,17 @@ export interface ICammpaignItem {
     ads: IItem[];
 }
 export interface IDetail {
-    id?: number;
+    id?: string;
     status: number;
     linkPreview: string;
     subCampaigns?: IItem[];
+    loginId?: string;
+    welcomeId?: string;
     campaign: ICammpaignItem[];
     description: string;
 }
 export interface IDataTable {
-    id: number;
+    id: string;
     domain: {
         domainName?: string;
         domainId?: string;

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabApprove/index.js

@@ -33,8 +33,8 @@ var react_1 = require("react");
 var react_i18next_1 = require("react-i18next");
 var recoil_1 = require("recoil");
 var Recoils_1 = require("../Recoils");
-var atoms_1 = require("../TabSubCampaign/atoms");
 var RowTable_1 = __importDefault(require("./RowTable"));
+var Helpers_1 = require("../../../../Utils/Helpers");
 function TabApprove() {
     var t = (0, react_i18next_1.useTranslation)().t;
     var campaignId = (0, Router_1.useParams)().campaignId;
@@ -42,24 +42,22 @@ function TabApprove() {
     var setConfirmExit = (0, recoil_1.useSetRecoilState)(Recoils_1.confirmExitState);
     var _b = (0, react_1.useState)([]), rowSelected = _b[0], setRowSelected = _b[1];
     var _c = (0, react_1.useState)([]), domains = _c[0], setDomains = _c[1];
-    var ads = (0, recoil_1.useRecoilValue)(atoms_1.adListState);
     var subCampaigns = (0, recoil_1.useRecoilValue)(Recoils_1.campaignGroupsState);
     var _d = (0, Hooks_1.default)(), service = _d.service, defaultDomainId = _d.domainId;
+    var _e = (0, react_1.useState)([]), dataTable = _e[0], setDataTable = _e[1];
     var domainIds = (0, react_1.useMemo)(function () {
+        var ads = subCampaigns.flatMap(function (sub) { return sub.ads; });
         return lodash_1.default.uniq(ads
             .filter(function (ad) { return ad.places; })
             .map(function (ad) { return ad.places.map(function (x) { return x.domainId; }); })
             .flat()
             .filter(Boolean));
-    }, [ads]);
-    var generateRandomId = function () {
-        return Math.floor(Math.random() * 1000000000); // Số ngẫu nhiên từ 0 đến 999,999,999
-    };
+    }, [subCampaigns]);
     var renderLinkPreview = function (ad, domainId) {
         if (domainId === void 0) { domainId = defaultDomainId; }
-        var url = "".concat(Constant_1.Constants.CAPTIVE_DOMAIN, "/").concat(Constant_1.Constants.PAGE_LOGIN_PREVIEW, "?loginId=").concat(ad.loginId, "&isNetworkCampaign=").concat(Boolean(service.domainsGetAll).toString());
+        var url = "".concat(Constant_1.Constants.CAPTIVE_DOMAIN, "/").concat(Constant_1.Constants.PAGE_LOGIN_PREVIEW, "?loginId=").concat(ad.loginId);
         if (ad.welcomeId)
-            url += "&welcomeId=".concat(ad.welcomeId);
+            url += "&welcomeId=".concat(ad.welcomeId, "&isNetworkCampaign=").concat(Boolean(service.domainsGetAll).toString());
         if (domainId)
             url += "&domainId=".concat(domainId);
         return url;
@@ -88,11 +86,13 @@ function TabApprove() {
             }
             else {
                 acc.push({
-                    id: generateRandomId(),
+                    id: (0, Helpers_1.generateUUID)(),
                     linkPreview: detail.linkPreview,
                     campaign: detail.campaign,
                     status: detail.status,
                     description: detail.description,
+                    loginId: detail.loginId,
+                    welcomeId: detail.welcomeId,
                 });
             }
             return acc;
@@ -128,6 +128,8 @@ function TabApprove() {
                                 ],
                             },
                         ],
+                        loginId: ad.loginId,
+                        welcomeId: ad.welcomeId,
                         description: '',
                         status: 0,
                     };
@@ -143,35 +145,40 @@ function TabApprove() {
             return pre.includes(id) ? pre.filter(function (x) { return x !== id; }) : __spreadArray(__spreadArray([], pre, true), [id], false);
         });
     }, []);
-    var updateRow = (0, react_1.useCallback)(function (row, id) {
-        setConfirmExit(true);
-        setCampaignApproval(function (prevState) {
-            if (!prevState)
-                return [];
-            var newState = prevState.map(function (item) {
-                if (item.id === id) {
-                    return __assign(__assign({}, item), row);
+    var updateRow = (0, react_1.useCallback)(function (dataUpdate, rowId, linkId) {
+        setDataTable(function (pre) {
+            return pre.map(function (item) {
+                if (item.id === rowId) {
+                    return __assign(__assign({}, item), { detail: item.detail.map(function (detail) {
+                            if (detail.id === linkId) {
+                                return __assign(__assign({}, detail), { status: dataUpdate.status, description: dataUpdate.description });
+                            }
+                            return detail;
+                        }) });
                 }
                 return item;
             });
-            return newState;
         });
-    }, [setCampaignApproval]);
+        setConfirmExit(true);
+    }, [setCampaignApproval, dataTable]);
     function flattenData(data) {
         var flattened = [];
+        var index = 0;
         data.forEach(function (item) {
             item.detail.forEach(function (detail) {
                 detail.campaign.forEach(function (campaign) {
                     campaign.ads.forEach(function (ad) {
                         var _a;
                         flattened.push({
-                            id: item.id,
+                            id: index++,
                             campaignId: campaignId,
                             domainId: item.domain.domainId,
                             status: detail.status,
+                            loginId: detail.loginId,
+                            welcomeId: detail.welcomeId,
                             description: detail.description,
-                            subId: (_a = campaign.subCampaigns[0]) === null || _a === void 0 ? void 0 : _a.id,
-                            adId: ad === null || ad === void 0 ? void 0 : ad.id,
+                            campaignGroupId: (_a = campaign.subCampaigns[0]) === null || _a === void 0 ? void 0 : _a.id,
+                            campaignAdId: ad === null || ad === void 0 ? void 0 : ad.id,
                         });
                     });
                 });
@@ -198,31 +205,46 @@ function TabApprove() {
         };
         var groupedData = inputData.reduce(function (acc, item) {
             var _a, _b, _c;
-            if (!acc[Number(item.domainId)]) {
-                var domain = domains.find(function (d) { return d.domainId === item.domainId; });
-                acc[Number(item.domainId)] = {
-                    id: item.id,
+            var domainId = item.domainId;
+            if (!acc[domainId]) {
+                var domain = domains.find(function (d) { return d.domainId === domainId; });
+                acc[domainId] = {
+                    id: domainId,
                     domain: {
                         domainName: domain === null || domain === void 0 ? void 0 : domain.name,
                         domainId: domain === null || domain === void 0 ? void 0 : domain.domainId,
                     },
-                    detail: [
-                        {
-                            id: generateRandomId(),
-                            linkPreview: renderLinkPreview((_a = findAd(item.subId, item.adId)) !== null && _a !== void 0 ? _a : {}, item.domainId),
-                            campaign: [],
-                            status: item.status,
-                            description: item.description,
-                        },
-                    ],
+                    detail: [],
                 };
             }
-            var campaign = acc[Number(item.domainId)].detail[0]
-                .campaign;
-            var subCampaign = campaign.find(function (c) { return c.subCampaigns[0].id === item.subId; });
+            // Tạo linkPreview chỉ nếu chưa tồn tại
+            var existingDetail = acc[domainId].detail.find(function (detail) {
+                return detail.loginId === item.loginId &&
+                    detail.welcomeId === item.welcomeId;
+            });
+            if (!existingDetail) {
+                acc[domainId].detail.push({
+                    id: (0, Helpers_1.generateUUID)(),
+                    linkPreview: renderLinkPreview({
+                        loginId: item.loginId,
+                        welcomeId: item.welcomeId,
+                    }, domainId),
+                    campaign: [],
+                    status: item.status,
+                    description: item.description,
+                    loginId: item.loginId,
+                    welcomeId: item.welcomeId,
+                });
+            }
+            var campaign = (_a = acc[domainId].detail.find(function (detail) {
+                return detail.loginId === item.loginId &&
+                    detail.welcomeId === item.welcomeId;
+            })) === null || _a === void 0 ? void 0 : _a.campaign;
+            var subCampaign = campaign.find(function (c) { return c.subCampaigns[0].id === item.campaignGroupId; });
             if (!subCampaign) {
                 var sub = subCampaigns.find(function (subCampaign) {
-                    return subCampaign.campaignGroup.id === item.subId;
+                    return subCampaign.campaignGroup.id ===
+                        item.campaignGroupId;
                 });
                 subCampaign = {
                     subCampaigns: [
@@ -236,23 +258,30 @@ function TabApprove() {
                 campaign.push(subCampaign);
             }
             subCampaign.ads.push({
-                id: item.adId,
-                name: (_c = (_b = findAd(subCampaign.subCampaigns[0].id, item.adId)) === null || _b === void 0 ? void 0 : _b.adName) !== null && _c !== void 0 ? _c : '',
+                id: item.campaignAdId,
+                name: (_c = (_b = findAd(subCampaign.subCampaigns[0].id, item.campaignAdId)) === null || _b === void 0 ? void 0 : _b.adName) !== null && _c !== void 0 ? _c : '',
             });
             return acc;
         }, {});
         return Object.values(groupedData);
     };
-    var dataTable = (0, react_1.useMemo)(function () {
+    var handleSelectAll = (0, react_1.useCallback)(function () {
+        setRowSelected(function (pre) {
+            return pre.length < dataTable.length
+                ? dataTable.map(function (item) { return item.id; })
+                : [];
+        });
+    }, [dataTable]);
+    (0, react_1.useEffect)(function () {
         if (!domains.length)
-            return [];
+            return setDataTable([]);
         var data;
         if (campaignApproval === null || campaignApproval === void 0 ? void 0 : campaignApproval.length) {
-            return unflattenData(campaignApproval);
+            return setDataTable(unflattenData(campaignApproval));
         }
         data = domains.map(function (domain) {
             return {
-                id: generateRandomId(),
+                id: domain.domainId,
                 domain: {
                     domainName: domain.name,
                     domainId: domain.domainId,
@@ -260,15 +289,8 @@ function TabApprove() {
                 detail: renderDataDetail(domain.domainId),
             };
         });
-        return data;
+        return setDataTable(data);
     }, [domains]);
-    var handleSelectAll = (0, react_1.useCallback)(function () {
-        setRowSelected(function (pre) {
-            return pre.length < dataTable.length
-                ? dataTable.map(function (item) { return item.id; })
-                : [];
-        });
-    }, [dataTable]);
     (0, react_1.useEffect)(function () {
         if (domainIds.length > 0) {
             service.domainsGetByIds &&
@@ -281,7 +303,7 @@ function TabApprove() {
         }
     }, [dataTable]);
     return ((0, jsx_runtime_1.jsxs)(material_1.TableContainer, { children: [(0, jsx_runtime_1.jsx)(material_1.Button, { variant: "outlined", color: "primary", disabled: !rowSelected.length, sx: {
-                    margin: '1rem'
+                    margin: '1rem',
                 }, children: t('Campaign.Approval.SendEmail') }), (0, jsx_runtime_1.jsxs)(material_1.Table, { sx: {
                     boxShadow: 'none',
                     '.MuiOutlinedInput-notchedOutline': {

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

@@ -216,10 +216,12 @@ export type CampaignApproval = {
     id?: number;
     campaignId?: string;
     domainId?: string;
-    subId?: number;
-    adId?: number;
+    campaignGroupId?: number;
+    campaignAdId?: number;
     status: number;
     description: string;
+    loginId?: string;
+    welcomeId?: string;
 };
 export type DateRange = {
     startDate: Date;

package/package.json

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