awing-library 2.1.183-dev → 2.1.185-dev

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

@@ -348,7 +348,7 @@ function AdList(props) {
                                         } }, idx));
                                 }) })] })] }), open &&
                 (0, jsx_runtime_1.jsx)(PreviewButton_1.default, { anchorEl: anchorEl, open: open, domainIds: previewId.domainIds, handlePreviewClose: handlePreviewClose, handlePreviewDomain: function (event, domainId) {
-                        handlePreview(event, ads.find(function (x) { return x.loginId === previewId.loginId; }), domainId);
+                        handlePreview(event, ads.find(function (x) { return x.loginId === previewId.loginId && x.welcomeId === previewId.welcomeId; }), domainId);
                         // handlePreview(previewId, domainId)
                     }, service: service })] }));
 }

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

@@ -122,9 +122,7 @@ function SubCampaignDetail(props) {
                                             : translationText.helperText
                                         : '' }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "billingUnit", required: true, select: true, variant: "standard", fullWidth: true, label: translationText.BillingUnit, value: String(subCampaign.billingUnit), onChange: function (e) {
                                         onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { billingUnit: Number(e.target.value) })); });
-                                    }, error: subValid.billingUnit !== undefined &&
-                                        !subValid.billingUnit, helperText: subValid.billingUnit !== undefined &&
-                                        !subValid.billingUnit
+                                    }, error: !!subValid.billingUnit && !subValid.billingUnit, helperText: !!subValid.billingUnit && !subValid.billingUnit
                                         ? translationText.helperText
                                         : '', children: Object.values(Enum_2.AnalyticType)
                                         .filter(function (item) { return !isNaN(Number(item)); })

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

@@ -22,7 +22,7 @@ exports.subCampaignDetailValidState = (0, recoil_1.atom)({
                 return (result[sub.campaignGroup.id] =
                     (0, Utils_1.nameValid)(sub.campaignGroup.name) &&
                         (0, Utils_1.groupClassBValid)(sub.campaignGroup) &&
-                        (0, Utils_1.groupClassCValid)(sub));
+                        (0, Utils_1.groupClassCValid)(sub) && !!sub.campaignGroup.billingUnit);
             });
             return result;
         },
@@ -58,9 +58,10 @@ exports.subCampaignValidState = (0, recoil_1.selector)({
         var subCampaignAdsValid = get(exports.subCampaignAdsValidState);
         var result = {};
         subCampaigns.forEach(function (sub) {
+            var _a;
             return (result[sub.campaignGroup.id] =
                 subCampaignDetailValid[sub.campaignGroup.id] &&
-                    subCampaignAdsValid[sub.campaignGroup.id]);
+                    subCampaignAdsValid[sub.campaignGroup.id] && Boolean((_a = sub.campaignGroup) === null || _a === void 0 ? void 0 : _a.billingUnit));
         });
         return result;
     },

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

@@ -111,6 +111,7 @@ export declare const BaseEvent: {
     readonly 0: "View";
     readonly 2: "Click";
     readonly 1: "Authentication";
+    readonly 4: "AuthenticationSuccess";
 };
 export declare enum CampaignTicket {
     ACTIVE = 0,

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

@@ -94,6 +94,7 @@ exports.BaseEvent = (_a = {},
     _a[Enum_1.AnalyticType.VIEW] = 'View',
     _a[Enum_1.AnalyticType.CLICK] = 'Click',
     _a[Enum_1.AnalyticType.AUTHENTICATION] = 'Authentication',
+    _a[Enum_1.AnalyticType.AuthenticationSuccess] = 'AuthenticationSuccess',
     _a);
 var CampaignTicket;
 (function (CampaignTicket) {

package/lib/ACM-AXN/Common/Enum.d.ts

@@ -55,5 +55,6 @@ export declare enum AnalyticGroupBy {
 export declare enum AnalyticType {
     VIEW = 0,// Impression
     AUTHENTICATION = 1,// Engagement / Spot
-    CLICK = 2
+    CLICK = 2,// Final Click
+    AuthenticationSuccess = 4
 }

package/lib/ACM-AXN/Common/Enum.js

@@ -71,4 +71,5 @@ var AnalyticType;
     AnalyticType[AnalyticType["VIEW"] = 0] = "VIEW";
     AnalyticType[AnalyticType["AUTHENTICATION"] = 1] = "AUTHENTICATION";
     AnalyticType[AnalyticType["CLICK"] = 2] = "CLICK";
+    AnalyticType[AnalyticType["AuthenticationSuccess"] = 4] = "AuthenticationSuccess";
 })(AnalyticType || (exports.AnalyticType = AnalyticType = {}));

package/lib/ACM-AXN/ViewTemplate/Preview.js

@@ -52,6 +52,7 @@ var Preview = function (props) {
             result = result.replace("http://", "https://");
         return result;
     }, [configs.CAPTIVE_DOMAIN, configs.TEMPLATE_PREVIEW, domainId]);
+    var iframeName = react_1.default.useMemo(function () { return "iframe-demo".concat(viewIndex); }, [viewIndex]);
     (0, react_1.useEffect)(function () {
         var handleFormdata = function (_a) {
             var formData = _a.formData;
@@ -85,6 +86,6 @@ var Preview = function (props) {
                 }, children: [(0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "body1", style: {
                             fontWeight: "bold",
                             textTransform: "uppercase",
-                        }, children: t("ViewTemplate.PreviewTitle") }), (0, jsx_runtime_1.jsx)(material_1.Tooltip, { title: t("Common.Refresh") || "", placement: "top", children: (0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(material_1.IconButton, { onClick: function () { return formRef.current.submit(); }, "aria-label": "refresh", style: { float: "right" }, disabled: !validStatus, children: (0, jsx_runtime_1.jsx)(Refresh_1.default, {}) }) }) })] }), (0, jsx_runtime_1.jsx)("form", { action: iframeSrc, method: "post", target: "iframe-demo", ref: formRef }), (0, jsx_runtime_1.jsx)("iframe", { title: "iframe-demo-".concat(viewIndex), id: "iframe-demo", name: "iframe-demo", className: classes.root, width: "100%" })] }));
+                        }, children: t("ViewTemplate.PreviewTitle") }), (0, jsx_runtime_1.jsx)(material_1.Tooltip, { title: t("Common.Refresh") || "", placement: "top", children: (0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(material_1.IconButton, { onClick: function () { return formRef.current.submit(); }, "aria-label": "refresh", style: { float: "right" }, disabled: !validStatus, children: (0, jsx_runtime_1.jsx)(Refresh_1.default, {}) }) }) })] }), (0, jsx_runtime_1.jsx)("form", { action: iframeSrc, method: "post", target: iframeName, ref: formRef }), (0, jsx_runtime_1.jsx)("iframe", { title: iframeName, id: iframeName, name: iframeName, className: classes.root, width: "100%" })] }));
 };
 exports.default = Preview;

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<T = number | bigint | string | undefined>(num: T): string;
+export declare function formatNumber(num: number | bigint | string | undefined): 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,11 +78,9 @@ 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);
+        return new Intl.NumberFormat(localStorage.getItem('i18nextLng') === 'vi' ? 'vi-VN' : 'en-US').format(value);
     }
     else
         return '';

package/package.json

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