awing-library 2.1.162-dev → 2.1.164-dev

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

@@ -53,10 +53,11 @@ var Customer = function (props) {
                                 // noBorder
                                 label: t('Common.View'), callback: function (value) {
                                     var _a, _b;
-                                    return changeQueryInput('time', {
-                                        startDate: (0, Helpers_1.getStartOfDay)((_a = value === null || value === void 0 ? void 0 : value.startDate) === null || _a === void 0 ? void 0 : _a.toDate()),
-                                        endDate: (0, Helpers_1.getStartOfDay)((_b = value === null || value === void 0 ? void 0 : value.endDate) === null || _b === void 0 ? void 0 : _b.toDate()),
-                                    });
+                                    Object.values(value).filter(Boolean).length > 1 &&
+                                        changeQueryInput('time', {
+                                            startDate: (0, Helpers_1.getStartOfDay)((_a = value === null || value === void 0 ? void 0 : value.startDate) === null || _a === void 0 ? void 0 : _a.toDate()),
+                                            endDate: (0, Helpers_1.getStartOfDay)((_b = value === null || value === void 0 ? void 0 : value.endDate) === null || _b === void 0 ? void 0 : _b.toDate()),
+                                        });
                                 }, initialStartDate: (0, moment_1.default)(queryInput.time.startDate), initialEndDate: (0, moment_1.default)(queryInput.time.endDate), isShowCalendarInfo: true, variant: "outlined", textFieldProps: {
                                     fullWidth: true,
                                     sx: {

package/lib/ACM-AXN/Page/CreateOrEdit/Tabview/ViewContent.js

@@ -122,9 +122,7 @@ var ViewContent = function (_a) {
         setScriptAutoField(res.template.autoField || '');
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    var setChanged = react_1.default.useCallback((0, lodash_1.debounce)(function () {
-        onChange(['isChanged'], true);
-    }, 300), []);
+    var setChanged = function () { onChange(['isChanged'], true); };
     var handleOnChange = function (fieldPath, templateDatasUpdated) {
         var _a;
         var keys = fieldPath.split('.');

package/lib/ACM-AXN/Page/CreateOrEdit/Tabview/ViewInfo.d.ts

@@ -1,6 +1,6 @@
+import { ITemplateType } from '../../../../ACM-AXN/Template/Types';
 import React from 'react';
 import { ViewModel } from '../../Types';
-import { ITemplateType } from '../../../../ACM-AXN/Template/Types';
 interface ViewInfoProps {
     templateTypes: ITemplateType[];
     onChange: (keys: string[], value: unknown) => void;

package/lib/ACM-AXN/Page/CreateOrEdit/Tabview/ViewInfo.js

@@ -10,47 +10,24 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
-var react_1 = __importStar(require("react"));
-var AWING_1 = require("../../../../AWING");
-var react_i18next_1 = require("react-i18next");
-var Context_1 = __importDefault(require("../../Context"));
+var Constant_1 = require("../../../../ACM-AXN/Common/Constant");
+var Constant_2 = require("../../../../ACM-AXN/Page/Constant");
 var lodash_1 = require("lodash");
-var enums_1 = require("../../enums");
-var Utils_1 = require("../Utils");
-var Constant_1 = require("../../../../ACM-AXN/Page/Constant");
+var react_1 = __importDefault(require("react"));
+var react_i18next_1 = require("react-i18next");
 var react_router_dom_1 = require("react-router-dom");
 var recoil_1 = require("recoil");
-var Recoil_1 = require("../Recoil");
-var Constant_2 = require("../../../../ACM-AXN/Common/Constant");
+var AWING_1 = require("../../../../AWING");
+var Context_1 = __importDefault(require("../../Context"));
+var enums_1 = require("../../enums");
 var ListenTemplate_1 = require("../ListenTemplate");
+var Recoil_1 = require("../Recoil");
+var Utils_1 = require("../Utils");
 var ViewInfo = function (_a) {
     var templateTypes = _a.templateTypes, onChange = _a.onChange, viewInfoData = _a.viewInfoData, viewNumber = _a.viewNumber;
     var pageId = (0, react_router_dom_1.useParams)().pageId;
@@ -64,14 +41,6 @@ var ViewInfo = function (_a) {
     var _d = react_1.default.useState([]), templates = _d[0], setTemplates = _d[1];
     var _e = react_1.default.useState(false), loadingTemplate = _e[0], setLoadingTemplate = _e[1];
     var defaultDirectory = react_1.default.useMemo(function () { return directories.find(function (item) { return item.parentDirectoryId === '99'; }); }, [directories]);
-    (0, react_1.useEffect)(function () {
-        var savedDirectoryId = JSON.parse(localStorage.getItem(Constant_1.PAGE_LOGIN_DIRECTORY_SELECTED) || '{}')[Array.isArray(domainId) ? 'awingPge' : domainId];
-        if (savedDirectoryId && !pageId && !isMounted) {
-            setIsMounted(true);
-            handleChangeForm({ directoryId: savedDirectoryId }, true, 'directoryId');
-        }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
     var overWriteOnChange = function (keys, value) {
         if (keys.includes('templateId')) {
             setDeprecated(false);
@@ -84,7 +53,7 @@ var ViewInfo = function (_a) {
             return;
         if (['templateTypeId', 'directoryId'].includes(keyUpdate)) {
             if (keyUpdate === 'directoryId') {
-                localStorage.setItem(Constant_1.PAGE_LOGIN_DIRECTORY_SELECTED, JSON.stringify((_a = {}, _a[Array.isArray(domainId) ? 'awingPge' : domainId] = obj[keyUpdate], _a)));
+                localStorage.setItem(Constant_2.PAGE_LOGIN_DIRECTORY_SELECTED, JSON.stringify((_a = {}, _a[Array.isArray(domainId) ? 'awingPge' : domainId] = obj[keyUpdate], _a)));
             }
             overWriteOnChange(['templateId'], '');
         }
@@ -93,6 +62,14 @@ var ViewInfo = function (_a) {
     }, 
     // eslint-disable-next-line react-hooks/exhaustive-deps
     []);
+    react_1.default.useEffect(function () {
+        var savedDirectoryId = JSON.parse(localStorage.getItem(Constant_2.PAGE_LOGIN_DIRECTORY_SELECTED) || '{}')[Array.isArray(domainId) ? 'awingPge' : domainId];
+        if (savedDirectoryId && !pageId && !isMounted) {
+            setIsMounted(true);
+            handleChangeForm({ directoryId: savedDirectoryId }, true, 'directoryId');
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
     react_1.default.useEffect(function () {
         var fieldsRequireStatus = !(0, Utils_1.getFieldsValid)(viewInfoData.viewDatas).includes(false);
         onChange(['fieldsRequireStatus'], fieldsRequireStatus);
@@ -127,7 +104,7 @@ var ViewInfo = function (_a) {
             setTemplates(res.filter(function (x) { return !x.isDeprecated; }).concat(viewDeprecate ? [viewDeprecate] : []));
         })
             .finally(function () { return setLoadingTemplate(false); });
-    }, Constant_2.Constants.DEBOUNCE_TIME_300), []);
+    }, Constant_1.Constants.DEBOUNCE_TIME_300), []);
     var templateOptions = react_1.default.useMemo(function () {
         var result = [];
         if (viewInfoData.templateTypeId) {

package/lib/ACM-AXN/Page/CreateOrEdit/Tabview/index.js

@@ -119,21 +119,23 @@ var TabView = function (_a) {
         }));
     };
     var onChange = function (keys, value) {
+        // console.log("keys", keys, "value", value, views, activeViewIndex)
         if (keys.includes('activeViewIndex')) {
             setActiveViewIndex(Number(value));
             return;
         }
-        setView((0, immer_1.produce)(function (draf) {
-            (0, Helpers_1.setObject)(draf, keys, value);
+        setView((0, immer_1.produce)(function (draft) {
+            if (draft.views.length < Number(keys[1] || 0) + 1)
+                return;
+            (0, Helpers_1.setObject)(draft, keys, value);
         }));
     };
     var handleChange = function (key) {
         if (key === void 0) { key = []; }
         return (0, Utils_1.composeKey)(onChange, (0, Utils_1.concatKey)(key));
     };
-    var handleChangeView = react_1.default.useMemo(function () { return handleChange(['views', String(activeViewIndex)]); }, 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [activeViewIndex]);
+    var handleChangeView = react_1.default.useMemo(function () { return handleChange(['views', String(activeViewIndex)]); }, [activeViewIndex]);
     return ((0, jsx_runtime_1.jsx)(ViewList_1.default, { isDisableTabHeader: false, activeViewIndex: activeViewIndex, viewCount: views.length, onChangeView: handleChange(), addView: addPageView, deleteView: deletePageView, children: (0, jsx_runtime_1.jsx)(Panel_1.default, { value: activeViewIndex, index: activeViewIndex, children: views.map(function (view, index) { return ((0, jsx_runtime_1.jsx)(react_1.Fragment, { children: activeViewIndex === index && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(ViewInfo_1.default, { onChange: handleChangeView, templateTypes: templateTypes, viewInfoData: view, viewNumber: index + 1 }), (0, jsx_runtime_1.jsx)(ViewContent_1.default, { viewInfoData: view, pageId: page.pageId, viewNumber: index, onChange: handleChangeView, isCreate: Boolean(isCreate) })] })) }, index)); }) }) }));
 };
 exports.default = TabView;

package/lib/ACM-AXN/ScheduleCompletionRate/Filter.js

@@ -158,7 +158,12 @@ function Filter(props) {
                             className: classes.outlinedInput,
                         }, callback: handleChangeDateRange, isDayBlocked: function (day) {
                             var now = (0, moment_1.default)().endOf('day').valueOf();
-                            return now < day.valueOf();
+                            if (now < day.valueOf()) {
+                                return true;
+                            }
+                            else {
+                                return false;
+                            }
                         } }) }), (0, jsx_runtime_1.jsx)(SearchCampaign_1.default, { filter: filter, campaigns: campaigns, onUpdateFilter: onUpdateFilter }), (0, jsx_runtime_1.jsx)(material_1.Button, { variant: "contained", color: "primary", onClick: function () {
                         handleChangeQueryInput(dateRangeInput);
                     }, style: { height: '40px' }, children: t('Common.View') }), (0, jsx_runtime_1.jsx)(material_1.Button, { variant: "contained", title: t('Common.Download'), onClick: handleChangeExportInput, color: "inherit", disabled: isLoadings, style: {

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

@@ -93,7 +93,13 @@ function ViewTemplate(_a) {
                                     cursor: "pointer",
                                 }, onClick: function () {
                                     setAdvanceOptionExpand(!advanceOptionExpand);
-                                }, children: [(0, jsx_runtime_1.jsx)(material_1.Typography, { style: { fontWeight: "bold" }, children: t("ViewTemplate.AdvanceOption") }), (0, jsx_runtime_1.jsx)(material_1.IconButton, { children: advanceOptionExpand ? ((0, jsx_runtime_1.jsx)(icons_material_1.ExpandLess, {})) : ((0, jsx_runtime_1.jsx)(icons_material_1.ExpandMore, {})) })] }), advanceOptionExpand && ((0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, children: [fields && advanceFields.length > 0 && renderFields(fields, true), (0, jsx_runtime_1.jsx)(Event_1.default, __assign({}, props))] }))] })] }), enablePreview && ((0, jsx_runtime_1.jsxs)(material_1.Grid, { item: true, xs: 4, children: [(0, jsx_runtime_1.jsx)(Preview_1.default, { domainId: domainId || "", validStatus: validStatus, configs: CONFIGS, pagePath: pagePath, templateDatas: templateDatas }), (0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "caption", children: t("ViewTemplate.PreviewLoadingNote") })] }))] }));
+                                }, children: [(0, jsx_runtime_1.jsx)(material_1.Typography, { style: { fontWeight: "bold" }, children: t("ViewTemplate.AdvanceOption") }), (0, jsx_runtime_1.jsx)(material_1.IconButton, { children: advanceOptionExpand ? ((0, jsx_runtime_1.jsx)(icons_material_1.ExpandLess, {})) : ((0, jsx_runtime_1.jsx)(icons_material_1.ExpandMore, {})) })] }), (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, sx: {
+                                    transition: "all 3s",
+                                }, style: advanceOptionExpand ? {
+                                    display: "block",
+                                } : {
+                                    display: "none",
+                                }, children: [fields && advanceFields.length > 0 && renderFields(fields, true), (0, jsx_runtime_1.jsx)(Event_1.default, __assign({}, props))] })] })] }), enablePreview && ((0, jsx_runtime_1.jsxs)(material_1.Grid, { item: true, xs: 4, children: [(0, jsx_runtime_1.jsx)(Preview_1.default, { domainId: domainId || "", validStatus: validStatus, configs: CONFIGS, pagePath: pagePath, templateDatas: templateDatas }), (0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "caption", children: t("ViewTemplate.PreviewLoadingNote") })] }))] }));
 }
 exports.default = ViewTemplate;
 var getChilds = function (fields, fieldInfo) {

package/lib/AWING/DateRangePicker/component.js

@@ -235,36 +235,54 @@ var DateRangePickerWrapper = function (props) {
         onDatesChange(daterange);
         // setFocusedInput(null);
     };
+    var getDataSet = function (moment) {
+        return moment.set({
+            hour: 0,
+            minute: 0,
+            second: 0,
+            millisecond: 0,
+        });
+    };
+    var resetDate = function () {
+        setStartDate(initialStartDate);
+        setEndDate(initialEndDate);
+        setInputValue("".concat(moment(initialStartDate).format('DD/MM/YYYY'), " - ").concat(moment(initialEndDate).format('DD/MM/YYYY')));
+        callback({
+            startDate: getDataSet(moment(initialStartDate, 'DD/MM/YYYY')),
+            endDate: getDataSet(moment(initialEndDate, 'DD/MM/YYYY')),
+        });
+    };
     var handleChangeInput = function (e) {
         var fieldValue = e.target.value;
         setInputValue(fieldValue);
         var fieldValueArr = (fieldValue === null || fieldValue === void 0 ? void 0 : fieldValue.split(' - ')) || [];
         var year1900 = moment('1900-01-01');
         var momentStartDate = moment(fieldValueArr[0], 'DD/MM/YYYY');
+        var momentEndDate = moment(fieldValueArr[1], 'DD/MM/YYYY');
+        if (isDayBlocked && isDayBlocked(momentStartDate)) {
+            setIsValid(true);
+            resetDate();
+            return;
+        }
+        if (isDayBlocked && isDayBlocked(momentEndDate)) {
+            setIsValid(true);
+            resetDate();
+            return;
+        }
         if (momentStartDate.isValid() && momentStartDate.diff(year1900) >= 0) {
             setStartDate(momentStartDate);
         }
-        var momentEndDate = moment(fieldValueArr[1], 'DD/MM/YYYY');
         if (momentEndDate.isValid() && momentEndDate.diff(year1900) >= 0) {
             setEndDate(momentEndDate);
         }
         if (moment(fieldValueArr[0], 'DD/MM/YYYY', true).isValid() &&
             moment(fieldValueArr[1], 'DD/MM/YYYY', true).isValid() &&
             momentEndDate.diff(momentStartDate) >= 0) {
-            momentStartDate.set({
-                hour: 0,
-                minute: 0,
-                second: 0,
-                millisecond: 0,
-            });
-            momentEndDate.set({
-                hour: 0,
-                minute: 0,
-                second: 0,
-                millisecond: 0,
-            });
-            callback({ startDate: momentStartDate, endDate: momentEndDate });
             setIsValid(true);
+            callback({
+                startDate: getDataSet(momentStartDate),
+                endDate: getDataSet(momentEndDate),
+            });
         }
         else
             setIsValid(false);

package/lib/Commons/Components/ClassicDrawer.js

@@ -78,7 +78,6 @@ var Drawer = function (props) {
                 .then(function (state) {
                 setTimeout(function () {
                     snackbar('success');
-                    console.log('success');
                 }, 700);
                 closeDrawer((typeof state === 'string' && state) ? state : CloseAction.Reload);
             })

package/package.json

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