awing-library 2.1.142-beta → 2.1.144-beta

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

@@ -8,6 +8,10 @@ interface Props {
     subCampaigns: CampaignGroupModel[];
     ids: any;
     onCampaignAdGroupIdChange: (newValue: string[]) => void;
+    time: {
+        startDate: Date;
+        endDate: Date;
+    };
 }
 declare const ChartWithType: (props: Props) => import("react/jsx-runtime").JSX.Element;
 export default ChartWithType;

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

@@ -4,6 +4,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_i18next_1 = require("react-i18next");
 var material_1 = require("@mui/material");
 var i18n_1 = __importDefault(require("../../../../../i18n"));
@@ -77,26 +78,6 @@ var ChartWithType = function (props) {
         // console.log("valuddde", value, result)
         onCampaignAdGroupIdChange(result);
     };
-    // const getValue = useMemo(() => {
-    //     let result: any[] = []
-    //     if (ids.campaignGroupId) {
-    //         let tmpSelected: any[] = []
-    //         const group = groupOptions.find(
-    //             (g) => g.code === ids.campaignGroupId?.toString()
-    //         )
-    //         tmpSelected = [group]
-    //         if (ids.campaignAdId) {
-    //             const ad = groupOptions.find(
-    //                 (g) =>
-    //                     g.code === `${ids.campaignGroupId}&${ids.campaignAdId}`
-    //             )
-    //             tmpSelected = [group, ad];
-    //         }
-    //         result.push(tmpSelected)
-    //     }
-    //     console.log("result", result)
-    //     return result
-    // }, [groupOptions, ids.campaignAdId, ids.campaignGroupId])
     var getValue = function () {
         var final = [];
         ids.forEach(function (id) {
@@ -115,7 +96,7 @@ var ChartWithType = function (props) {
         });
         return final;
     };
-    return ((0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, spacing: 1, sx: styles.root, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 3 }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, children: (0, jsx_runtime_1.jsx)(material_1.FormControl, { fullWidth: true, variant: "outlined", children: (0, jsx_runtime_1.jsx)(MultipleHierarchicalChoice_1.MultipleHierarchicalChoice, { onChange: handleGroupChange, options: groupOptions, placeholder: t('Campaign.SelectGroup'), label: translationText.timeline, value: getValue() }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 2, children: (0, jsx_runtime_1.jsx)(material_1.FormControl, { fullWidth: true, variant: "outlined", children: (0, jsx_runtime_1.jsx)(material_1.TextField, { select: true, fullWidth: true, label: translationText.timeline, id: "timelineType", name: "timelineType", value: timelineType, onChange: function (e) { return setTimelineType(e.target.value); }, size: "small", variant: "outlined", children: ChartByType.map(function (type, idx) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: idx, children: type }, idx)); }) }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 2, children: (0, jsx_runtime_1.jsx)(material_1.FormControl, { fullWidth: true, variant: "outlined", children: (0, jsx_runtime_1.jsx)(material_1.TextField, { select: true, fullWidth: true, label: t('Campaign.StatisticType'), id: "statisticType", name: "statisticType", value: statisticType, onChange: function (e) { return setStatisticType(e.target.value); }, size: "small", variant: "outlined", children: SType.map(function (type, idx) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: idx, children: type }, idx)); }) }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 1 }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, sx: styles.chart, children: statisticType === 0 ? ((0, jsx_runtime_1.jsx)(material_1.Box, { component: 'div', sx: styles.chartWrapper, children: (0, jsx_runtime_1.jsx)(AWING_1.BarLineComponent, { chart: chart, dataChart: (0, Utils_1.convertToChartData)(statisticalData, subCampaigns), type: 'line', data: [], timeline: timelineType, optionCustom: {
+    return ((0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, spacing: 1, sx: styles.root, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 3 }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, children: (0, jsx_runtime_1.jsx)(material_1.FormControl, { fullWidth: true, variant: "outlined", children: (0, jsx_runtime_1.jsx)(MultipleHierarchicalChoice_1.MultipleHierarchicalChoice, { onChange: handleGroupChange, options: groupOptions, placeholder: t('Campaign.SelectGroup'), label: translationText.timeline, value: getValue() }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 2, children: (0, jsx_runtime_1.jsx)(material_1.FormControl, { fullWidth: true, variant: "outlined", children: (0, jsx_runtime_1.jsx)(material_1.TextField, { select: true, fullWidth: true, label: translationText.timeline, id: "timelineType", name: "timelineType", value: timelineType, onChange: function (e) { return setTimelineType(e.target.value); }, size: "small", variant: "outlined", children: ChartByType.map(function (type, idx) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: idx, children: type }, idx)); }) }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 2, children: (0, jsx_runtime_1.jsx)(material_1.FormControl, { fullWidth: true, variant: "outlined", children: (0, jsx_runtime_1.jsx)(material_1.TextField, { select: true, fullWidth: true, label: t('Campaign.StatisticType'), id: "statisticType", name: "statisticType", value: statisticType, onChange: function (e) { return setStatisticType(e.target.value); }, size: "small", variant: "outlined", children: SType.map(function (type, idx) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: idx, children: type }, idx)); }) }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 1 }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, sx: styles.chart, children: statisticType === 0 ? ((0, jsx_runtime_1.jsx)(material_1.Box, { component: 'div', sx: styles.chartWrapper, children: (0, jsx_runtime_1.jsx)(AWING_1.BarLineComponent, { chart: chart, dataChart: (0, Utils_1.convertToChartData)(statisticalData, subCampaigns, props.time), type: 'line', data: [], timeline: timelineType, optionCustom: {
                             scales: {
                                 y: {
                                     title: {

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

@@ -1,5 +1,5 @@
 import { CampaignGroupModel } from '../../../../../ACM-AXN/Campaign/Types';
-import { IAnalyticCampaignSummary, IAnalyticEventSummary } from '../Types';
+import { IAnalyticCampaignSummary } from '../Types';
 import { AnalyticType } from '../../../../../ACM-AXN/Common/Enum';
 export declare function convertToExportDataGroupBy(data: any, objects: any, timelineType: any, groupBy: any): {
     columns: any[];
@@ -18,14 +18,17 @@ export declare const markBillingType: (subCampaigns: CampaignGroupModel[], data:
     placeId?: string | undefined;
     domainId?: string | undefined;
     timeline?: number | undefined;
-    analyticEventSummaries: IAnalyticEventSummary[];
+    analyticEventSummaries: import("../Types").IAnalyticEventSummary[];
     campaignGroupId?: number | undefined;
     campaignAdId?: number | undefined;
 }[];
 export declare function convertToShowDetail(subCampaigns: CampaignGroupModel[], data: IAnalyticCampaignSummary[], selectedDomains: any[], selectedPlaces: any[]): any[];
 export declare function dataGroupByTimeline(place: any, data: any, timelineType: any): any[][];
 export declare function dataGroupByPlace(subCampaigns: CampaignGroupModel[], ids: any): any[];
-export declare const convertToChartData: (data: IAnalyticCampaignSummary[], campaignGroups: CampaignGroupModel[]) => ({
+export declare const convertToChartData: (data: IAnalyticCampaignSummary[], campaignGroups: CampaignGroupModel[], time: {
+    startDate: Date;
+    endDate: Date;
+}) => ({
     label: string;
     type: string;
     data: {

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

@@ -303,18 +303,14 @@ function dataGroupByPlace(subCampaigns, ids) {
         .value();
 }
 exports.dataGroupByPlace = dataGroupByPlace;
-var convertToChartData = function (data, campaignGroups) {
+var convertToChartData = function (data, campaignGroups, time) {
     var _a;
-    var convertData = Object.assign.apply(Object, __spreadArray([{}], [Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW], Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK], 'Spot', 'Engagement'].map(function (x) {
+    var convertData = Object.assign.apply(Object, __spreadArray([{}], [Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW], 'Spot', 'Engagement'].map(function (x) {
         var _a;
         return (_a = {}, _a[x] = { total: 0, chartData: [] }, _a);
     }), false));
-    var startDate = Number.MAX_SAFE_INTEGER;
-    var endDate = 0;
     data.forEach(function (x) {
         var _a;
-        startDate = Math.min(startDate, Number(x.timeline));
-        endDate = Math.max(endDate, Number(x.timeline));
         var subCampaign = campaignGroups.find(function (c) { return c.campaignGroup.id === x.campaignGroupId; });
         if (!subCampaign)
             return;
@@ -325,7 +321,14 @@ var convertToChartData = function (data, campaignGroups) {
         x.analyticEventSummaries.forEach(function (event) {
             var _a;
             if ([Enum_1.BaseEvent[billingUnit], Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW]].includes(event.eventLabel)) {
-                var objKey = event.eventLabel === Enum_1.BaseEvent[Enum_2.AnalyticType.AUTHENTICATION] ? isSpot ? 'Spot' : 'Engagement' : event.eventLabel;
+                var objKey = [
+                    Enum_1.BaseEvent[Enum_2.AnalyticType.AUTHENTICATION],
+                    Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK],
+                ].includes(event.eventLabel)
+                    ? isSpot
+                        ? 'Spot'
+                        : 'Engagement'
+                    : event.eventLabel;
                 (_a = convertData[objKey]) === null || _a === void 0 ? void 0 : _a.chartData.push({
                     y: event.total,
                     x: timeline,
@@ -338,7 +341,6 @@ var convertToChartData = function (data, campaignGroups) {
     });
     var translate = (_a = {},
         _a[Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW]] = 'Common.Impression',
-        _a[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]] = 'Statistics.NumberOfConnections',
         _a['Spot'] = 'Campaign.Spot',
         _a['Engagement'] = 'Campaign.Engagement',
         _a);
@@ -352,7 +354,7 @@ var convertToChartData = function (data, campaignGroups) {
             return {
                 label: "".concat(i18n_1.default.t(translate[key]), " ").concat((0, Helpers_1.roundDecimalNumber)(value.total)),
                 type: 'line',
-                data: (0, Helpers_1.fillMissingDates)(data, startDate, endDate),
+                data: (0, Helpers_1.fillMissingDates)(data, time.startDate, time.endDate),
                 fill: false,
                 pointStyle: 'circle',
                 yAxisID: 'y',

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

@@ -72,6 +72,6 @@ var Analytic = function (props) {
     };
     return ((0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, spacing: 2, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: (0, jsx_runtime_1.jsx)(ChartFilter_1.default, { subCampaigns: subCampaigns, queryInput: queryInput, onChangeQueryInput: changeQueryInput, onQueryData: queryData, isExportType: true, onExportData: function (exportType) {
                         return exportData(queryInput.time, queryInput.placeIds, queryInput.timelineType, exportType, queryInput.ids);
-                    }, domains: domains }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, style: { marginTop: '20px' }, children: isLoading ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsx)(ChartWithType_1.default, { statisticalData: statisticalData, subCampaigns: subCampaigns, ids: queryInput.ids, onCampaignAdGroupIdChange: handleChangeAdGroupId, statisticType: queryInput.statisticType, setStatisticType: changeStatisticType, timelineType: queryInput.timelineType, setTimelineType: changeTimelineType })) })] }));
+                    }, domains: domains }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, style: { marginTop: '20px' }, children: isLoading ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsx)(ChartWithType_1.default, { statisticalData: statisticalData, subCampaigns: subCampaigns, ids: queryInput.ids, onCampaignAdGroupIdChange: handleChangeAdGroupId, statisticType: queryInput.statisticType, setStatisticType: changeStatisticType, timelineType: queryInput.timelineType, setTimelineType: changeTimelineType, time: queryInput.time })) })] }));
 };
 exports.default = Analytic;

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

@@ -79,7 +79,7 @@ var LimitEvent = function (props) {
                         return handleChangeParameter('eventLabel', e.target.value);
                     }, error: valids && !valids.eventLabel, helperText: valids && !valids.eventLabel
                         ? translationText.helperText
-                        : '', children: Object.keys(eventSelected).map(function (event, index) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: event, children: event }, index)); }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "viewNumber", name: "viewNumber", variant: "standard", disabled: !((_c = rule === null || rule === void 0 ? void 0 : rule.parameter) === null || _c === void 0 ? void 0 : _c.eventLabel), required: true, select: true, fullWidth: true, label: translationText.viewNumber, value: (_e = (_d = rule === null || rule === void 0 ? void 0 : rule.parameter) === null || _d === void 0 ? void 0 : _d.viewNumber) !== null && _e !== void 0 ? _e : '', onChange: function (e) {
+                        : '', children: Object.keys(eventSelected).map(function (event, index) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: event, children: event }, index)); }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "viewNumber", name: "viewNumber", variant: "standard", disabled: !((_c = rule === null || rule === void 0 ? void 0 : rule.parameter) === null || _c === void 0 ? void 0 : _c.eventLabel), required: true, select: true, fullWidth: true, label: translationText.viewNumber, value: (_e = (_d = rule === null || rule === void 0 ? void 0 : rule.parameter) === null || _d === void 0 ? void 0 : _d.viewNumber) !== null && _e !== void 0 ? _e : "", onChange: function (e) {
                         return handleChangeParameter('viewNumber', e.target.value);
                     }, error: valids && !valids.viewNumber, helperText: valids && !valids.viewNumber
                         ? translationText.helperText

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

@@ -50,6 +50,7 @@ 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 TabStatistic_1 = __importDefault(require("./TabStatistic"));
+var Enum_2 = require("../../../ACM-AXN/Common/Enum");
 var route = [
     Constant_1.Constants.CAMPAIGN_INFORMATION,
     Constant_1.Constants.CAMPAIGN_SUBCAMPAIGN,
@@ -69,7 +70,7 @@ var CreateOrEdit = function () {
     var setCampaignPages = (0, recoil_1.useSetRecoilState)(atoms_1.campaignPageIdState);
     var setDirectories = (0, recoil_1.useSetRecoilState)(Recoils_1.directoriesState);
     var setAttributes = (0, recoil_1.useSetRecoilState)(Recoils_1.attributesState);
-    var confirmExit = (0, recoil_1.useRecoilValue)(Recoils_1.confirmExitState);
+    var _e = (0, recoil_1.useRecoilState)(Recoils_1.confirmExitState), confirmExit = _e[0], setConfirmExit = _e[1];
     var readyForSubmit = (0, recoil_1.useRecoilValue)(Recoils_1.readyForSubmitState);
     var setCreate = (0, recoil_1.useSetRecoilState)(Recoils_1.isCreateState);
     var tabValid = {
@@ -77,8 +78,8 @@ var CreateOrEdit = function () {
         tabSubCampaignValid: (0, recoil_1.useRecoilValue)(Recoils_1.tabSubCampaignValidState),
         tabPartnerValid: (0, recoil_1.useRecoilValue)(Recoils_1.tabPartnerValidState),
     };
-    var _e = (0, react_1.useState)('0'), value = _e[0], setValue = _e[1];
-    var _f = (0, react_1.useState)(true), loading = _f[0], setLoading = _f[1];
+    var _f = (0, react_1.useState)('0'), value = _f[0], setValue = _f[1];
+    var _g = (0, react_1.useState)(true), loading = _g[0], setLoading = _g[1];
     var componentStatus = (0, react_1.useMemo)(function () {
         return location.pathname.includes(Constant_1.Constants.CAMPAIGN_DETAIL) &&
             !!campaignId
@@ -181,10 +182,13 @@ var CreateOrEdit = function () {
                     });
                 }
                 else {
+                    setConfirmExit(true);
                     campaignModel.campaign.name += ' - copy';
                     campaignModel.campaign.createdDate = undefined;
                     campaignModel.campaignGroups.forEach(function (g) {
                         g.campaignGroup.ticket = Enum_1.CampaignTicket.INACTIVE;
+                        if (!service.attributesGetByObjectTypeCode)
+                            g.campaignGroup.billingUnit = Enum_2.AnalyticType.AUTHENTICATION;
                     });
                 }
                 setCampaignData(campaignModel);
@@ -219,7 +223,7 @@ var CreateOrEdit = function () {
             return service.campaignsPost(dataSubmit);
         }
     };
-    return ((0, jsx_runtime_1.jsx)(ClassicDrawer_1.default, { title: "".concat(t(['Campaign', campaignId ? 'TitleDetail' : 'Create'].join('.'))).concat(campaignId ? ": ".concat((_a = campaignData === null || campaignData === void 0 ? void 0 : campaignData.campaign) === null || _a === void 0 ? void 0 : _a.name) : '', "\n               "), onSubmit: handleSubmit, disableButtonSubmit: !readyForSubmit, confirmExit: confirmExit, childrenWrapperStyle: { padding: 0 }, children: (0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, sx: {
+    return ((0, jsx_runtime_1.jsx)(ClassicDrawer_1.default, { title: "".concat(t(['Campaign', campaignId ? 'TitleDetail' : 'Create'].join('.'))).concat(campaignId ? ": ".concat((_a = campaignData === null || campaignData === void 0 ? void 0 : campaignData.campaign) === null || _a === void 0 ? void 0 : _a.name) : '', "\n               "), onSubmit: handleSubmit, disableButtonSubmit: !readyForSubmit || !confirmExit, confirmExit: confirmExit, childrenWrapperStyle: { padding: 0 }, children: (0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, sx: {
                 display: 'flex',
                 flexDirection: 'column',
                 flexGrow: 1,

package/lib/AWING/DataForm/DataInput.js

@@ -194,7 +194,7 @@ function DataInput(props) {
                 } })));
         }
         case 'select': {
-            return ((0, jsx_runtime_1.jsxs)(material_1.TextField, __assign({ id: fieldName.toString(), name: fieldName.toString(), fullWidth: true, select: true, variant: "standard", value: value !== null && value !== void 0 ? value : '', onChange: function (event) {
+            return ((0, jsx_runtime_1.jsxs)(material_1.TextField, __assign({ id: fieldName.toString(), name: fieldName.toString(), fullWidth: true, select: true, variant: "standard", value: value !== null && value !== void 0 ? value : "", onChange: function (event) {
                     var newValue = fieldDefinition.multiple
                         ? event.target.value.split(',')
                         : event.target.value;

package/package.json

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