awing-library 2.1.173-dev → 2.1.175-dev

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

@@ -381,9 +381,7 @@ exports.dataGroupByPlace = dataGroupByPlace;
 function campaignAnalyticInfo(subCampaigns) {
     return {
         analyticTypes: Array.from(new Set(subCampaigns.map(function (x) { return x.campaignGroup.billingUnit; }))),
-        hasSpot: subCampaigns.some(function (sub) {
-            return sub.ads.some(function (ad) { return ad.type === Enum_1.AdType.VIDEO; }) && sub.campaignGroup.billingUnit === Enum_2.AnalyticType.AUTHENTICATION;
-        }),
+        hasSpot: subCampaigns.some(function (sub) { return sub.ads.some(function (ad) { return ad.type === Enum_1.AdType.VIDEO; }); }),
         hasEg: subCampaigns.some(function (sub) { return sub.ads.some(function (ad) {
             return (ad.type === Enum_1.AdType.VIDEO && sub.campaignGroup.billingUnit !== Enum_2.AnalyticType.AUTHENTICATION) ||
                 ad.type !== Enum_1.AdType.VIDEO;
@@ -407,8 +405,7 @@ var convertToChartData = function (data, campaignGroups, time) {
         if (!subCampaign)
             return;
         var billingUnit = subCampaign.campaignGroup.billingUnit;
-        var hasAuthen = billingUnit === Enum_2.AnalyticType.AUTHENTICATION;
-        var isSpot = hasAuthen && ((_a = subCampaign.ads.find(function (s) { return s.id === x.campaignAdId; })) === null || _a === void 0 ? void 0 : _a.type) === Enum_1.AdType.VIDEO;
+        var isSpot = ((_a = subCampaign.ads.find(function (s) { return s.id === x.campaignAdId; })) === null || _a === void 0 ? void 0 : _a.type) === Enum_1.AdType.VIDEO;
         var timeline = x.timeline.toString();
         x.analyticEventSummaries.forEach(function (event) {
             var _a;

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/lib/Utils/Helpers.d.ts

@@ -15,7 +15,7 @@ export declare enum TIMELINE_TYPE {
  */
 export declare function getCookie(name: string): string | undefined;
 export declare function dateToString(date: moment.MomentInput): string;
-export declare function formatNumber(num: number | bigint | string | undefined): string;
+export declare function formatNumber<T = number | bigint | string | undefined>(num: T): string;
 export declare function getQueryVariable(variable: string): string;
 export declare function displayLongString(str: string, maxLength: number): string;
 export declare function generateUUID(): string;

package/lib/Utils/Helpers.js

@@ -78,6 +78,8 @@ function dateToString(date) {
 }
 exports.dateToString = dateToString;
 function formatNumber(num) {
+    if (String(num).includes(','))
+        return num;
     var value = Number(Number(num).toFixed(2));
     if (value || value === 0) {
         return new Intl.NumberFormat(i18n_1.default.language === 'vi' ? 'vi-VN' : 'en-US').format(value);

package/package.json

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