awing-library 2.1.34-beta → 2.1.34

package/lib/ACM-AXN/Campaign/Container.js

@@ -49,7 +49,7 @@ var CampaignContainer = function () {
     var _c = (0, react_1.useState)([]), directories = _c[0], setDirectories = _c[1];
     var _d = (0, react_1.useState)([]), collapseIds = _d[0], setCollapseId = _d[1];
     var _e = (0, react_1.useState)(), listCampaign = _e[0], setListCampaign = _e[1];
-    var _f = (0, react_1.useState)(false), loading = _f[0], setLoading = _f[1];
+    var _f = (0, react_1.useState)(true), loading = _f[0], setLoading = _f[1];
     (0, react_1.useEffect)(function () {
         if (location.pathname.endsWith(Constant_1.Constants.CAMPAIGN_PATH)) {
             fetchDirectories();

package/lib/ACM-AXN/Campaign/CreateOrEdit/Recoils.js

@@ -98,7 +98,7 @@ exports.campaignAttributesState = (0, recoil_1.selector)({
         var campaignModel = get(exports.campaignModelState);
         set(exports.campaignModelState, campaignAttributes instanceof recoil_1.DefaultValue ?
             campaignAttributes : __assign(__assign({}, campaignModel), { campaignAttributes: campaignAttributes }));
-        if (!get(exports.confirmExitState))
+        if (!get(exports.confirmExitState) && Array.isArray(campaignAttributes) && !!campaignAttributes.at(-1))
             set(exports.confirmExitState, true);
     }
 });

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabInfomation.js

@@ -46,15 +46,14 @@ var react_i18next_1 = require("react-i18next");
 var recoil_1 = require("recoil");
 var AWING_1 = require("../../../AWING");
 var Recoils_1 = require("./Recoils");
-var Hooks_1 = __importDefault(require("../Hooks"));
+var i18n_1 = __importDefault(require("../../../i18n"));
 var Infomation = function () {
-    var service = (0, Hooks_1.default)().service;
     var directories = (0, recoil_1.useRecoilValue)(Recoils_1.directoriesState);
     var attributes = (0, recoil_1.useRecoilValue)(Recoils_1.attributesState);
     var _a = (0, recoil_1.useRecoilState)(Recoils_1.campaignState), campaign = _a[0], setCampaign = _a[1];
     var _b = (0, recoil_1.useRecoilState)(Recoils_1.campaignAttributesState), campaignAttributes = _b[0], setCampaignAttributes = _b[1];
     var setCampaignModel = (0, recoil_1.useSetRecoilState)(Recoils_1.campaignModelState);
-    var t = (0, react_i18next_1.useTranslation)().t;
+    var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18n_1.default }).t;
     (0, react_1.useEffect)(function () {
         if (!campaign.directoryId) {
             setCampaignModel((0, immer_1.default)(function (draft) {
@@ -64,12 +63,6 @@ var Infomation = function () {
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [directories]);
-    (0, react_1.useEffect)(function () {
-        if (!service.attributesGetByObjectTypeCode) {
-            setCampaignAttributes([""]);
-        }
-        // eslint-disable-next-line react-hooks/exhaustive-deps     
-    }, [service]);
     var handleUpdate = (0, react_1.useCallback)(function (obj, formValid, fieldUpdate) {
         if (fieldUpdate) {
             if (fieldUpdate === 'attributeIds') {
@@ -99,6 +92,7 @@ var Infomation = function () {
                 fieldName: 'name',
                 type: 'text',
                 label: t('Campaign.Name'),
+                pattern: false,
                 required: true,
             },
         ];

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/AdList.js

@@ -67,24 +67,24 @@ function AdList(props) {
     var onCreate = props.onCreate, onChange = props.onChange, onDelete = props.onDelete, onAdsValidChange = props.onAdsValidChange;
     var t = (0, react_i18next_1.useTranslation)().t;
     var _a = (0, Context_1.useAwing)().appHelper, confirm = _a.confirm, alert = _a.alert;
-    var service = (0, Hooks_1.default)().service;
+    var _b = (0, Hooks_1.default)(), service = _b.service, defaultDomainId = _b.domainId;
     var ads = (0, recoil_1.useRecoilValue)(atoms_1.adListState);
-    var _b = (0, recoil_1.useRecoilState)(atoms_1.adSelectedState), adSelected = _b[0], setAdSelected = _b[1];
-    var _c = (0, recoil_1.useRecoilState)(atoms_1.adOpenState), adOpen = _c[0], setAdOpen = _c[1];
+    var _c = (0, recoil_1.useRecoilState)(atoms_1.adSelectedState), adSelected = _c[0], setAdSelected = _c[1];
+    var _d = (0, recoil_1.useRecoilState)(atoms_1.adOpenState), adOpen = _d[0], setAdOpen = _d[1];
     var copiedAd = (0, recoil_1.useRecoilValue)(atoms_1.copiedAdState);
     var hasClassC = (0, recoil_1.useRecoilValue)((0, atoms_1.checkGroupsClassCState)(adSelected.map(function (x) { return x.subCampaignId; })));
-    var _d = (0, react_1.useState)({
+    var _e = (0, react_1.useState)({
         welcomeId: '',
         loginId: '',
         domainIds: [],
-    }), previewId = _d[0], setPreviewId = _d[1];
-    var _e = react_1.default.useState(), anchorEl = _e[0], setAnchorEl = _e[1];
+    }), previewId = _e[0], setPreviewId = _e[1];
+    var _f = react_1.default.useState(), anchorEl = _f[0], setAnchorEl = _f[1];
     var open = Boolean(anchorEl);
     // valid theo cấu trúc { [campaignGroupId]: { [adId]: boolean } }
-    var _f = (0, react_1.useState)({}), adsValid = _f[0], setAdsValid = _f[1];
-    var _g = (0, react_1.useState)(false), isAdvancedDrawerOpen = _g[0], setIsAdvancedDrawerOpen = _g[1];
-    var _h = (0, recoil_1.useRecoilState)(Recoils_1.weightState), weightProps = _h[0], setWeightState = _h[1];
-    var _j = (0, react_1.useState)(false), isMultiEditDrawerOpen = _j[0], setIsMultiEditDrawerOpen = _j[1];
+    var _g = (0, react_1.useState)({}), adsValid = _g[0], setAdsValid = _g[1];
+    var _h = (0, react_1.useState)(false), isAdvancedDrawerOpen = _h[0], setIsAdvancedDrawerOpen = _h[1];
+    var _j = (0, recoil_1.useRecoilState)(Recoils_1.weightState), weightProps = _j[0], setWeightState = _j[1];
+    var _k = (0, react_1.useState)(false), isMultiEditDrawerOpen = _k[0], setIsMultiEditDrawerOpen = _k[1];
     (0, react_1.useEffect)(function () {
         var newAdValid = {};
         ads.forEach(function (ad) {
@@ -232,13 +232,14 @@ function AdList(props) {
     /**
      * Hàm khi xem preview
      */
-    var handlePreview = function (e, ad, doaminId) {
+    var handlePreview = function (e, ad, domainId) {
+        if (domainId === void 0) { domainId = defaultDomainId; }
         e.stopPropagation();
-        var url = "".concat(Constant_1.Constants.CAPTIVE_DOMAIN, "/").concat(Constant_1.Constants.PAGE_LOGIN_PREVIEW, "?loginId=").concat(ad.loginId, "&isNetworkCampaign=false");
+        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());
         if (ad.welcomeId.length)
             url += "&welcomeId=".concat(ad.welcomeId);
-        if (doaminId)
-            url += "&doaminId=".concat(doaminId);
+        if (domainId)
+            url += "&domainId=".concat(domainId);
         window.open(url, '_blank');
     };
     var handlePreviewPage = function (e, ad) {

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/AddOrEditRule/RuleForm/RetargetMacAddress/component.js

@@ -19,10 +19,11 @@ var react_1 = __importDefault(require("react"));
 var material_1 = require("@mui/material");
 var react_i18next_1 = require("react-i18next");
 var AWING_1 = require("../../../../../../../AWING");
+var i18n_1 = __importDefault(require("../../../../../../../i18n"));
 var RetargetMacAddress = function (props) {
     var rule = props.rule, valids = props.valids, onChange = props.onChange, remarketingLists = props.remarketingLists;
     var _a = react_1.default.useState(''), inputValue = _a[0], setInputValue = _a[1];
-    var t = (0, react_i18next_1.useTranslation)().t;
+    var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18n_1.default }).t;
     react_1.default.useEffect(function () {
         var _a;
         if (remarketingLists.length) {

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/EditAds.js

@@ -15,6 +15,7 @@ var Utils_1 = require("../../Utils");
 var Helpers_1 = require("../../../../Utils/Helpers");
 var ClassicBaseDrawer_1 = __importDefault(require("../../../../Commons/Components/ClassicBaseDrawer"));
 var Context_1 = require("../../../../Context");
+var moment_1 = __importDefault(require("moment"));
 function EditAds(props) {
     var t = (0, react_i18next_1.useTranslation)().t;
     var PlaceFilterField = (0, Hooks_1.default)().placeMultiSelectComponent;
@@ -76,6 +77,7 @@ function EditAds(props) {
             type: 'date-range',
             label: t('Campaign.Ad.Time'),
             required: true,
+            isDayBlocked: function (day) { return (0, moment_1.default)().startOf('day').valueOf() > day.valueOf(); }
         },
         {
             fieldName: 'isReserved',
@@ -113,28 +115,28 @@ function EditAds(props) {
     var convertAd = function (inputObj) {
         var result = {};
         selectedFields.forEach(function (f) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             switch (f) {
                 case 'time':
-                    result.startDate = (0, Helpers_1.convertDateTimeToTimestamp)((_b = (_a = inputObj === null || inputObj === void 0 ? void 0 : inputObj.time) === null || _a === void 0 ? void 0 : _a.startDate) === null || _b === void 0 ? void 0 : _b.toDate());
-                    result.endDate = (0, Helpers_1.convertDateTimeToTimestamp)((_d = (_c = inputObj === null || inputObj === void 0 ? void 0 : inputObj.time) === null || _c === void 0 ? void 0 : _c.endDate) === null || _d === void 0 ? void 0 : _d.toDate());
+                    result.startDate = (0, Helpers_1.convertDateTimeToTimestamp)((_a = inputObj === null || inputObj === void 0 ? void 0 : inputObj.time[0]) === null || _a === void 0 ? void 0 : _a.toDate());
+                    result.endDate = (0, Helpers_1.convertDateTimeToTimestamp)((_b = inputObj === null || inputObj === void 0 ? void 0 : inputObj.time[1]) === null || _b === void 0 ? void 0 : _b.toDate());
                     break;
                 case 'placeFilter':
                     result.placeFilter = placeFilterValue;
                     result.places = selectedPlaces;
                     break;
                 case 'loginId':
-                    result.loginId = (_e = inputObj[f]) === null || _e === void 0 ? void 0 : _e.value;
+                    result.loginId = (_c = inputObj[f]) === null || _c === void 0 ? void 0 : _c.value;
                     result.loginPage = {
-                        pageId: (_f = inputObj[f]) === null || _f === void 0 ? void 0 : _f.value,
-                        title: (_g = inputObj[f]) === null || _g === void 0 ? void 0 : _g.text,
+                        pageId: (_d = inputObj[f]) === null || _d === void 0 ? void 0 : _d.value,
+                        title: (_e = inputObj[f]) === null || _e === void 0 ? void 0 : _e.text,
                     };
                     break;
                 case 'welcomeId':
-                    result.welcomeId = (_h = inputObj[f]) === null || _h === void 0 ? void 0 : _h.value;
+                    result.welcomeId = (_f = inputObj[f]) === null || _f === void 0 ? void 0 : _f.value;
                     result.welcomePage = {
-                        pageId: (_j = inputObj[f]) === null || _j === void 0 ? void 0 : _j.value,
-                        title: (_k = inputObj[f]) === null || _k === void 0 ? void 0 : _k.text,
+                        pageId: (_g = inputObj[f]) === null || _g === void 0 ? void 0 : _g.value,
+                        title: (_h = inputObj[f]) === null || _h === void 0 ? void 0 : _h.text,
                     };
                     break;
                 default:

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

@@ -151,7 +151,6 @@ function TabSubCampaign() {
             changeList.forEach(function (adChange) {
                 var _a;
                 var subCampIdx = result.findIndex(function (x) { var _a; return ((_a = x.campaignGroup) === null || _a === void 0 ? void 0 : _a.id) === adChange.subCampaignId; });
-                // console.log('subCampIdx', subCampIdx)
                 if (subCampIdx >= 0) {
                     var adIdx = ((_a = result[subCampIdx].ads) === null || _a === void 0 ? void 0 : _a.findIndex(function (x) { return x.id === adChange.adId; })) || 0;
                     if (adIdx >= 0) {

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

@@ -1 +1,3 @@
-export default function (): import("react/jsx-runtime").JSX.Element;
+import React from 'react';
+declare const _default: React.FC<unknown>;
+export default _default;

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

@@ -39,6 +39,7 @@ var Constant_1 = require("../Constant");
 var i18n_1 = __importDefault(require("../../../i18n"));
 var TabLabel_1 = __importDefault(require("../../../Commons/Components/TabLabel"));
 var usePath_1 = __importDefault(require("../../../Commons/Hooks/usePath"));
+var Wrapper_1 = __importDefault(require("../../../AWING/HOC/Wrapper"));
 var route = [
     Constant_1.Constants.CAMPAIGN_INFORMATION,
     Constant_1.Constants.CAMPAIGN_SUBCAMPAIGN,
@@ -76,6 +77,12 @@ var CreateOrEdit = function () {
                 ? Constant_1.Constants.CAMPAIGN_CLONE
                 : Constant_1.Constants.CAMPAIGN_CREATE;
     }, [location.pathname, campaignId]);
+    (0, react_1.useEffect)(function () {
+        if (!service.attributesGetByObjectTypeCode && !campaignData.campaignAttributes.length) {
+            setCampaignData(function (prev) { return (__assign(__assign({}, prev), { campaignAttributes: [""] })); });
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps     
+    }, [service, campaignData.campaignAttributes]);
     (0, react_1.useEffect)(function () {
         setLoading(true);
         Promise.all([getCampaignData(), getPage()]).finally(function () {
@@ -215,7 +222,4 @@ var CreateOrEdit = function () {
                                             : undefined, errContent: (0, jsx_runtime_1.jsx)("span", { style: { marginLeft: '-5px' }, children: "*" }) }) }, idx)); }) }) }), tabsList.map(function (tab, idx) { return ((0, jsx_runtime_1.jsx)(lab_1.TabPanel, { sx: { padding: '0' }, value: String(idx), children: tab.compoent }, idx)); })] }) })) }) }));
 };
 // eslint-disable-next-line import/no-anonymous-default-export
-function default_1() {
-    return ((0, jsx_runtime_1.jsx)(recoil_1.RecoilRoot, { children: (0, jsx_runtime_1.jsx)(CreateOrEdit, {}) }));
-}
-exports.default = default_1;
+exports.default = (0, Wrapper_1.default)(CreateOrEdit, { component: recoil_1.RecoilRoot });

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

@@ -131,6 +131,14 @@ export type CampaignAd = {
         name: string;
         domainId: string;
     }[];
+    /**
+     * Danh sách địa điểm Đã xoá theo điều kiện lọc (thông tin dùng cho việc hiển thị)
+     */
+    deletedPlaces?: {
+        placeId: string;
+        name: string;
+        domainId: string;
+    }[];
     /**
      * Đánh dấu quảng cáo không được xoá
      */

package/lib/ACM-AXN/Campaign/Utils.js

@@ -117,7 +117,7 @@ function attributesValid(value) {
 exports.attributesValid = attributesValid;
 function tabInfomationValid(campaign, campaignAttributes) {
     return (directoryValid(campaign.directoryId) &&
-        (0, validation_1.textValidation)(campaign.name, 200).valid &&
+        (0, validation_1.textValidation)(campaign.name, 200, true, false).valid &&
         attributesValid(campaignAttributes));
 }
 exports.tabInfomationValid = tabInfomationValid;

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

@@ -26,11 +26,12 @@ var Constant_1 = require("./Constant");
 var Container_1 = __importDefault(require("./Container"));
 var Context_1 = require("./Context");
 var CreateOrEdit_1 = __importDefault(require("./CreateOrEdit"));
+var Enum_1 = require("./Enum");
 var Campaign = function (props) {
     var paths = [
         {
             param: Constant_1.Constants.DIRECTORY_CREATE_DIRECTORY_PATH + '/:directoryId',
-            element: ((0, jsx_runtime_1.jsx)(CreateDirectory_1.default, __assign({ parentDirectory: 'campaign' }, props))),
+            element: ((0, jsx_runtime_1.jsx)(CreateDirectory_1.default, __assign({ parentDirectory: 'campaign', directoryRoot: Enum_1.DirectoryRoot.Campaign }, props))),
         },
         {
             param: Constant_1.Constants.CAMPAIGN_CREATE + '/:tabName/*',

package/lib/ACM-AXN/CampaignSchedule/Components/ControlPanel/Filter.d.ts

@@ -1,3 +1,3 @@
 import { IFiltersProps } from '../../interface';
-declare const Filters: ({ campaigns, handleFilters, loadingFlags, placeMultiSelectComponent: PlaceMultiSelect, handleExportExcel, disabledCampaignFilter, }: IFiltersProps) => import("react/jsx-runtime").JSX.Element;
+declare const Filters: ({ campaigns, handleFilters, loadingFlags, placeMultiSelectComponent: PlaceMultiSelect, handleExportExcel, disabledCampaignFilter, isFutureDate }: IFiltersProps) => import("react/jsx-runtime").JSX.Element;
 export default Filters;

package/lib/ACM-AXN/CampaignSchedule/Components/ControlPanel/Filter.js

@@ -78,7 +78,7 @@ var useStyles = (0, styles_1.makeStyles)(function () { return ({
 }); });
 var Filters = function (_a) {
     var _b, _c;
-    var campaigns = _a.campaigns, handleFilters = _a.handleFilters, loadingFlags = _a.loadingFlags, PlaceMultiSelect = _a.placeMultiSelectComponent, handleExportExcel = _a.handleExportExcel, _d = _a.disabledCampaignFilter, disabledCampaignFilter = _d === void 0 ? false : _d;
+    var campaigns = _a.campaigns, handleFilters = _a.handleFilters, loadingFlags = _a.loadingFlags, PlaceMultiSelect = _a.placeMultiSelectComponent, handleExportExcel = _a.handleExportExcel, _d = _a.disabledCampaignFilter, disabledCampaignFilter = _d === void 0 ? false : _d, isFutureDate = _a.isFutureDate;
     var t = (0, react_i18next_1.useTranslation)().t;
     var campaignOptions = __assign(__assign({}, campaigns), { 0: { campaignId: 0, name: t('Common.SelectAll') } });
     var classes = useStyles();
@@ -86,7 +86,7 @@ var Filters = function (_a) {
         handleFilters('startDate', value.startDate);
         handleFilters('endDate', value.endDate);
     };
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: disabledCampaignFilter ? 6 : 4, className: classes.dateRangePicker, children: (0, jsx_runtime_1.jsx)(AWING_1.DateRangePicker, { isShowCalendarInfo: true, label: "".concat(t('Common.StartDate'), " - ").concat(t('Common.EndDate')), callback: handleChangeDateRange, initialStartDate: (0, moment_1.default)(), initialEndDate: (0, moment_1.default)(), variant: "outlined", textFieldProps: {
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: disabledCampaignFilter ? 6 : 4, className: classes.dateRangePicker, children: (0, jsx_runtime_1.jsx)(AWING_1.DateRangePicker, { isShowCalendarInfo: true, isFutureDate: isFutureDate !== null && isFutureDate !== void 0 ? isFutureDate : true, label: "".concat(t('Common.StartDate'), " - ").concat(t('Common.EndDate')), callback: handleChangeDateRange, initialStartDate: (0, moment_1.default)(), initialEndDate: (0, moment_1.default)(), variant: "outlined", textFieldProps: {
                         fullWidth: true,
                         className: classes.outlinedInput,
                     }, isDayBlocked: function (day) {

package/lib/ACM-AXN/CampaignSchedule/Components/ControlPanel/index.d.ts

@@ -1,3 +1,3 @@
 import { IControlPanelProps } from '../../interface';
-declare const ControlPanel: ({ campaigns, handleFilters, unGroupField, onDragStart, onDragOver, onDrop, handleView, handleExportExcel, loadingFlags, panels, placeMultiSelectComponent, disabledCampaignFilter, }: IControlPanelProps) => import("react/jsx-runtime").JSX.Element;
+declare const ControlPanel: ({ campaigns, handleFilters, unGroupField, onDragStart, onDragOver, onDrop, handleView, handleExportExcel, loadingFlags, panels, placeMultiSelectComponent, disabledCampaignFilter, isFutureDate }: IControlPanelProps) => import("react/jsx-runtime").JSX.Element;
 export default ControlPanel;

package/lib/ACM-AXN/CampaignSchedule/Components/ControlPanel/index.js

@@ -10,8 +10,8 @@ var react_i18next_1 = require("react-i18next");
 var Filter_1 = __importDefault(require("./Filter"));
 var GroupPanel_1 = __importDefault(require("./GroupPanel"));
 var ControlPanel = function (_a) {
-    var campaigns = _a.campaigns, handleFilters = _a.handleFilters, unGroupField = _a.unGroupField, onDragStart = _a.onDragStart, onDragOver = _a.onDragOver, onDrop = _a.onDrop, handleView = _a.handleView, handleExportExcel = _a.handleExportExcel, loadingFlags = _a.loadingFlags, panels = _a.panels, placeMultiSelectComponent = _a.placeMultiSelectComponent, disabledCampaignFilter = _a.disabledCampaignFilter;
+    var campaigns = _a.campaigns, handleFilters = _a.handleFilters, unGroupField = _a.unGroupField, onDragStart = _a.onDragStart, onDragOver = _a.onDragOver, onDrop = _a.onDrop, handleView = _a.handleView, handleExportExcel = _a.handleExportExcel, loadingFlags = _a.loadingFlags, panels = _a.panels, placeMultiSelectComponent = _a.placeMultiSelectComponent, disabledCampaignFilter = _a.disabledCampaignFilter, isFutureDate = _a.isFutureDate;
     var t = (0, react_i18next_1.useTranslation)().t;
-    return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, sx: { padding: '1rem' }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, item: true, xs: 12, justifyContent: "flex-start", spacing: 2, children: (0, jsx_runtime_1.jsx)(Filter_1.default, { loadingFlags: loadingFlags, campaigns: campaigns, handleFilters: handleFilters, handleExportExcel: handleExportExcel, placeMultiSelectComponent: placeMultiSelectComponent, disabledCampaignFilter: disabledCampaignFilter }) }), (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, justifyContent: "flex-end", item: true, xs: 12, spacing: 2, sx: { marginTop: '0.125rem' }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { id: "wrap-group-panel", item: true, style: { flexGrow: 1, position: 'relative' }, children: (0, jsx_runtime_1.jsx)(GroupPanel_1.default, { panels: panels, unGroupField: unGroupField, onDragStart: onDragStart, onDragOver: onDragOver, onDrop: onDrop }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, sx: { display: 'flex' }, children: (0, jsx_runtime_1.jsx)(material_1.Button, { sx: { height: '40px' }, variant: "contained", color: "primary", onClick: handleView, children: t('Common.View') }) })] })] }) }));
+    return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, sx: { padding: '1rem' }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, item: true, xs: 12, justifyContent: "flex-start", spacing: 2, children: (0, jsx_runtime_1.jsx)(Filter_1.default, { loadingFlags: loadingFlags, campaigns: campaigns, handleFilters: handleFilters, handleExportExcel: handleExportExcel, placeMultiSelectComponent: placeMultiSelectComponent, disabledCampaignFilter: disabledCampaignFilter, isFutureDate: isFutureDate }) }), (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, justifyContent: "flex-end", item: true, xs: 12, spacing: 2, sx: { marginTop: '0.125rem' }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { id: "wrap-group-panel", item: true, style: { flexGrow: 1, position: 'relative' }, children: (0, jsx_runtime_1.jsx)(GroupPanel_1.default, { panels: panels, unGroupField: unGroupField, onDragStart: onDragStart, onDragOver: onDragOver, onDrop: onDrop }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, sx: { display: 'flex' }, children: (0, jsx_runtime_1.jsx)(material_1.Button, { sx: { height: '40px' }, variant: "contained", color: "primary", onClick: handleView, children: t('Common.View') }) })] })] }) }));
 };
 exports.default = ControlPanel;

package/lib/ACM-AXN/CampaignSchedule/Components/RowAdvance/component.js

@@ -118,7 +118,7 @@ var RowAdvanceComponent = function (_a) {
     return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: (0, jsx_runtime_1.jsx)(material_1.TableRow, { className: "".concat((groupNames === null || groupNames === void 0 ? void 0 : groupNames.length) === 0
                 ? classes.styledNormalRow
                 : styledRow(priorityGroupLevel), " ").concat(classes.styledCommonRow), onClick: handleOnClick, children: headCells === null || headCells === void 0 ? void 0 : headCells.map(function (item, index) {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3;
                 switch (item.name) {
                     case Enum_1.HEAD_CELL_NAMES.CONTROL:
                         return ((0, jsx_runtime_1.jsx)(material_1.TableCell, { align: "right", colSpan: colSpanFirstCell, className: item.id === Enum_1.HEAD_CELL_IDS.CONTROL
@@ -126,15 +126,22 @@ var RowAdvanceComponent = function (_a) {
                                 : '', sx: { padding: '0px !important' }, children: (0, jsx_runtime_1.jsxs)("div", { className: classes.wrapFrirstCell, children: [!expandDisabled && ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: open ? ((0, jsx_runtime_1.jsx)(ArrowDropUp_1.default, {})) : ((0, jsx_runtime_1.jsx)(ArrowDropDown_1.default, {})) })), (0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "subtitle2", children: stt })] }) }, item.id));
                     case Enum_1.HEAD_CELL_NAMES.PLACE:
                         return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: fieldNameShowOn ===
-                                Enum_1.HEAD_CELL_NAMES.PLACE ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledPlaceField, children: (_a = options === null || options === void 0 ? void 0 : options.places[row === null || row === void 0 ? void 0 : row.groupKeyId]) === null || _a === void 0 ? void 0 : _a.name })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: 
+                                Enum_1.HEAD_CELL_NAMES.PLACE ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledPlaceField, children: (options === null || options === void 0 ? void 0 : options.places[row === null || row === void 0 ? void 0 : row.groupKeyId])
+                                    ? (_a = options === null || options === void 0 ? void 0 : options.places[row === null || row === void 0 ? void 0 : row.groupKeyId]) === null || _a === void 0 ? void 0 : _a.name
+                                    : row === null || row === void 0 ? void 0 : row.groupKeyId })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: 
                                 // Nếu field hiện tại ko phải groupName đang showOn thì 3Th
                                 // TH1: field nằm trong groupNames nhưng đúng trước fieldNameShowOn hiển thị name
                                 // TH2: field nằm sau fieldNameShowOn trong groupNames hiển thi total
                                 // Th3: field ko trong groupNames hiển thị total hoặ thông tin schedule nếu nó là cấp cuối cùng
                                 groupNames
                                     .slice(0, priorityGroupLevel - 1)
-                                    .indexOf(Enum_1.HEAD_CELL_NAMES.PLACE) === -1 ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledPlaceField, children: ((_b = options === null || options === void 0 ? void 0 : options.places[row === null || row === void 0 ? void 0 : row.placeId]) === null || _b === void 0 ? void 0 : _b.name) ||
-                                        (row === null || row === void 0 ? void 0 : row.totalPlace) })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
+                                    .indexOf(Enum_1.HEAD_CELL_NAMES.PLACE) === -1 ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledPlaceField, children: ((options === null || options === void 0 ? void 0 : options.places[row === null || row === void 0 ? void 0 : row.placeId])
+                                        ? (_b = options === null || options === void 0 ? void 0 : options.places[row === null || row === void 0 ? void 0 : row.placeId]) === null || _b === void 0 ? void 0 : _b.name
+                                        : row === null || row === void 0 ? void 0 : row.placeId) ||
+                                        ((row === null || row === void 0 ? void 0 : row.totalPlace) !==
+                                            0
+                                            ? row === null || row === void 0 ? void 0 : row.totalPlace
+                                            : '') })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
                     case Enum_1.HEAD_CELL_NAMES.CAMPAIGN:
                         return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: fieldNameShowOn ===
                                 Enum_1.HEAD_CELL_NAMES.CAMPAIGN ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledCampaignField, children: (0, jsx_runtime_1.jsx)(CampaignLabel, { campaignId: row === null || row === void 0 ? void 0 : row.groupKeyId, campaigns: options === null || options === void 0 ? void 0 : options.campaigns, classes: classes }) })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: groupNames
@@ -143,9 +150,14 @@ var RowAdvanceComponent = function (_a) {
                                 (0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledCampaignField, children: generateCampaignTotalCount(options === null || options === void 0 ? void 0 : options.campaigns, row, t('Schedule.CampaignDefault')) })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
                     case Enum_1.HEAD_CELL_NAMES.DOMAIN:
                         return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: fieldNameShowOn ===
-                                Enum_1.HEAD_CELL_NAMES.DOMAIN ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledDomainField, children: (_c = options === null || options === void 0 ? void 0 : options.domains[row === null || row === void 0 ? void 0 : row.groupKeyId]) === null || _c === void 0 ? void 0 : _c.name })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: groupNames
+                                Enum_1.HEAD_CELL_NAMES.DOMAIN ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledDomainField, children: (options === null || options === void 0 ? void 0 : options.domains[row === null || row === void 0 ? void 0 : row.groupKeyId])
+                                    ? (_c = options === null || options === void 0 ? void 0 : options.domains[row === null || row === void 0 ? void 0 : row.groupKeyId]) === null || _c === void 0 ? void 0 : _c.name
+                                    : row === null || row === void 0 ? void 0 : row.groupKeyId })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: groupNames
                                     .slice(0, priorityGroupLevel - 1)
-                                    .indexOf(Enum_1.HEAD_CELL_NAMES.DOMAIN) === -1 ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledDomainField, children: ((_d = options === null || options === void 0 ? void 0 : options.domains[row === null || row === void 0 ? void 0 : row.domainId]) === null || _d === void 0 ? void 0 : _d.name) || (row === null || row === void 0 ? void 0 : row.totalDomain) })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
+                                    .indexOf(Enum_1.HEAD_CELL_NAMES.DOMAIN) === -1 ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledDomainField, children: ((options === null || options === void 0 ? void 0 : options.domains[row === null || row === void 0 ? void 0 : row.domainId])
+                                        ? (_d = options === null || options === void 0 ? void 0 : options.domains[row === null || row === void 0 ? void 0 : row.domainId]) === null || _d === void 0 ? void 0 : _d.name
+                                        : row === null || row === void 0 ? void 0 : row.domainId) ||
+                                        (row === null || row === void 0 ? void 0 : row.totalDomain) })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
                     case Enum_1.HEAD_CELL_NAMES.DATE:
                         return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: fieldNameShowOn ===
                                 Enum_1.HEAD_CELL_NAMES.DATE ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledDateField, children: startDate || endDate })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: groupNames
@@ -165,25 +177,52 @@ var RowAdvanceComponent = function (_a) {
                         return ((0, jsx_runtime_1.jsx)(material_1.TableCell, { align: "right", children: ctr }, item.id));
                     case Enum_1.HEAD_CELL_NAMES.CAMPAIGN_CAMPAIGN:
                         return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: fieldNameShowOn ===
-                                Enum_1.HEAD_CELL_NAMES.CAMPAIGN ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledCampaignField, children: (_e = row === null || row === void 0 ? void 0 : row.campaign) === null || _e === void 0 ? void 0 : _e.name })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: groupNames
+                                Enum_1.HEAD_CELL_NAMES.CAMPAIGN ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledCampaignField, children: ((_e = row === null || row === void 0 ? void 0 : row.campaign) === null || _e === void 0 ? void 0 : _e.name) !== ''
+                                    ? (_f = row === null || row === void 0 ? void 0 : row.campaign) === null || _f === void 0 ? void 0 : _f.name
+                                    : ((_g = row === null || row === void 0 ? void 0 : row.campaign) === null || _g === void 0 ? void 0 : _g.campaignId) !==
+                                        '0'
+                                        ? (_h = row === null || row === void 0 ? void 0 : row.campaign) === null || _h === void 0 ? void 0 : _h.campaignId
+                                        : '' })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: groupNames
                                     .slice(0, priorityGroupLevel - 1)
-                                    .indexOf(Enum_1.HEAD_CELL_NAMES.CAMPAIGN) === -1 ? ( // Nếu fieldGroup có index < thằng groupKeyName hiện tại thì hiển thị total hoac name ngược lại phải thụt đầu dòng
-                                (0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledCampaignField, children: (_f = row === null || row === void 0 ? void 0 : row.campaign) === null || _f === void 0 ? void 0 : _f.name })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
+                                    .indexOf(Enum_1.HEAD_CELL_NAMES.CAMPAIGN_CAMPAIGN) === -1 ? ( // Nếu fieldGroup có index < thằng groupKeyName hiện tại thì hiển thị total hoac name ngược lại phải thụt đầu dòng
+                                (0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledCampaignField, children: ((_j = row === null || row === void 0 ? void 0 : row.campaign) === null || _j === void 0 ? void 0 : _j.name) !== ''
+                                        ? (_k = row === null || row === void 0 ? void 0 : row.campaign) === null || _k === void 0 ? void 0 : _k.name
+                                        : ((_l = row === null || row === void 0 ? void 0 : row.campaign) === null || _l === void 0 ? void 0 : _l.campaignId) !==
+                                            '0'
+                                            ? (_m = row === null || row === void 0 ? void 0 : row.campaign) === null || _m === void 0 ? void 0 : _m.campaignId
+                                            : '' })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
                     case Enum_1.HEAD_CELL_NAMES.DOMAIN_CAMPAIGN:
                         return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: fieldNameShowOn ===
-                                Enum_1.HEAD_CELL_NAMES.DOMAIN_CAMPAIGN ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledDomainField, children: (_g = row === null || row === void 0 ? void 0 : row.domain) === null || _g === void 0 ? void 0 : _g.name })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: groupNames
+                                Enum_1.HEAD_CELL_NAMES.DOMAIN_CAMPAIGN ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledDomainField, children: ((_o = row === null || row === void 0 ? void 0 : row.domain) === null || _o === void 0 ? void 0 : _o.name) !== ''
+                                    ? (_p = row === null || row === void 0 ? void 0 : row.domain) === null || _p === void 0 ? void 0 : _p.name
+                                    : ((_q = row === null || row === void 0 ? void 0 : row.domain) === null || _q === void 0 ? void 0 : _q.domainId) !== '0'
+                                        ? (_r = row === null || row === void 0 ? void 0 : row.domain) === null || _r === void 0 ? void 0 : _r.domainId
+                                        : '' })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: groupNames
                                     .slice(0, priorityGroupLevel - 1)
-                                    .indexOf(Enum_1.HEAD_CELL_NAMES.DOMAIN_CAMPAIGN) === -1 ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledDomainField, children: (_h = row === null || row === void 0 ? void 0 : row.domain) === null || _h === void 0 ? void 0 : _h.name })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
+                                    .indexOf(Enum_1.HEAD_CELL_NAMES.DOMAIN_CAMPAIGN) === -1 ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledDomainField, children: ((_s = row === null || row === void 0 ? void 0 : row.domain) === null || _s === void 0 ? void 0 : _s.name) !== ''
+                                        ? (_t = row === null || row === void 0 ? void 0 : row.domain) === null || _t === void 0 ? void 0 : _t.name
+                                        : ((_u = row === null || row === void 0 ? void 0 : row.domain) === null || _u === void 0 ? void 0 : _u.domainId) !== '0'
+                                            ? (_v = row === null || row === void 0 ? void 0 : row.domain) === null || _v === void 0 ? void 0 : _v.domainId
+                                            : '' })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
                     case Enum_1.HEAD_CELL_NAMES.PLACE_CAMPAIGN:
                         return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: fieldNameShowOn ===
-                                Enum_1.HEAD_CELL_NAMES.PLACE_CAMPAIGN ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledPlaceField, children: (_j = row === null || row === void 0 ? void 0 : row.place) === null || _j === void 0 ? void 0 : _j.name })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: 
+                                Enum_1.HEAD_CELL_NAMES.PLACE_CAMPAIGN ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledPlaceField, children: ((_w = row === null || row === void 0 ? void 0 : row.place) === null || _w === void 0 ? void 0 : _w.name) !== ''
+                                    ? (_x = row === null || row === void 0 ? void 0 : row.place) === null || _x === void 0 ? void 0 : _x.name
+                                    : ((_y = row === null || row === void 0 ? void 0 : row.place) === null || _y === void 0 ? void 0 : _y.placeId) !== '0'
+                                        ? (_z = row === null || row === void 0 ? void 0 : row.place) === null || _z === void 0 ? void 0 : _z.placeId
+                                        : '' })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: 
                                 // Nếu field hiện tại ko phải groupName đang showOn thì 3Th
                                 // TH1: field nằm trong groupNames nhưng đúng trước fieldNameShowOn hiển thị name
                                 // TH2: field nằm sau fieldNameShowOn trong groupNames hiển thi total
                                 // Th3: field ko trong groupNames hiển thị total hoặ thông tin schedule nếu nó là cấp cuối cùng
                                 groupNames
                                     .slice(0, priorityGroupLevel - 1)
-                                    .indexOf(Enum_1.HEAD_CELL_NAMES.PLACE_CAMPAIGN) === -1 ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledPlaceField, children: (_k = row === null || row === void 0 ? void 0 : row.place) === null || _k === void 0 ? void 0 : _k.name })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
+                                    .indexOf(Enum_1.HEAD_CELL_NAMES.PLACE_CAMPAIGN) === -1 ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledPlaceField, children: ((_0 = row === null || row === void 0 ? void 0 : row.place) === null || _0 === void 0 ? void 0 : _0.name) !== ''
+                                        ? (_1 = row === null || row === void 0 ? void 0 : row.place) === null || _1 === void 0 ? void 0 : _1.name
+                                        : ((_2 = row === null || row === void 0 ? void 0 : row.place) === null || _2 === void 0 ? void 0 : _2.placeId) !==
+                                            '0'
+                                            ? (_3 = row === null || row === void 0 ? void 0 : row.place) === null || _3 === void 0 ? void 0 : _3.placeId
+                                            : '' })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
                     default:
                         return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {});
                 }

package/lib/ACM-AXN/CampaignSchedule/Components/RowAdvance/container.js

@@ -53,7 +53,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
 var material_1 = require("@mui/material");
 var styles_1 = require("@mui/styles");
-var lodash_1 = __importDefault(require("lodash"));
 var moment_1 = __importDefault(require("moment"));
 var react_1 = require("react");
 var react_i18next_1 = require("react-i18next");
@@ -124,35 +123,31 @@ var RowAdvanceContainer = function (_a) {
     };
     function getDetails(filterBy, groupBy, pageSize, pageIndex) {
         return __awaiter(this, void 0, void 0, function () {
-            var params, error_1, error_2;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var groupByMapping, params, fetchFunction, error_1;
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
+                        groupByMapping = (_a = {},
+                            _a[Enum_1.HEAD_CELL_NAMES.CAMPAIGN_CAMPAIGN] = "campaignId",
+                            _a[Enum_1.HEAD_CELL_NAMES.PLACE_CAMPAIGN] = "placeId",
+                            _a[Enum_1.HEAD_CELL_NAMES.DOMAIN_CAMPAIGN] = "domainId",
+                            _a);
+                        groupBy = groupByMapping[groupBy] || groupBy;
                         params = __assign(__assign({}, filterBy), { groupBy: groupBy, pageIndex: pageIndex, pageSize: pageSize });
-                        if (!groupBy) return [3 /*break*/, 5];
-                        _a.label = 1;
+                        fetchFunction = groupBy ? pagingGroupBy : paging;
+                        _b.label = 1;
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, pagingGroupBy(params, setDetails, handleLoading)];
+                        _b.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, fetchFunction(params, setDetails, handleLoading)];
                     case 2:
-                        _a.sent();
+                        _b.sent();
                         return [3 /*break*/, 4];
                     case 3:
-                        error_1 = _a.sent();
-                        console.log(error_1);
+                        error_1 = _b.sent();
+                        console.error(error_1);
                         return [3 /*break*/, 4];
-                    case 4: return [3 /*break*/, 8];
-                    case 5:
-                        _a.trys.push([5, 7, , 8]);
-                        return [4 /*yield*/, paging(params, setDetails, handleLoading)];
-                    case 6:
-                        _a.sent();
-                        return [3 /*break*/, 8];
-                    case 7:
-                        error_2 = _a.sent();
-                        console.log(error_2);
-                        return [3 /*break*/, 8];
-                    case 8: return [2 /*return*/];
+                    case 4: return [2 /*return*/];
                 }
             });
         });
@@ -168,33 +163,39 @@ var RowAdvanceContainer = function (_a) {
     var handleOnClick = function (value) {
         if (!expandDisabled) {
             setOpen(!open);
-            getDetails(filters, groupNames[priorityGroupLevel], pages === null || pages === void 0 ? void 0 : pages.pageSize, pages === null || pages === void 0 ? void 0 : pages.pageIndex);
+            getDetails(filterByOfRowAdvance, groupNames[priorityGroupLevel], pages === null || pages === void 0 ? void 0 : pages.pageSize, pages === null || pages === void 0 ? void 0 : pages.pageIndex);
         }
     };
-    var handleOnClickCampaignStatistic = function (value) {
-        var _a, _b, _c;
-        if (groupNames[priorityGroupLevel - 1] ===
-            Enum_1.HEAD_CELL_NAMES.PLACE_CAMPAIGN) {
-            filters.placeIds = [(_a = value === null || value === void 0 ? void 0 : value.place) === null || _a === void 0 ? void 0 : _a.placeId];
-        }
-        if (groupNames[priorityGroupLevel - 1] ===
-            Enum_1.HEAD_CELL_NAMES.DOMAIN_CAMPAIGN) {
-            filters.domainId = (_b = value === null || value === void 0 ? void 0 : value.domain) === null || _b === void 0 ? void 0 : _b.domainId;
+    var filterByIdAXN = function (value, groupName, filters) {
+        var _a, _b, _c, _d;
+        if ((_a = filters === null || filters === void 0 ? void 0 : filters.placeIds) === null || _a === void 0 ? void 0 : _a.includes(undefined)) {
+            filters.placeIds = [];
         }
-        if (groupNames[priorityGroupLevel - 1] ===
-            Enum_1.HEAD_CELL_NAMES.CAMPAIGN_CAMPAIGN) {
-            filters.campaignId = (_c = value === null || value === void 0 ? void 0 : value.campaign) === null || _c === void 0 ? void 0 : _c.campaignId;
+        switch (groupName) {
+            case Enum_1.HEAD_CELL_NAMES.PLACE_CAMPAIGN:
+                return __assign(__assign({}, filters), { placeIds: [(_b = value === null || value === void 0 ? void 0 : value.place) === null || _b === void 0 ? void 0 : _b.placeId] });
+            case Enum_1.HEAD_CELL_NAMES.DOMAIN_CAMPAIGN:
+                return __assign(__assign({}, filters), { domainId: (_c = value === null || value === void 0 ? void 0 : value.domain) === null || _c === void 0 ? void 0 : _c.domainId });
+            case Enum_1.HEAD_CELL_NAMES.CAMPAIGN_CAMPAIGN:
+                return __assign(__assign({}, filters), { campaignId: (_d = value === null || value === void 0 ? void 0 : value.campaign) === null || _d === void 0 ? void 0 : _d.campaignId });
+            default:
+                return filters;
         }
+    };
+    var handleOnClickCampaignStatistic = function (value) {
+        var groupName = groupNames[priorityGroupLevel - 1];
+        var filtersByAXN = filterByIdAXN(value, groupName, filters);
         if (!expandDisabled) {
             setOpen(!open);
-            getDetails(filters, groupNames[priorityGroupLevel], pages === null || pages === void 0 ? void 0 : pages.pageSize, pages === null || pages === void 0 ? void 0 : pages.pageIndex);
+            getDetails(filtersByAXN, groupNames[priorityGroupLevel], pages === null || pages === void 0 ? void 0 : pages.pageSize, pages === null || pages === void 0 ? void 0 : pages.pageIndex);
         }
     };
     var expandDisabled = (groupNames === null || groupNames === void 0 ? void 0 : groupNames.length) === 0
         ? true
         : priorityGroupLevel === (groupNames === null || groupNames === void 0 ? void 0 : groupNames.length) + 1;
+    var conditionalExpand = headCells.length > 6 && headCells[4].id === Enum_1.HEAD_CELL_NAMES.IMPRESSION;
     return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(component_1.default, { stt: stt, row: row, options: options, headCells: headCells, priorityGroupLevel: priorityGroupLevel, groupNames: groupNames, handleOnClick: function () {
-                    lodash_1.default.isEmpty(options === null || options === void 0 ? void 0 : options.domains) === true
+                    conditionalExpand
                         ? handleOnClickCampaignStatistic(row)
                         : handleOnClick(row);
                 }, open: open, expandDisabled: expandDisabled }), open && ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: (loadingPage === null || loadingPage === void 0 ? void 0 : loadingPage.pages) ? ((0, jsx_runtime_1.jsx)(material_1.TableRow, { children: (0, jsx_runtime_1.jsx)(material_1.TableCell, { colSpan: headCells === null || headCells === void 0 ? void 0 : headCells.length, children: (0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {}) }) })) : ((0, jsx_runtime_1.jsx)(EnhancedPagination_1.default, { pageSize: pages === null || pages === void 0 ? void 0 : pages.pageSize, pageIndex: pages === null || pages === void 0 ? void 0 : pages.pageIndex, handleChangePage: handleChangePage, handleChangeRowsPerPage: handleChangeRowsPerPage, className: "".concat(classes.pagination, " ").concat((groupNames === null || groupNames === void 0 ? void 0 : groupNames.length) === 0
@@ -203,13 +204,16 @@ var RowAdvanceContainer = function (_a) {
                         ? details === null || details === void 0 ? void 0 : details.totalItemCount
                         : details === null || details === void 0 ? void 0 : details.total)) !== null && _b !== void 0 ? _b : 0, children: ((_c = details === null || details === void 0 ? void 0 : details.items) === null || _c === void 0 ? void 0 : _c.length) === 0 ? ((0, jsx_runtime_1.jsx)(NoDataTable_1.default, { colSpan: headCells === null || headCells === void 0 ? void 0 : headCells.length, title: t('Common.NoData') })) : ((_d = details === null || details === void 0 ? void 0 : details.items) === null || _d === void 0 ? void 0 : _d.map(function (item, i) {
                         var filterBy = filterById(row === null || row === void 0 ? void 0 : row.groupKeyId, groupNames[priorityGroupLevel], filterByOfRowAdvance);
+                        var filtersByAXN = filterByIdAXN(row, groupNames[priorityGroupLevel - 1], filters);
                         var stt = (pages === null || pages === void 0 ? void 0 : pages.pageSize) * (pages === null || pages === void 0 ? void 0 : pages.pageIndex) +
                             i +
                             1;
                         var key = (item === null || item === void 0 ? void 0 : item.groupKeyId)
                             ? item === null || item === void 0 ? void 0 : item.groupKeyId
                             : i;
-                        return ((0, jsx_runtime_1.jsx)(RowAdvanceContainer, { headCells: headCells, row: item, priorityGroupLevel: priorityGroupLevel + 1, stt: stt, groupNames: groupNames, options: options, filters: filterBy, serviceCampaignSchedule: serviceCampaignSchedule }, key));
+                        return ((0, jsx_runtime_1.jsx)(RowAdvanceContainer, { headCells: headCells, row: item, priorityGroupLevel: priorityGroupLevel + 1, stt: stt, groupNames: groupNames, options: options, filters: conditionalExpand
+                                ? filtersByAXN
+                                : filterBy, serviceCampaignSchedule: serviceCampaignSchedule }, key));
                     })) })) }))] }));
 };
 var filterById = function (id, groupName, filters) {

package/lib/ACM-AXN/CampaignSchedule/Components/TableHeaderDragable.js

@@ -16,15 +16,6 @@ var useStyles = (0, styles_1.makeStyles)(function () { return ({
         borderBottom: '1px solid #a3a3a345',
     },
     highlight: {},
-    // theme.palette.type === 'light'
-    //     ? {
-    //           color: theme.palette.secondary.main,
-    //           backgroundColor: lighten(theme.palette.secondary.light, 0.85),
-    //       }
-    //     : {
-    //           color: theme.palette.text.primary,
-    //           backgroundColor: theme.palette.secondary.dark,
-    //       },
     title: {
         flex: '1 1 100%',
     },