npm - awing-library - Versions diffs - 2.1.30-beta → 2.1.32-beta - Mend

awing-library 2.1.30-beta → 2.1.32-beta

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

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

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

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

@@ -24,90 +24,92 @@ var moment_1 = __importDefault(require("moment"));
 var react_i18next_1 = require("react-i18next");
 var useStyles = (0, styles_1.makeStyles)(function () { return ({
     outlinedInput: {
-        "& .MuiOutlinedInput-input": {
-            padding: "10.5px !important",
+        '& .MuiOutlinedInput-input': {
+            padding: '10.5px !important',
         },
-        "& .MuiFormControl-marginNormal": {
+        '& .MuiFormControl-marginNormal': {
             margin: 0,
         },
-        "& .MuiOutlinedInput-adornedEnd": {
-            paddingRight: "0.25rem",
+        '& .MuiOutlinedInput-adornedEnd': {
+            paddingRight: '0.25rem',
         },
-        "& .MuiIconButton-root": {
-            padding: "0.5rem",
+        '& .MuiIconButton-root': {
+            padding: '0.5rem',
         },
-        "& .MuiAutocomplete-inputRoot": {
-            padding: "0.125rem",
+        '& .MuiAutocomplete-inputRoot': {
+            padding: '0.125rem',
         },
-        "& .MuiAutocomplete-endAdornment": {
-            top: "calc(50% - 19px)",
+        '& .MuiAutocomplete-endAdornment': {
+            top: 'calc(50% - 19px)',
         },
     },
     filterPlaceBtn: {
-        cursor: "pointer",
-        "&:hover": {
-            transform: "scale(1.2)",
+        cursor: 'pointer',
+        '&:hover': {
+            transform: 'scale(1.2)',
         },
     },
     ellipsisPlaceFilter: {
-        "& .MuiInputBase-input": {
-            textOverflow: "ellipsis",
+        '& .MuiInputBase-input': {
+            textOverflow: 'ellipsis',
         },
-        display: "flex",
+        display: 'flex',
     },
     lineInfo: {
-        paddingBottom: "0.25rem",
-        display: "flex",
-        alignItems: "center",
+        paddingBottom: '0.25rem',
+        display: 'flex',
+        alignItems: 'center',
         // [theme.breakpoints.down('md')]: {
         //     flexDirection: 'column',
         // },
     },
     dateRangePicker: {
-        "& .MuiInputBase-input": {
-            height: "1.25rem",
+        '& .MuiInputBase-input': {
+            height: '1.25rem',
         },
     },
     labelIsNetwork: {
-        backgroundColor: "#c49f47",
-        color: "#ffffff",
-        padding: "0 4px",
-        marginLeft: "4px",
-        fontSize: "13px",
+        backgroundColor: '#c49f47',
+        color: '#ffffff',
+        padding: '0 4px',
+        marginLeft: '4px',
+        fontSize: '13px',
     },
 }); });
 var Filters = function (_a) {
     var _b, _c;
-    var campaigns = _a.campaigns, handleFilters = _a.handleFilters, loadingFlags = _a.loadingFlags, PlaceMultiSelect = _a.placeMultiSelectComponent, handleExportExcel = _a.handleExportExcel;
+    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 t = (0, react_i18next_1.useTranslation)().t;
-    var campaignOptions = __assign(__assign({}, campaigns), { 0: { campaignId: 0, name: t("Common.SelectAll") } });
+    var campaignOptions = __assign(__assign({}, campaigns), { 0: { campaignId: 0, name: t('Common.SelectAll') } });
     var classes = useStyles();
     var handleChangeDateRange = function (value) {
-        handleFilters("startDate", value.startDate);
-        handleFilters("endDate", value.endDate);
+        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: 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, 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) {
-                        var now = (0, moment_1.default)().startOf("day").valueOf();
+                        if (disabledCampaignFilter)
+                            return false;
+                        var now = (0, moment_1.default)().startOf('day').valueOf();
                         if (day.valueOf() < now) {
                             return true;
                         }
                         else {
                             return false;
                         }
-                    } }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, children: (0, jsx_runtime_1.jsx)(material_1.Autocomplete, { size: "small", disablePortal: true, id: "combo-box-demo", options: (_c = (_b = lodash_1.default.values(campaignOptions)) === null || _b === void 0 ? void 0 : _b.map(function (obj) { return (__assign({}, obj)); })) !== null && _c !== void 0 ? _c : [], getOptionLabel: function (option) { var _a; return (_a = option.name) !== null && _a !== void 0 ? _a : ""; }, isOptionEqualToValue: function (option, value) {
+                    } }) }), !disabledCampaignFilter && ((0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, children: (0, jsx_runtime_1.jsx)(material_1.Autocomplete, { size: "small", disablePortal: true, id: "combo-box-demo", options: (_c = (_b = lodash_1.default.values(campaignOptions)) === null || _b === void 0 ? void 0 : _b.map(function (obj) { return (__assign({}, obj)); })) !== null && _c !== void 0 ? _c : [], getOptionLabel: function (option) { var _a; return (_a = option.name) !== null && _a !== void 0 ? _a : ''; }, isOptionEqualToValue: function (option, value) {
                         return option.Id === value.Id;
                     }, onChange: function (event, campaign) {
-                        handleFilters("campaignId", campaign === null || campaign === void 0 ? void 0 : campaign.id);
-                    }, renderInput: function (params) { return ((0, jsx_runtime_1.jsx)(material_1.TextField, __assign({}, params, { label: t("Schedule.CampaignName"), sx: { backgroundColor: "white" }, variant: "outlined" }))); }, defaultValue: { Id: 0, name: t("Common.SelectAll") } }) }), (0, jsx_runtime_1.jsxs)(material_1.Grid, { item: true, xs: 4, className: classes.ellipsisPlaceFilter, children: [(0, jsx_runtime_1.jsx)(PlaceMultiSelect, { isDisplayTextField: true, onChange: function (placeIds) {
-                            return handleFilters("placeIds", placeIds);
+                        handleFilters('campaignId', campaign === null || campaign === void 0 ? void 0 : campaign.id);
+                    }, renderInput: function (params) { return ((0, jsx_runtime_1.jsx)(material_1.TextField, __assign({}, params, { label: t('Schedule.CampaignName'), sx: { backgroundColor: 'white' }, variant: "outlined" }))); }, defaultValue: { Id: 0, name: t('Common.SelectAll') } }) })), (0, jsx_runtime_1.jsxs)(material_1.Grid, { item: true, xs: disabledCampaignFilter ? 6 : 4, className: classes.ellipsisPlaceFilter, children: [(0, jsx_runtime_1.jsx)(PlaceMultiSelect, { isDisplayTextField: true, onChange: function (placeIds) {
+                            return handleFilters('placeIds', placeIds);
                         } }), (0, jsx_runtime_1.jsx)(material_1.Button, { sx: {
-                            height: "40px",
-                            position: "relative !important",
-                            marginLeft: "1rem",
-                            marginTop: "6px",
-                        }, variant: "contained", onClick: handleExportExcel, title: t("Common.Download"), disabled: loadingFlags === null || loadingFlags === void 0 ? void 0 : loadingFlags.export, color: "inherit", children: (loadingFlags === null || loadingFlags === void 0 ? void 0 : loadingFlags.export) ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsx)(GetApp_1.default, {})) })] })] }));
+                            height: '40px',
+                            position: 'relative !important',
+                            marginLeft: '1rem',
+                            marginTop: '6px',
+                        }, variant: "contained", onClick: handleExportExcel, title: t('Common.Download'), disabled: loadingFlags === null || loadingFlags === void 0 ? void 0 : loadingFlags.export, color: "inherit", children: (loadingFlags === null || loadingFlags === void 0 ? void 0 : loadingFlags.export) ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsx)(GetApp_1.default, {})) })] })] }));
 };
 exports.default = Filters;

package/lib/ACM-AXN/CampaignSchedule/Components/ControlPanel/GroupPanel.js CHANGED Viewed

@@ -32,10 +32,16 @@ var GroupPanel = function (_a) {
                 return __assign(__assign({}, cell), { label: t('Schedule.Campaign') });
             case Enum_1.HEAD_CELL_IDS.PLACE:
                 return __assign(__assign({}, cell), { label: t('Schedule.Place') });
+            case Enum_1.HEAD_CELL_IDS.CAMPAIGN_CAMPAIGN:
+                return __assign(__assign({}, cell), { label: t('Schedule.Campaign') });
+            case Enum_1.HEAD_CELL_IDS.PLACE_CAMPAIGN:
+                return __assign(__assign({}, cell), { label: t('Schedule.Place') });
             case Enum_1.HEAD_CELL_IDS.DATE:
                 return __assign(__assign({}, cell), { label: t('Schedule.Date') });
             case Enum_1.HEAD_CELL_IDS.DOMAIN:
                 return __assign(__assign({}, cell), { label: t('Schedule.Domain') });
+            case Enum_1.HEAD_CELL_IDS.DOMAIN_CAMPAIGN:
+                return __assign(__assign({}, cell), { label: t('Schedule.Domain') });
             case Enum_1.HEAD_CELL_IDS.RATE:
                 return __assign(__assign({}, cell), { label: "".concat(t('Schedule.Rate'), " (%)") });
             case Enum_1.HEAD_CELL_IDS.TOTAL:

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

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

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

@@ -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;
+    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 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 }) }), (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 }) }), (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 CHANGED Viewed

@@ -97,6 +97,7 @@ var RowAdvanceComponent = function (_a) {
     var totalView = (row === null || row === void 0 ? void 0 : row.quantity) !== undefined
         ? (0, helper_1.roundDecimalNumber)(row === null || row === void 0 ? void 0 : row.quantity)
         : (0, helper_1.roundDecimalNumber)(row === null || row === void 0 ? void 0 : row.totalQuantity);
+    var ctr = (((row === null || row === void 0 ? void 0 : row.click) / (row === null || row === void 0 ? void 0 : row.view)) * 100).toFixed(2);
     function styledRow(priority) {
         if ((groupNames === null || groupNames === void 0 ? void 0 : groupNames.length) === 1 && priorityGroupLevel === 1) {
             return classes.styledSecondaryRow;
@@ -117,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;
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
                 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
@@ -156,6 +157,33 @@ var RowAdvanceComponent = function (_a) {
                                 : totalRate }, item.id));
                     case Enum_1.HEAD_CELL_NAMES.TOTAL:
                         return ((0, jsx_runtime_1.jsx)(material_1.TableCell, { align: "right", children: totalView }, item.id));
+                    case Enum_1.HEAD_CELL_NAMES.IMPRESSION:
+                        return ((0, jsx_runtime_1.jsx)(material_1.TableCell, { align: "right", children: row === null || row === void 0 ? void 0 : row.view }, item.id));
+                    case Enum_1.HEAD_CELL_NAMES.FINAL_CLICK:
+                        return ((0, jsx_runtime_1.jsx)(material_1.TableCell, { align: "right", children: row === null || row === void 0 ? void 0 : row.click }, item.id));
+                    case Enum_1.HEAD_CELL_NAMES.CTR:
+                        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
+                                    .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));
+                    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
+                                    .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));
+                    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:
+                                // 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));
                     default:
                         return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {});
                 }

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

@@ -156,18 +156,49 @@ var RowAdvanceContainer = function (_a) {
         setPages(__assign(__assign({}, pages), { pageSize: parseInt(event.target.value), pageIndex: 0 }));
         getDetails(filterByOfRowAdvance, groupNames[priorityGroupLevel], parseInt(event.target.value), 0);
     };
-    var handleOnClick = function () {
+    // const handleOnClick = (value: any) => {
+    //     debugger
+    //     console.log('row', row)
+    //     console.log('filterByOfRowAdvance', filterByOfRowAdvance)
+    //     if (!expandDisabled) {
+    //         setOpen(!open)
+    //         getDetails(
+    //             filterByOfRowAdvance,
+    //             groupNames[priorityGroupLevel],
+    //             pages?.pageSize,
+    //             pages?.pageIndex
+    //         )
+    //     }
+    // }
+    var handleOnClick = 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;
+        }
+        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;
+        }
         if (!expandDisabled) {
             setOpen(!open);
-            getDetails(filterByOfRowAdvance, groupNames[priorityGroupLevel], pages === null || pages === void 0 ? void 0 : pages.pageSize, pages === null || pages === void 0 ? void 0 : pages.pageIndex);
+            getDetails(
+            // filterByOfRowAdvance
+            filters, 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;
-    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: handleOnClick, open: open, expandDisabled: expandDisabled }), open && ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: loadingPage ? ((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
+    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 () { return handleOnClick(row); }, open: open, expandDisabled: expandDisabled }), open && ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: loadingPage ? ((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
                         ? classes.nomarlPaginations
-                        : styledPagination(priorityGroupLevel + 1)), colSpan: headCells === null || headCells === void 0 ? void 0 : headCells.length, total: (_b = details === null || details === void 0 ? void 0 : details.totalItemCount) !== 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) {
+                        : styledPagination(priorityGroupLevel + 1)), colSpan: headCells === null || headCells === void 0 ? void 0 : headCells.length, total: (_b = ((details === null || details === void 0 ? void 0 : details.totalItemCount)
+                        ? 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 stt = (pages === null || pages === void 0 ? void 0 : pages.pageSize) * (pages === null || pages === void 0 ? void 0 : pages.pageIndex) +
                             i +
@@ -180,12 +211,17 @@ var RowAdvanceContainer = function (_a) {
 };
 var filterById = function (id, groupName, filters) {
     switch (groupName) {
+        case Enum_1.HEAD_CELL_NAMES.DOMAIN_CAMPAIGN:
         case Enum_1.HEAD_CELL_NAMES.DOMAIN:
             return __assign(__assign({}, filters), { domainId: id });
         case Enum_1.HEAD_CELL_NAMES.CAMPAIGN:
             return __assign(__assign({}, filters), { campaignId: id });
+        case Enum_1.HEAD_CELL_NAMES.CAMPAIGN_CAMPAIGN:
+            return __assign(__assign({}, filters), { campaignId: id });
         case Enum_1.HEAD_CELL_NAMES.PLACE:
             return __assign(__assign({}, filters), { placeIds: [id] });
+        case Enum_1.HEAD_CELL_NAMES.PLACE_CAMPAIGN:
+            return __assign(__assign({}, filters), { placeIds: [id] });
         case Enum_1.HEAD_CELL_NAMES.DATE:
             return __assign(__assign({}, filters), { fromDate: (0, moment_1.default)(id).format('YYYY-MM-DD'), toDate: (0, moment_1.default)(id).format('YYYY-MM-DD') });
         default:

package/lib/ACM-AXN/CampaignSchedule/Components/TableHeaderDragable.d.ts CHANGED Viewed

@@ -1,3 +1,3 @@
-import { ITableHeaderDragableProps } from "../interface";
+import { ITableHeaderDragableProps } from '../interface';
 declare const TableHeaderDragable: ({ headCells, onDragOver, onDragStart, onDrop, }: ITableHeaderDragableProps) => import("react/jsx-runtime").JSX.Element;
 export default TableHeaderDragable;

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

@@ -11,9 +11,9 @@ var react_i18next_1 = require("react-i18next");
 var Enum_1 = require("../Enum");
 var useStyles = (0, styles_1.makeStyles)(function () { return ({
     root: {
-        paddingLeft: "1rem",
-        paddingRight: "1rem",
-        borderBottom: "1px solid #a3a3a345",
+        paddingLeft: '1rem',
+        paddingRight: '1rem',
+        borderBottom: '1px solid #a3a3a345',
     },
     highlight: {},
     // theme.palette.type === 'light'
@@ -26,29 +26,29 @@ var useStyles = (0, styles_1.makeStyles)(function () { return ({
     //           backgroundColor: theme.palette.secondary.dark,
     //       },
     title: {
-        flex: "1 1 100%",
+        flex: '1 1 100%',
     },
     bold: {
-        fontWeight: "bold",
+        fontWeight: 'bold',
     },
     paddingTableHeader: {},
     styledSttField: {
         paddingLeft: 0,
         paddingRight: 0,
-        maxWidth: "50px",
-        minWidth: "40px",
+        maxWidth: '50px',
+        minWidth: '40px',
     },
     styledCampaignField: {
-        minWidth: "100px",
+        minWidth: '100px',
     },
     styledDomainField: {
-        minWidth: "50px",
+        minWidth: '50px',
     },
     styledPlaceField: {
-        minWidth: "100px",
+        minWidth: '100px',
     },
     styledDateField: {
-        minWidth: "100px",
+        minWidth: '100px',
     },
 }); });
 var TableHeaderDragable = function (_a) {
@@ -65,10 +65,16 @@ var TableHeaderDragable = function (_a) {
                 return classes.styledDomainField;
             case Enum_1.HEAD_CELL_IDS.PLACE:
                 return classes.styledPlaceField;
+            case Enum_1.HEAD_CELL_IDS.CAMPAIGN_CAMPAIGN:
+                return classes.styledCampaignField;
+            case Enum_1.HEAD_CELL_IDS.DOMAIN_CAMPAIGN:
+                return classes.styledDomainField;
+            case Enum_1.HEAD_CELL_IDS.PLACE_CAMPAIGN:
+                return classes.styledPlaceField;
             case Enum_1.HEAD_CELL_IDS.DATE:
                 return classes.styledDateField;
             default:
-                return "";
+                return '';
         }
     };
     var generateLabelField = function (fieldId) {
@@ -76,22 +82,34 @@ var TableHeaderDragable = function (_a) {
             case Enum_1.HEAD_CELL_IDS.CONTROL:
                 return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(UnfoldMore_1.default, {}), "#"] }));
             case Enum_1.HEAD_CELL_IDS.CAMPAIGN:
-                return t("Schedule.Campaign");
+                return t('Schedule.Campaign');
+            case Enum_1.HEAD_CELL_IDS.CAMPAIGN_CAMPAIGN:
+                return t('Schedule.Campaign');
             case Enum_1.HEAD_CELL_IDS.DOMAIN:
-                return t("Schedule.Domain");
+                return t('Schedule.Domain');
+            case Enum_1.HEAD_CELL_IDS.DOMAIN_CAMPAIGN:
+                return t('Schedule.Domain');
             case Enum_1.HEAD_CELL_IDS.PLACE:
-                return t("Schedule.Place");
+                return t('Schedule.Place');
+            case Enum_1.HEAD_CELL_IDS.PLACE_CAMPAIGN:
+                return t('Schedule.Place');
             case Enum_1.HEAD_CELL_IDS.DATE:
-                return t("Schedule.Date");
+                return t('Schedule.Date');
+            case Enum_1.HEAD_CELL_IDS.IMPRESSION:
+                return t('Common.Impression');
+            case Enum_1.HEAD_CELL_IDS.FINAL_CLICK:
+                return t('Common.FinalClick');
+            case Enum_1.HEAD_CELL_IDS.CTR:
+                return t('CTR (%)');
             case Enum_1.HEAD_CELL_IDS.RATE:
-                return "".concat(t("Schedule.Rate"), " (%)");
+                return "".concat(t('Schedule.Rate'), " (%)");
             case Enum_1.HEAD_CELL_IDS.TOTAL:
-                return "".concat(t("Schedule.Total"), " (").concat(t("Common.Impression"), ")");
+                return "".concat(t('Schedule.Total'), " (").concat(t('Common.Impression'), ")");
             default:
-                return "";
+                return '';
         }
     };
-    return ((0, jsx_runtime_1.jsx)(material_1.TableHead, { children: (0, jsx_runtime_1.jsx)(material_1.TableRow, { className: classes.title, id: "head-cell", children: headCells === null || headCells === void 0 ? void 0 : headCells.map(function (headCell, index) { return ((0, jsx_runtime_1.jsx)(material_1.TableCell, { id: headCell.id, align: headCell.numeric ? "right" : "left", padding: headCell.disablePadding ? "none" : "normal", className: "".concat(classes.bold, " ").concat(classes === null || classes === void 0 ? void 0 : classes.root, " ").concat(classes.paddingTableHeader, " ").concat(styledField(headCell.id)), draggable: true, onDragOver: function (e) {
+    return ((0, jsx_runtime_1.jsx)(material_1.TableHead, { children: (0, jsx_runtime_1.jsx)(material_1.TableRow, { className: classes.title, id: "head-cell", children: headCells === null || headCells === void 0 ? void 0 : headCells.map(function (headCell, index) { return ((0, jsx_runtime_1.jsx)(material_1.TableCell, { id: headCell.id, align: headCell.numeric ? 'right' : 'left', padding: headCell.disablePadding ? 'none' : 'normal', className: "".concat(classes.bold, " ").concat(classes === null || classes === void 0 ? void 0 : classes.root, " ").concat(classes.paddingTableHeader, " ").concat(styledField(headCell.id)), draggable: true, onDragOver: function (e) {
                     onDragOver(e);
                 }, onDragStart: function (e) {
                     onDragStart(e);

package/lib/ACM-AXN/CampaignSchedule/Enum.d.ts CHANGED Viewed

@@ -9,7 +9,13 @@ export declare enum HEAD_CELL_IDS {
     TOTAL = "total",
     GROUP = "group",
     ESTIMATE = "estimate",
-    REALITY = "reality"
+    REALITY = "reality",
+    IMPRESSION = "impression",
+    FINAL_CLICK = "finalClick",
+    CTR = "ctr",
+    PLACE_CAMPAIGN = "placeCampaign",
+    DOMAIN_CAMPAIGN = "domainCampaign",
+    CAMPAIGN_CAMPAIGN = "campaignCampaign"
 }
 export declare enum HEAD_CELL_NAMES {
     CONTROL = "collapse-stt",
@@ -23,7 +29,13 @@ export declare enum HEAD_CELL_NAMES {
     ESTIMATE = "estimate",
     REALITY = "reality",
     CAMPAIGN_NAME = "campaignName",
-    PLACE_NAME = "placeName"
+    PLACE_NAME = "placeName",
+    IMPRESSION = "impression",
+    FINAL_CLICK = "finalClick",
+    CTR = "ctr",
+    PLACE_CAMPAIGN = "placeCampaign",
+    DOMAIN_CAMPAIGN = "domainCampaign",
+    CAMPAIGN_CAMPAIGN = "campaignCampaign"
 }
 export declare enum BACKGROUND_COLOR {
     PRIMARY = "#F4F4F4",

package/lib/ACM-AXN/CampaignSchedule/Enum.js CHANGED Viewed

@@ -17,6 +17,12 @@ var HEAD_CELL_IDS;
     HEAD_CELL_IDS["GROUP"] = "group";
     HEAD_CELL_IDS["ESTIMATE"] = "estimate";
     HEAD_CELL_IDS["REALITY"] = "reality";
+    HEAD_CELL_IDS["IMPRESSION"] = "impression";
+    HEAD_CELL_IDS["FINAL_CLICK"] = "finalClick";
+    HEAD_CELL_IDS["CTR"] = "ctr";
+    HEAD_CELL_IDS["PLACE_CAMPAIGN"] = "placeCampaign";
+    HEAD_CELL_IDS["DOMAIN_CAMPAIGN"] = "domainCampaign";
+    HEAD_CELL_IDS["CAMPAIGN_CAMPAIGN"] = "campaignCampaign";
 })(HEAD_CELL_IDS || (exports.HEAD_CELL_IDS = HEAD_CELL_IDS = {}));
 var HEAD_CELL_NAMES;
 (function (HEAD_CELL_NAMES) {
@@ -32,6 +38,12 @@ var HEAD_CELL_NAMES;
     HEAD_CELL_NAMES["REALITY"] = "reality";
     HEAD_CELL_NAMES["CAMPAIGN_NAME"] = "campaignName";
     HEAD_CELL_NAMES["PLACE_NAME"] = "placeName";
+    HEAD_CELL_NAMES["IMPRESSION"] = "impression";
+    HEAD_CELL_NAMES["FINAL_CLICK"] = "finalClick";
+    HEAD_CELL_NAMES["CTR"] = "ctr";
+    HEAD_CELL_NAMES["PLACE_CAMPAIGN"] = "placeCampaign";
+    HEAD_CELL_NAMES["DOMAIN_CAMPAIGN"] = "domainCampaign";
+    HEAD_CELL_NAMES["CAMPAIGN_CAMPAIGN"] = "campaignCampaign";
 })(HEAD_CELL_NAMES || (exports.HEAD_CELL_NAMES = HEAD_CELL_NAMES = {}));
 var BACKGROUND_COLOR;
 (function (BACKGROUND_COLOR) {

package/lib/ACM-AXN/CampaignSchedule/component.js CHANGED Viewed

@@ -44,22 +44,23 @@ var useStyles = (0, styles_1.makeStyles)(function () { return ({
     },
 }); });
 var CampaignSchedulesComponent = function (_a) {
-    var _b, _c, _d, _e, _f;
+    var _b, _c, _d, _e;
     var headCells = _a.headCells, onDragOver = _a.onDragOver, onDragStart = _a.onDragStart, onDrop = _a.onDrop, scheduleGroups = _a.scheduleGroups, page = _a.page, handleChangePage = _a.handleChangePage, handleChangeRowsPerPage = _a.handleChangeRowsPerPage, filters = _a.filters, options = _a.options, serviceCampaignSchedule = _a.serviceCampaignSchedule;
     var classes = useStyles();
     var groupLength = (_c = (_b = headCells === null || headCells === void 0 ? void 0 : headCells.filter(function (cell) { return cell.grouping; })) === null || _b === void 0 ? void 0 : _b.map(function (item) { return item.name; })) === null || _c === void 0 ? void 0 : _c.length;
-    return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: (0, jsx_runtime_1.jsxs)(material_1.Table, { "aria-label": "Table-advance", children: [(0, jsx_runtime_1.jsx)(TableHeaderDragable_1.default, { headCells: headCells, onDragOver: onDragOver, onDragStart: onDragStart, onDrop: onDrop }), (0, jsx_runtime_1.jsx)(material_1.TableBody, { children: (0, jsx_runtime_1.jsx)(EnhancedPagination_1.default, { total: (_d = scheduleGroups === null || scheduleGroups === void 0 ? void 0 : scheduleGroups.totalItemCount) !== null && _d !== void 0 ? _d : 0, pageSize: page === null || page === void 0 ? void 0 : page.pageSize, pageIndex: page === null || page === void 0 ? void 0 : page.pageIndex, handleChangePage: handleChangePage, handleChangeRowsPerPage: handleChangeRowsPerPage, className: "".concat(classes.pagination, " ").concat(groupLength === 0
+    return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: (0, jsx_runtime_1.jsxs)(material_1.Table, { "aria-label": "Table-advance", children: [(0, jsx_runtime_1.jsx)(TableHeaderDragable_1.default, { headCells: headCells, onDragOver: onDragOver, onDragStart: onDragStart, onDrop: onDrop }), (0, jsx_runtime_1.jsx)(material_1.TableBody, { children: (0, jsx_runtime_1.jsx)(EnhancedPagination_1.default, { total: (scheduleGroups === null || scheduleGroups === void 0 ? void 0 : scheduleGroups.totalItemCount) ? scheduleGroups === null || scheduleGroups === void 0 ? void 0 : scheduleGroups.totalItemCount : scheduleGroups === null || scheduleGroups === void 0 ? void 0 : scheduleGroups.total, pageSize: page === null || page === void 0 ? void 0 : page.pageSize, pageIndex: page === null || page === void 0 ? void 0 : page.pageIndex, handleChangePage: handleChangePage, handleChangeRowsPerPage: handleChangeRowsPerPage, className: "".concat(classes.pagination, " ").concat(groupLength === 0
                             ? classes.nomarlPaginations
                             : groupLength === 1
                                 ? classes.secondaryPaginations
-                                : classes.primaryPaginations), classes: undefined, colSpan: headCells === null || headCells === void 0 ? void 0 : headCells.length, children: ((_e = scheduleGroups === null || scheduleGroups === void 0 ? void 0 : scheduleGroups.items) === null || _e === void 0 ? void 0 : _e.length) === 0 ? ((0, jsx_runtime_1.jsx)(NoDataTable_1.default, { colSpan: headCells === null || headCells === void 0 ? void 0 : headCells.length })) : ((_f = scheduleGroups === null || scheduleGroups === void 0 ? void 0 : scheduleGroups.items) === null || _f === void 0 ? void 0 : _f.map(function (row, index) {
+                                : classes.primaryPaginations), classes: undefined, colSpan: headCells === null || headCells === void 0 ? void 0 : headCells.length, children: ((_d = scheduleGroups === null || scheduleGroups === void 0 ? void 0 : scheduleGroups.items) === null || _d === void 0 ? void 0 : _d.length) === 0 ? ((0, jsx_runtime_1.jsx)(NoDataTable_1.default, { colSpan: headCells === null || headCells === void 0 ? void 0 : headCells.length })) : ((_e = scheduleGroups === null || scheduleGroups === void 0 ? void 0 : scheduleGroups.items) === null || _e === void 0 ? void 0 : _e.map(function (row, index) {
                             var _a;
                             var groupNames = (_a = headCells === null || headCells === void 0 ? void 0 : headCells.filter(function (cell) { return cell.grouping; })) === null || _a === void 0 ? void 0 : _a.map(function (item) { return item.name; });
                             var filterBy = {
-                                fromDate: (0, moment_1.default)(filters === null || filters === void 0 ? void 0 : filters.startDate).format("YYYY-MM-DD"),
-                                toDate: (0, moment_1.default)(filters === null || filters === void 0 ? void 0 : filters.endDate).format("YYYY-MM-DD"),
+                                startDate: (0, moment_1.default)(filters === null || filters === void 0 ? void 0 : filters.startDate).format("YYYY-MM-DD"),
+                                endDate: (0, moment_1.default)(filters === null || filters === void 0 ? void 0 : filters.endDate).format("YYYY-MM-DD"),
                                 campaignId: filters === null || filters === void 0 ? void 0 : filters.campaignId,
                                 placeIds: filters === null || filters === void 0 ? void 0 : filters.placeIds,
+                                domainId: filters === null || filters === void 0 ? void 0 : filters.domainId,
                             };
                             return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: (0, jsx_runtime_1.jsx)(RowAdvance_1.default, { headCells: headCells, row: row, priorityGroupLevel: 1, stt: (page === null || page === void 0 ? void 0 : page.pageSize) *
                                         (page === null || page === void 0 ? void 0 : page.pageIndex) +

package/lib/ACM-AXN/CampaignSchedule/container.d.ts CHANGED Viewed

@@ -1,3 +1,3 @@
 import { ICampaignScheduleContainerProps } from './interface';
-declare const CampaignScheduleContainer: ({ initialFilters, initialHeadCells, placeMultiSelectComponent, serviceCampaignSchedule, typeSystemAXN, }: ICampaignScheduleContainerProps) => import("react/jsx-runtime").JSX.Element;
+declare const CampaignScheduleContainer: ({ initialFilters, initialHeadCells, placeMultiSelectComponent, serviceCampaignSchedule, typeSystemAXN, title, disabledCampaignFilter, }: ICampaignScheduleContainerProps) => import("react/jsx-runtime").JSX.Element;
 export default CampaignScheduleContainer;

package/lib/ACM-AXN/CampaignSchedule/container.js CHANGED Viewed

@@ -74,7 +74,7 @@ var Enum_1 = require("./Enum");
 var component_1 = __importDefault(require("./component"));
 var CampaignScheduleContainer = function (_a) {
     var _b;
-    var initialFilters = _a.initialFilters, initialHeadCells = _a.initialHeadCells, placeMultiSelectComponent = _a.placeMultiSelectComponent, serviceCampaignSchedule = _a.serviceCampaignSchedule, _c = _a.typeSystemAXN, typeSystemAXN = _c === void 0 ? false : _c;
+    var initialFilters = _a.initialFilters, initialHeadCells = _a.initialHeadCells, placeMultiSelectComponent = _a.placeMultiSelectComponent, serviceCampaignSchedule = _a.serviceCampaignSchedule, _c = _a.typeSystemAXN, typeSystemAXN = _c === void 0 ? false : _c, title = _a.title, disabledCampaignFilter = _a.disabledCampaignFilter;
     var t = (0, react_i18next_1.useTranslation)().t;
     var _d = (0, react_1.useState)(null), dragPlace = _d[0], setDragPlace = _d[1];
     var _e = (0, react_1.useState)(initialFilters), filters = _e[0], setFilters = _e[1];
@@ -126,7 +126,19 @@ var CampaignScheduleContainer = function (_a) {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        groupNames = (_a = headCells === null || headCells === void 0 ? void 0 : headCells.filter(function (item) { return item.grouping; })) === null || _a === void 0 ? void 0 : _a.map(function (item) { return item.name; });
+                        groupNames = (_a = headCells === null || headCells === void 0 ? void 0 : headCells.filter(function (item) { return item.grouping; })) === null || _a === void 0 ? void 0 : _a.map(function (item) {
+                            switch (item.name) {
+                                case 'placeCampaign':
+                                    return 'placeId';
+                                case 'domainCampaign':
+                                    return 'domainId';
+                                case 'campaignCampaign':
+                                    return 'campaignId';
+                                default:
+                                    return item.name;
+                            }
+                        });
+                        debugger;
                         groupBy = (groupNames === null || groupNames === void 0 ? void 0 : groupNames.length) === 0 ? null : groupNames[0];
                         pageIndex = page.pageIndex;
                         pageSize = page.pageSize;
@@ -181,18 +193,20 @@ var CampaignScheduleContainer = function (_a) {
         }
     };
     var getAllDomains = function () {
-        handleLoading('domains', true);
-        domains()
-            .then(function (res) {
-            setOptions(function (prevState) { return (__assign(__assign({}, prevState), { domains: lodash_1.default.keyBy(res, 'domainId') })); });
-        })
-            .catch(function (error) {
-            console.log(error);
-            // snackbar("error");
-        })
-            .finally(function () {
-            handleLoading('domains', false);
-        });
+        if (domains) {
+            handleLoading('domains', true);
+            domains()
+                .then(function (res) {
+                setOptions(function (prevState) { return (__assign(__assign({}, prevState), { domains: lodash_1.default.keyBy(res, 'domainId') })); });
+            })
+                .catch(function (error) {
+                console.log(error);
+                // snackbar("error");
+            })
+                .finally(function () {
+                handleLoading('domains', false);
+            });
+        }
     };
     var fetchCampaignCurrentRun = function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
@@ -303,8 +317,7 @@ var CampaignScheduleContainer = function (_a) {
         ], false), panels.slice(indexMatch + 1), true));
         setPanels(newPanels);
     }
-    console.log('scheduleGroups :>> ', scheduleGroups);
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(react_helmet_async_1.HelmetProvider, { children: (0, jsx_runtime_1.jsx)(react_helmet_async_1.Helmet, { children: (0, jsx_runtime_1.jsx)("title", { children: t('Schedule.TrafficDistribution') }) }) }), (0, jsx_runtime_1.jsx)(ContentHeader_1.default, { title: t('Schedule.TrafficDistribution') }), (0, jsx_runtime_1.jsxs)(material_1.Paper, { children: [(0, jsx_runtime_1.jsx)(ControlPanel_1.default, { campaigns: (_b = options === null || options === void 0 ? void 0 : options.campaigns) !== null && _b !== void 0 ? _b : {}, panels: panels, unGroupField: unGroupField, onDragStart: onDragStart, onDragOver: onDragOver, onDrop: onDrop, handleView: handleView, handleExportExcel: handleExportExcel, handleFilters: handleFilters, loadingFlags: loadingFlags, placeMultiSelectComponent: placeMultiSelectComponent }), loadingFlags.pages ||
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(react_helmet_async_1.HelmetProvider, { children: (0, jsx_runtime_1.jsx)(react_helmet_async_1.Helmet, { children: (0, jsx_runtime_1.jsx)("title", { children: title }) }) }), (0, jsx_runtime_1.jsx)(ContentHeader_1.default, { title: title }), (0, jsx_runtime_1.jsxs)(material_1.Paper, { children: [(0, jsx_runtime_1.jsx)(ControlPanel_1.default, { campaigns: (_b = options === null || options === void 0 ? void 0 : options.campaigns) !== null && _b !== void 0 ? _b : {}, panels: panels, unGroupField: unGroupField, onDragStart: onDragStart, onDragOver: onDragOver, onDrop: onDrop, handleView: handleView, handleExportExcel: handleExportExcel, handleFilters: handleFilters, loadingFlags: loadingFlags, placeMultiSelectComponent: placeMultiSelectComponent, disabledCampaignFilter: disabledCampaignFilter }), loadingFlags.pages ||
                         loadingFlags.campaigns ||
                         loadingFlags.places ? ((0, jsx_runtime_1.jsx)("div", { style: { width: '100%' }, children: (0, jsx_runtime_1.jsx)(CircularProgress_1.CircularProgress, {}) })) : ((0, jsx_runtime_1.jsx)(component_1.default, { headCells: headCells, onDragOver: onDragOver, onDragStart: onDragStart, onDrop: onDrop, scheduleGroups: scheduleGroups, page: page, handleChangePage: handleChangePage, handleChangeRowsPerPage: handleChangeRowsPerPage, options: options, filters: filters, serviceCampaignSchedule: serviceCampaignSchedule }))] })] }));
 };

package/lib/ACM-AXN/CampaignSchedule/interface.d.ts CHANGED Viewed

@@ -4,8 +4,17 @@ export interface ICampaignScheduleContainerProps {
     initialFilters: any;
     initialHeadCells: IHeadCells[];
     placeMultiSelectComponent: (p?: any) => JSX.Element;
-    serviceCampaignSchedule: any;
+    serviceCampaignSchedule: {
+        pagingGroupBy: any;
+        paging: any;
+        exportExcel: any;
+        placesPermission?: any;
+        campaignPlan?: any;
+        domains?: any;
+    };
     typeSystemAXN?: boolean;
+    title: string;
+    disabledCampaignFilter?: boolean;
 }
 export interface ILoadingFlags {
     campaigns?: boolean;
@@ -85,6 +94,7 @@ export interface IFilters {
     startDate: moment.Moment;
     endDate: moment.Moment;
     campaignId: string;
+    domainId?: string;
     placeIds: [];
     groupBy?: string;
 }
@@ -93,7 +103,7 @@ export interface ICampaignSchedulesComponentProps {
     onDragOver: (e: any) => void;
     onDragStart: (e: any) => void;
     onDrop: (e: any, i: any) => void;
-    scheduleGroups: IPagedList_1OfCampaignScheduleGroup;
+    scheduleGroups: any;
     page: {
         pageSize: number;
         pageIndex: number;
@@ -173,6 +183,7 @@ export interface IControlPanelProps {
     panels: IHeadCells[];
     loadingFlags: ILoadingFlags;
     placeMultiSelectComponent: (p?: any) => JSX.Element;
+    disabledCampaignFilter?: boolean;
 }
 export interface IGroupPanelProps {
     unGroupField: any;
@@ -187,6 +198,7 @@ export interface IFiltersProps {
     loadingFlags: ILoadingFlags;
     placeMultiSelectComponent: (p?: any) => JSX.Element;
     handleExportExcel: () => void;
+    disabledCampaignFilter?: boolean;
 }
 export interface IOptions {
     campaigns: any;

package/lib/AWING/DataForm/DataInput.js CHANGED Viewed

@@ -43,14 +43,14 @@ var GeoFencing_1 = __importDefault(require("../../ACM-AXN/GeoFencing"));
 var i18n_1 = __importDefault(require("../../i18n"));
 var omit = require('lodash/omit');
 function DataInput(props) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18n_1.default }).t;
     var fieldDefinition = props.fieldDefinition, onChange = props.onChange, value = props.value, error = props.error, disableHelperText = props.disableHelperText;
     var fieldName = fieldDefinition.fieldName, type = fieldDefinition.type, onValidate = fieldDefinition.onValidate, min = fieldDefinition.min, max = fieldDefinition.max, other = __rest(fieldDefinition, ["fieldName", "type", "onValidate", "min", "max"]);
-    var _j = react_2.default.useState(t('Common.InvalidData')), errorText = _j[0], setErrorText = _j[1];
+    var _k = react_2.default.useState(t('Common.InvalidData')), errorText = _k[0], setErrorText = _k[1];
     var checkValidationValue = function (fieldDefinition, val) {
         if (!fieldDefinition.required &&
-            (val === undefined || val === null || val === '' || val === []))
+            (val === undefined || val === null || val === '' || (Array.isArray(val) && val.length === 0)))
             return true;
         if (fieldDefinition.onValidate)
             return fieldDefinition.onValidate(val, fieldDefinition === null || fieldDefinition === void 0 ? void 0 : fieldDefinition.length, fieldDefinition === null || fieldDefinition === void 0 ? void 0 : fieldDefinition.pattern);
@@ -63,6 +63,8 @@ function DataInput(props) {
                 else
                     return (0, validation_1.notNullValid)(val);
             }
+            case 'multiple-hierarchical':
+                return (0, validation_1.arrayIsNotEmptyValid)(val);
             case 'month':
             case 'date':
                 return (0, validation_1.dateValid)(val);
@@ -108,10 +110,10 @@ function DataInput(props) {
         case 'autocomplete': {
             return ((0, jsx_runtime_1.jsx)(material_1.Autocomplete, { multiple: fieldDefinition.multiple, options: fieldDefinition.options, getOptionLabel: function (option) { var _a, _b; return (_b = (_a = option.label) !== null && _a !== void 0 ? _a : option.text) !== null && _b !== void 0 ? _b : ''; }, isOptionEqualToValue: function (option, value) {
                     return (option === null || option === void 0 ? void 0 : option.value) === (value === null || value === void 0 ? void 0 : value.value);
-                }, onChange: function (e, value) {
+                }, disableclearable: fieldDefinition.disableClearable, onChange: function (e, value) {
                     var newValue = fieldDefinition.multiple
-                        ? value.map(function (x) { return x.value; })
-                        : value.value;
+                        ? value.map(function (x) { return x === null || x === void 0 ? void 0 : x.value; })
+                        : value === null || value === void 0 ? void 0 : value.value;
                     onChange(newValue, checkValidationValue(fieldDefinition, newValue));
                 }, value: fieldDefinition.multiple
                     ? fieldDefinition.options.filter(function (x) {
@@ -155,7 +157,7 @@ function DataInput(props) {
                 }, readOnly: fieldDefinition.readOnly }));
         }
         case 'date-range': {
-            var _k = other, isDayBlocked = _k.isDayBlocked, isOutsideRange = _k.isOutsideRange;
+            var _l = other, isDayBlocked = _l.isDayBlocked, isOutsideRange = _l.isOutsideRange;
             return ((0, jsx_runtime_1.jsx)(AWING_1.DateRangePicker, { noBorder: true, variant: "standard", textFieldProps: __assign({ fullWidth: true, style: { margin: '8px 0px' } }, omit(other, ['isDayBlocked', 'isOutsideRange'])), value: {
                     startDate: (value === null || value === void 0 ? void 0 : value[0]) || null,
                     endDate: (value === null || value === void 0 ? void 0 : value[1]) || null,
@@ -208,6 +210,13 @@ function DataInput(props) {
                         }), { children: (_a = item.label) !== null && _a !== void 0 ? _a : item.text }), "".concat(fieldName.toString(), "-opt-").concat(index)));
                     })] })));
         }
+        case 'multiple-hierarchical': {
+            return ((0, jsx_runtime_1.jsx)(AWING_1.MultipleHierarchicalChoice, __assign({}, fieldDefinition, { variant: "standard", value: value, onChange: function (value) {
+                    onChange(value, checkValidationValue(fieldDefinition, value));
+                }, error: error, helperText: !disableHelperText && error
+                    ? (_h = fieldDefinition.helperText) !== null && _h !== void 0 ? _h : t('Common.InvalidData')
+                    : '' })));
+        }
         case 'geo-fencing': {
             var configs = fieldDefinition.configs, label = fieldDefinition.label, initValue = fieldDefinition.initValue, value_1 = fieldDefinition.value, limit = fieldDefinition.limit, isOnlyMap = fieldDefinition.isOnlyMap;
             return ((0, jsx_runtime_1.jsx)("div", { style: { marginTop: '16px' }, children: (0, jsx_runtime_1.jsx)(GeoFencing_1.default, { configs: configs, label: label, initValue: initValue, value: value_1, limit: limit, isOnlyMap: isOnlyMap, onChange: function (newValue) {
@@ -218,7 +227,7 @@ function DataInput(props) {
             return ((0, jsx_runtime_1.jsx)(material_1.TextField, __assign({ id: fieldName.toString(), name: fieldName.toString(), type: fieldDefinition.type, fullWidth: true, variant: "standard" }, other, { value: value !== null && value !== void 0 ? value : '', onChange: function (event) {
                     return onChange(event.target.value, checkValidationValue(fieldDefinition, event.target.value));
                 }, error: error, helperText: !disableHelperText && error
-                    ? (_h = fieldDefinition.helperText) !== null && _h !== void 0 ? _h : t('Common.InvalidData')
+                    ? (_j = fieldDefinition.helperText) !== null && _j !== void 0 ? _j : t('Common.InvalidData')
                     : '' })));
         }
     }

package/lib/AWING/DataForm/interface.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 import { BaseTextFieldProps } from '@mui/material/TextField';
-import { DataObject, MenuOption } from '../../AWING';
+import { DataObject, IMultipleHierarchicalChoiceProps, MenuOption } from '../../AWING';
 import { IMainObj, IListFunctions } from '../../AWING/LogicExpression/interface';
 import { GeoFencingValue, IConfig } from '../../ACM-AXN/GeoFencing/interface';
 import { Moment } from 'moment';
@@ -44,6 +44,7 @@ export type AutocompleteFieldDefinition<T extends DataObject> = BaseFieldDefinit
     type: 'autocomplete';
     options: Array<MenuOption>;
     loading?: boolean;
+    disableClearable?: boolean;
 };
 export interface CheckBoxFieldDefinition<T extends DataObject> extends BaseFieldDefinition<T> {
     type: 'checkbox';
@@ -122,5 +123,8 @@ export type SelectFieldDefinition<T extends DataObject> = BaseFieldDefinition<T>
     row?: Partial<T>;
     onDisabledSelectItem?: (value: any, row?: Partial<T>) => boolean;
 };
-export type FieldDefinition<T extends DataObject> = AsyncAutocompleteFieldDefinition<T> | AutocompleteFieldDefinition<T> | LogicExpressionDefinition<T> | CheckBoxFieldDefinition<T> | DateTimeFieldDefinition<T> | DateRangeFieldDefinition<T> | NumberFieldDefinition<T> | RadioFieldDefinition<T> | SelectFieldDefinition<T> | TextFieldDefinition<T> | GeoFencingDefinition<T>;
+export type MultipleHierarchicalDefinition<T extends DataObject> = BaseFieldDefinition<T> & Omit<IMultipleHierarchicalChoiceProps, 'defaultValue' | 'onChange'> & {
+    type: 'multiple-hierarchical';
+};
+export type FieldDefinition<T extends DataObject> = AsyncAutocompleteFieldDefinition<T> | AutocompleteFieldDefinition<T> | LogicExpressionDefinition<T> | CheckBoxFieldDefinition<T> | DateTimeFieldDefinition<T> | DateRangeFieldDefinition<T> | NumberFieldDefinition<T> | RadioFieldDefinition<T> | SelectFieldDefinition<T> | TextFieldDefinition<T> | GeoFencingDefinition<T> | MultipleHierarchicalDefinition<T>;
 export {};

package/package.json CHANGED Viewed

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