awing-library 2.1.172-dev → 2.1.174-dev

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Analytic/container.js

@@ -15,6 +15,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
+/* eslint-disable eqeqeq */
 var react_1 = require("react");
 var common_1 = require("../common");
 var Utils_1 = require("./Utils");
@@ -30,7 +31,6 @@ var AnalyticContainer = function (props) {
     var client = (0, Context_1.default)().services;
     var _a = (0, react_1.useState)(true), isLoading = _a[0], setIsLoading = _a[1];
     var _b = (0, react_1.useState)([]), statisticalChartData = _b[0], setStatisticalChartData = _b[1];
-    var _c = (0, react_1.useState)([]), statisticalData = _c[0], setStatisticalData = _c[1];
     var placesOfCampaign = (0, react_1.useMemo)(function () {
         var result = [];
         subCampaigns.forEach(function (sub) {
@@ -76,11 +76,17 @@ var AnalyticContainer = function (props) {
             endDate: (0, moment_1.default)(time.endDate).format(Enum_1.DATE_FORMAT),
             timelineType: timelineType,
             campaignAdGroups: ids.length ? ids.map(function (id) { return (__assign(__assign({}, id), { campaignId: campaignId })); }) : [{ campaignId: campaignId }],
-            analyticGroupBies: Object.values(Enum_2.AnalyticGroupBy).filter(function (g) { return !isNaN(Number(g)); }).map(function (g) { return Number(g); }),
+            // analyticGroupBies: Object.values(AnalyticGroupBy).filter((g) => !isNaN(Number(g))).map((g) => Number(g)),
+            analyticGroupBies: [
+                Enum_2.AnalyticGroupBy.GbEventLabel,
+                Enum_2.AnalyticGroupBy.GbTimeline,
+                Enum_2.AnalyticGroupBy.GbCampaignGroupId,
+                Enum_2.AnalyticGroupBy.GbCampaignAdId
+            ],
             placeIds: placeIds,
             includedEventLabels: Object.values(Enum_1.BaseEvent)
         }).then(function (res) {
-            setStatisticalData((0, Utils_1.markBillingType)(subCampaigns, res));
+            // setStatisticalData(markBillingType(subCampaigns, res))
             setStatisticalChartData(statisticType ? (0, Utils_1.convertToShowDetail)(subCampaigns, res, selectedDomains, selectedPlaces) : res);
         }).finally(function () { return setIsLoading(false); });
     };
@@ -88,49 +94,58 @@ var AnalyticContainer = function (props) {
         var selectedPlaces = placeIds.length > 0
             ? placesOfCampaign.filter(function (p) { return placeIds.includes(p.placeId); })
             : placesOfCampaign;
-        // downloadWithDataSet
         var selectedDomains = (0, Utils_1.placesToDomains)(selectedPlaces, domains);
-        var exportObj = {
-            name: "export_statistic_campaign_".concat(campaignId),
-            data: []
-        };
-        switch (exportType) {
-            case common_1.EXPORT_TYPES.Domain: {
-                var newObjects = (0, lodash_1.chain)(selectedDomains)
-                    .groupBy('domainId')
-                    .map(function (value) {
-                    var currentPlaces = value
-                        .map(function (x) { return x.places; })
-                        .reduce(function (a, b) { return a.concat(b); }, []);
-                    return {
-                        objectId: value[0].domainId,
-                        objectName: value[0].domainName,
-                        places: currentPlaces,
-                    };
-                })
-                    .value();
-                exportObj.data = (0, Utils_1.convertToExportDataGroupBy)(statisticalData, newObjects, timelineType, 'Domain');
-                exportObj.name += '_groupby_domain';
-                break;
-            }
-            case common_1.EXPORT_TYPES.Export: {
-                exportObj.data = (0, Utils_1.convertToExport)(subCampaigns, statisticalData, timelineType, selectedPlaces);
-                exportObj.name += '_total';
-                break;
-            }
-            case common_1.EXPORT_TYPES.LocationGroup: {
-                exportObj.data = (0, Utils_1.convertToExportDataGroupBy)(statisticalData, (0, Utils_1.dataGroupByPlace)(subCampaigns, ids), timelineType, 'Sub Campaign');
-                exportObj.name += '_groupby_subcampaign';
-                break;
-            }
-            default: {
-                exportObj.data = (0, Utils_1.convertToExportData)(statisticalData, selectedPlaces, timelineType);
-                exportObj.name += '_groupby_place';
-                break;
+        return client.campaignStatisticGet({
+            startDate: (0, moment_1.default)(time.startDate).format(Enum_1.DATE_FORMAT),
+            endDate: (0, moment_1.default)(time.endDate).format(Enum_1.DATE_FORMAT),
+            timelineType: timelineType,
+            campaignAdGroups: ids.length ? ids.map(function (id) { return (__assign(__assign({}, id), { campaignId: campaignId })); }) : [{ campaignId: campaignId }],
+            analyticGroupBies: Object.values(Enum_2.AnalyticGroupBy).filter(function (g) { return !isNaN(Number(g)); }).map(function (g) { return Number(g); }),
+            placeIds: placeIds,
+            includedEventLabels: Object.values(Enum_1.BaseEvent)
+        }).then(function (res) {
+            var markedData = (0, Utils_1.markBillingType)(subCampaigns, res);
+            var exportObj = {
+                name: "export_statistic_campaign_".concat(campaignId),
+                data: []
+            };
+            switch (exportType) {
+                case common_1.EXPORT_TYPES.Domain: {
+                    var newObjects = (0, lodash_1.chain)(selectedDomains)
+                        .groupBy('domainId')
+                        .map(function (value) {
+                        var currentPlaces = value
+                            .map(function (x) { return x.places; })
+                            .reduce(function (a, b) { return a.concat(b); }, []);
+                        return {
+                            objectId: value[0].domainId,
+                            objectName: value[0].domainName,
+                            places: currentPlaces,
+                        };
+                    })
+                        .value();
+                    exportObj.data = (0, Utils_1.convertToExportDataGroupBy)(markedData, newObjects, timelineType, 'Domain');
+                    exportObj.name += '_groupby_domain';
+                    break;
+                }
+                case common_1.EXPORT_TYPES.Export: {
+                    exportObj.data = (0, Utils_1.convertToExport)(subCampaigns, markedData, timelineType, selectedPlaces);
+                    exportObj.name += '_total';
+                    break;
+                }
+                case common_1.EXPORT_TYPES.LocationGroup: {
+                    exportObj.data = (0, Utils_1.convertToExportDataGroupBy)(markedData, (0, Utils_1.dataGroupByPlace)(subCampaigns, ids), timelineType, 'Sub Campaign');
+                    exportObj.name += '_groupby_subcampaign';
+                    break;
+                }
+                default: {
+                    exportObj.data = (0, Utils_1.convertToExportData)(markedData, selectedPlaces, timelineType);
+                    exportObj.name += '_groupby_place';
+                    break;
+                }
             }
-        }
-        (0, exportFile_1.downloadWithDataSet)(String(exportObj.name).toUpperCase(), exportObj.data);
-        return;
+            (0, exportFile_1.downloadWithDataSet)(String(exportObj.name).toUpperCase(), exportObj.data);
+        });
     };
     return ((0, jsx_runtime_1.jsx)(component_1.default, { domains: domains, startDate: startDate, endDate: endDate, subCampaigns: subCampaigns, isLoading: isLoading, statisticalData: statisticalChartData, getStatisticalData: getStatisticalData, exportData: exportData }));
 };

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/ChartFilter.js

@@ -234,9 +234,10 @@ var ChartFilterBox = function (props) {
             MONTH: t('Common.Month'),
         },
     };
-    var handleExport = react_1.default.useCallback(function () {
+    var handleExport = react_1.default.useCallback(function (type) {
+        if (type === void 0) { type = ''; }
         setLoading(true);
-        var result = onExportData();
+        var result = onExportData(typeof type === 'string' ? type : '');
         if (result instanceof Promise) {
             result
                 .then(function () {
@@ -269,6 +270,6 @@ var ChartFilterBox = function (props) {
                     } }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, children: (0, jsx_runtime_1.jsx)(PlaceMultiSelect, { disableCheckPermission: !client.domainsGetAll, onChange: placeMultiSelectSubmit, initialOption: {
                         placeGroups: placeGroups,
                         domains: domains.map(function (d) { return (__assign(__assign({}, d), { name: d.domainName })); }),
-                    }, isDisplayTextField: true, TextFieldProps: { sx: textFieldStyle }, onGetPlacesByFilter: handleGetPlacesByFilter }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 1, children: (0, jsx_runtime_1.jsx)(material_1.FormControl, { children: (0, jsx_runtime_1.jsx)(material_1.Button, { color: "primary", variant: "contained", fullWidth: true, onClick: function () { return onQueryData(); }, children: translationText.view }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 3, children: (0, jsx_runtime_1.jsx)(material_1.FormControl, { children: !isExportType ? ((0, jsx_runtime_1.jsx)(lab_1.LoadingButton, { variant: "outlined", onClick: handleExport, loading: loading, children: (0, jsx_runtime_1.jsx)(GetApp_1.default, {}) })) : ((0, jsx_runtime_1.jsx)(SplitButtonExportType_1.default, { onSubmit: function (exportType) { return onExportData(exportType); } })) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 1 })] }));
+                    }, isDisplayTextField: true, TextFieldProps: { sx: textFieldStyle }, onGetPlacesByFilter: handleGetPlacesByFilter }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 1, children: (0, jsx_runtime_1.jsx)(material_1.FormControl, { children: (0, jsx_runtime_1.jsx)(material_1.Button, { color: "primary", variant: "contained", fullWidth: true, onClick: function () { return onQueryData(); }, children: translationText.view }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 3, children: (0, jsx_runtime_1.jsx)(material_1.FormControl, { children: !isExportType ? ((0, jsx_runtime_1.jsx)(lab_1.LoadingButton, { variant: "outlined", onClick: handleExport, loading: loading, children: (0, jsx_runtime_1.jsx)(GetApp_1.default, {}) })) : ((0, jsx_runtime_1.jsx)(SplitButtonExportType_1.default, { loading: loading, onSubmit: onExportData })) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 1 })] }));
 };
 exports.default = ChartFilterBox;

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/SplitButtonExportType.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 interface Props {
     onSubmit: (value: string) => void;
+    loading?: boolean;
 }
 declare const SplitButtonExportType: React.FC<Props>;
 export default SplitButtonExportType;

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/SplitButtonExportType.js

@@ -21,12 +21,23 @@ var ArrowDropDown_1 = __importDefault(require("@mui/icons-material/ArrowDropDown
 var common_1 = require("./common");
 var react_i18next_1 = require("react-i18next");
 var i18n_1 = __importDefault(require("../../../../i18n"));
-var options = Object.values(common_1.EXPORT_TYPES).map(function (type, idx) { return type; });
+var lab_1 = require("@mui/lab");
+var Context_1 = __importDefault(require("./Context"));
 var SplitButtonExportType = function (props) {
-    var onSubmit = props.onSubmit;
+    var onSubmit = props.onSubmit, loading = props.loading;
+    var services = (0, Context_1.default)().services;
     var _a = react_1.default.useState(false), open = _a[0], setOpen = _a[1];
     var anchorRef = react_1.default.useRef(null);
     var _b = react_1.default.useState(0), selectedIndex = _b[0], setSelectedIndex = _b[1];
+    var options = react_1.default.useMemo(function () {
+        return Object.values(common_1.EXPORT_TYPES)
+            .map(function (type, idx) { return type; })
+            .filter(function (type) {
+            return services.domainsGetAll ? true : type !== 'Domain';
+        });
+    }, 
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []);
     var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18n_1.default }).t;
     var handleClick = function () {
         onSubmit(options[selectedIndex]);
@@ -51,7 +62,7 @@ var SplitButtonExportType = function (props) {
         Location: t('Campaign.ExportType.Location'),
         LocationGroup: t('Campaign.ExportType.LocationGroup'),
     };
-    return ((0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, direction: "column", alignItems: "center", children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { item: true, xs: 12, children: [(0, jsx_runtime_1.jsxs)(material_1.ButtonGroup, { variant: "outlined", color: "inherit", ref: anchorRef, "aria-label": "split button", children: [(0, jsx_runtime_1.jsx)(material_1.Button, { onClick: handleClick, children: translationText[options[selectedIndex]] }), (0, jsx_runtime_1.jsx)(material_1.Button, { size: "small", "aria-controls": open ? 'split-button-menu' : undefined, "aria-expanded": open ? 'true' : undefined, "aria-label": "select merge strategy", "aria-haspopup": "menu", onClick: handleToggle, children: (0, jsx_runtime_1.jsx)(ArrowDropDown_1.default, {}) })] }), (0, jsx_runtime_1.jsx)(material_1.Popper, { style: { zIndex: 99999 }, open: open, anchorEl: anchorRef.current, transition: true, children: function (_a) {
+    return ((0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, direction: "column", alignItems: "center", children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { item: true, xs: 12, children: [(0, jsx_runtime_1.jsxs)(material_1.ButtonGroup, { disabled: loading, variant: "outlined", color: "inherit", ref: anchorRef, "aria-label": "split button", children: [(0, jsx_runtime_1.jsx)(lab_1.LoadingButton, { variant: 'outlined', onClick: handleClick, loading: loading, children: translationText[options[selectedIndex]] }), (0, jsx_runtime_1.jsx)(material_1.Button, { size: "small", "aria-controls": open ? 'split-button-menu' : undefined, "aria-expanded": open ? 'true' : undefined, "aria-label": "select merge strategy", "aria-haspopup": "menu", onClick: handleToggle, children: (0, jsx_runtime_1.jsx)(ArrowDropDown_1.default, {}) })] }), (0, jsx_runtime_1.jsx)(material_1.Popper, { style: { zIndex: 99999 }, open: open, anchorEl: anchorRef.current, transition: true, children: function (_a) {
                         var TransitionProps = _a.TransitionProps, placement = _a.placement;
                         return ((0, jsx_runtime_1.jsx)(material_1.Grow, __assign({}, TransitionProps, { style: {
                                 transformOrigin: placement === 'bottom'

package/lib/AWING/GroupTable/GroupTable.js

@@ -36,7 +36,7 @@ var constants_1 = require("../../constants");
 var lodash_1 = require("lodash");
 function GroupTable(props) {
     var headCells = props.headCells, filters = props.filters, onGetData = props.onGetData, customRow = props.customRow, onRowClicked = props.onRowClicked;
-    var row = customRow || CustomRow_1.default;
+    var row = (0, react_1.useMemo)(function () { return customRow || CustomRow_1.default; }, [customRow]);
     var _a = (0, react_1.useState)([]), data = _a[0], setData = _a[1];
     var _b = (0, react_1.useState)(0), groupPageIndex = _b[0], setGroupPageIndex = _b[1];
     var _c = (0, react_1.useState)(constants_1.PAGE_SIZE_DEFAULT), groupPageSize = _c[0], setGroupPageSize = _c[1];
@@ -72,7 +72,7 @@ function GroupTable(props) {
                             field: groupKeys[filters.length],
                             value: dt[groupKeys[filters.length]],
                         },
-                    ], false), displayData: __assign(__assign({}, dt), { groupIndex: groupPageIndex * groupPageSize + index }), onGetData: onGetData, onRowClicked: onRowClicked }, index)); }) })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: data.map(function (dt, index) {
+                    ], false), displayData: __assign(__assign({}, dt), { groupIndex: groupPageIndex * groupPageSize + index }), onGetData: onGetData, onRowClicked: onRowClicked, customRow: row }, index)); }) })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: data.map(function (dt, index) {
                     var CustomRow = row;
                     return ((0, jsx_runtime_1.jsx)(CustomRow, __assign({}, row.props, { info: __assign(__assign({}, dt), { rowIndex: groupPageIndex * groupPageSize + index }), headCells: headCells, onRowClicked: onRowClicked }), index));
                 }) })), data.length === 0 ? ((0, jsx_runtime_1.jsx)(material_1.TableRow, { children: (0, jsx_runtime_1.jsx)(material_1.TableCell, { colSpan: headCells.length + 1, padding: "none", style: { borderBottom: "1px solid #a3a3a345" }, children: (0, jsx_runtime_1.jsx)(NoData_1.default, {}) }) })) : ((0, jsx_runtime_1.jsx)(material_1.TableRow, { children: (0, jsx_runtime_1.jsx)(material_1.TableCell, { colSpan: headCells.length + 1, padding: "none", style: {

package/lib/AWING/GroupTable/component.d.ts

@@ -8,6 +8,7 @@ interface GroupComponentProps {
         totalCount: number;
     }>;
     onRowClicked?: (rowInfo: any) => void;
+    customRow?: any;
 }
 export default function GroupComponent(props: GroupComponentProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/lib/AWING/GroupTable/component.js

@@ -9,7 +9,7 @@ var material_1 = require("@mui/material");
 var icons_material_1 = require("@mui/icons-material");
 var GroupTable_1 = __importDefault(require("./GroupTable"));
 function GroupComponent(props) {
-    var headCells = props.headCells, filters = props.filters, displayData = props.displayData, onGetData = props.onGetData, onRowClicked = props.onRowClicked;
+    var headCells = props.headCells, filters = props.filters, displayData = props.displayData, onGetData = props.onGetData, onRowClicked = props.onRowClicked, customRow = props.customRow;
     var _a = (0, react_1.useState)(false), open = _a[0], setOpen = _a[1];
     var handleOpen = function () {
         setOpen(!open);
@@ -47,6 +47,6 @@ function GroupComponent(props) {
                                     } }, ind));
                             }
                         }
-                    })] }, "group-header-filters.length-".concat(filters.length)), open && ((0, jsx_runtime_1.jsx)(GroupTable_1.default, { headCells: headCells, filters: filters, onGetData: onGetData, onRowClicked: onRowClicked }))] }));
+                    })] }, "group-header-filters.length-".concat(filters.length)), open && ((0, jsx_runtime_1.jsx)(GroupTable_1.default, { headCells: headCells, filters: filters, onGetData: onGetData, onRowClicked: onRowClicked, customRow: customRow }))] }));
 }
 exports.default = GroupComponent;

package/package.json

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