awing-library 2.1.169-dev → 2.1.170-dev

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

@@ -50,7 +50,7 @@ var CampaignContainer = function () {
     var _e = (0, react_1.useState)(), listCampaign = _e[0], setListCampaign = _e[1];
     var _f = (0, react_1.useState)(true), loading = _f[0], setLoading = _f[1];
     (0, react_1.useEffect)(function () {
-        if (location.pathname.endsWith(Constant_1.Constants.CAMPAIGN_PATH)) {
+        if (location.pathname.endsWith("/" + Constant_1.Constants.CAMPAIGN_PATH)) {
             fetchDirectories();
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps

package/lib/ACM-AXN/Campaign/CreateOrEdit/Recoils.d.ts

@@ -1,5 +1,6 @@
 import { CampaignModel, Directory, CampaignGroupModel, Attribute } from '../Types';
 import { WeightContainerProps } from './TabSubCampaign/Weight';
+import { MenuOption } from '../../../AWING';
 export declare const directoriesState: import("recoil").RecoilState<Directory[]>;
 export declare const attributesState: import("recoil").RecoilState<Attribute[]>;
 export declare const isCreateState: import("recoil").RecoilState<boolean>;
@@ -48,3 +49,4 @@ export declare const readyForSubmitState: import("recoil").RecoilValueReadOnly<b
  * Nếu Weight render trong AdRow thì sẽ không đóng được DateRangePicker
  */
 export declare const weightState: import("recoil").RecoilState<WeightContainerProps>;
+export declare const cacheSearchPageState: import("recoil").RecoilState<Record<string, MenuOption[]>>;

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

@@ -11,7 +11,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.weightState = exports.readyForSubmitState = exports.tabPartnerValidState = exports.tabSubCampaignValidState = exports.tabInfomationValidState = exports.campaignPartnerState = exports.campaignGroupsState = exports.campaignAttributesState = exports.campaignState = exports.campaignModelState = exports.confirmExitState = exports.isCreateState = exports.attributesState = exports.directoriesState = void 0;
+exports.cacheSearchPageState = exports.weightState = exports.readyForSubmitState = exports.tabPartnerValidState = exports.tabSubCampaignValidState = exports.tabInfomationValidState = exports.campaignPartnerState = exports.campaignGroupsState = exports.campaignAttributesState = exports.campaignState = exports.campaignModelState = exports.confirmExitState = exports.isCreateState = exports.attributesState = exports.directoriesState = void 0;
 var recoil_1 = require("recoil");
 var Utils_1 = require("../Utils");
 var atoms_1 = require("./TabSubCampaign/atoms");
@@ -207,3 +207,7 @@ exports.weightState = (0, recoil_1.atom)({
         isOpen: false,
     }
 });
+exports.cacheSearchPageState = (0, recoil_1.atom)({
+    key: 'cacheSearchPageState',
+    default: {},
+});

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

@@ -5,7 +5,7 @@ interface Props {
     isExportType: boolean;
     onChangeQueryInput: (changeType: string, newValue: any) => void;
     onQueryData: () => void;
-    onExportData: (exportType?: string) => void;
+    onExportData: (exportType?: string) => void | Promise<void>;
     domains: any[];
 }
 declare const ChartFilterBox: (props: Props) => import("react/jsx-runtime").JSX.Element;

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

@@ -10,6 +10,29 @@ 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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -53,7 +76,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
 var GetApp_1 = __importDefault(require("@mui/icons-material/GetApp"));
 var material_1 = require("@mui/material");
-var react_1 = require("react");
+var react_1 = __importStar(require("react"));
 var react_i18next_1 = require("react-i18next");
 // import { EnhancedDateRangePicker } from 'Components/DateRangePicker'
 var Helpers_1 = require("../../../../Utils/Helpers");
@@ -65,6 +88,7 @@ var SplitButtonExportType_1 = __importDefault(require("./SplitButtonExportType")
 var Enum_1 = require("../../../../ACM-AXN/Campaign/Enum");
 var i18n_1 = __importDefault(require("../../../../i18n"));
 var Context_1 = __importDefault(require("./Context"));
+var lab_1 = require("@mui/lab");
 var textFieldStyle = {
     '& .MuiOutlinedInput-input': {
         padding: '10.5px !important',
@@ -89,7 +113,8 @@ var ChartFilterBox = function (props) {
     var 
     // startDate, endDate,
     subCampaigns = props.subCampaigns, queryInput = props.queryInput, isExportType = props.isExportType, onChangeQueryInput = props.onChangeQueryInput, onQueryData = props.onQueryData, onExportData = props.onExportData, domains = props.domains;
-    var _a = (0, Context_1.default)(), client = _a.services, PlaceMultiSelect = _a.placeMultiSelectComponent;
+    var _a = react_1.default.useState(false), loading = _a[0], setLoading = _a[1];
+    var _b = (0, Context_1.default)(), client = _b.services, PlaceMultiSelect = _b.placeMultiSelectComponent;
     var placeGroups = (0, react_1.useMemo)(function () {
         return subCampaigns.map(function (x) { return ({
             groupId: x.campaignGroup.id,
@@ -209,6 +234,22 @@ var ChartFilterBox = function (props) {
             MONTH: t('Common.Month'),
         },
     };
+    var handleExport = react_1.default.useCallback(function () {
+        setLoading(true);
+        var result = onExportData();
+        if (result instanceof Promise) {
+            result
+                .then(function () {
+                setLoading(false);
+            })
+                .catch(function () {
+                setLoading(false);
+            });
+        }
+        else {
+            setLoading(false);
+        }
+    }, [onExportData]);
     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: 1 }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 3, children: (0, jsx_runtime_1.jsx)(AWING_1.DateRangePicker
                 // noBorder
                 , { 
@@ -228,6 +269,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)(material_1.Button, { variant: "outlined", onClick: function () { return onExportData(); }, 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, { onSubmit: function (exportType) { return onExportData(exportType); } })) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 1 })] }));
 };
 exports.default = ChartFilterBox;

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

@@ -90,7 +90,7 @@ var EventContainer = function (props) {
         var places = placeIds.length ? placesOfCampaign.filter(function (p) {
             return placeIds.includes(p.placeId);
         }) : placesOfCampaign;
-        client
+        return client
             .campaignStatisticGetEvents({
             startDate: (0, moment_1.default)(time.startDate).format(Enum_1.DATE_FORMAT),
             endDate: (0, moment_1.default)(time.endDate).format(Enum_1.DATE_FORMAT),

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

@@ -200,6 +200,6 @@ function AdRow(props) {
                             paddingBottom: 0,
                             paddingTop: 0,
                             borderBottomWidth: open ? 1 : 0,
-                        }, colSpan: 3, children: (0, jsx_runtime_1.jsx)(material_1.Collapse, { in: open, timeout: "auto", unmountOnExit: true, children: (0, jsx_runtime_1.jsx)(material_1.Box, { margin: 1, children: (0, jsx_runtime_1.jsx)(AdDetail_1.default, __assign({ ad: ad, onChange: onChange }, other)) }) }) })] })] }));
+                        }, colSpan: 3, children: (0, jsx_runtime_1.jsx)(material_1.Collapse, { in: open, timeout: "auto", unmountOnExit: true, children: (0, jsx_runtime_1.jsx)(material_1.Box, { margin: 1, sx: { height: '416px' }, children: (0, jsx_runtime_1.jsx)(AdDetail_1.default, __assign({ ad: ad, onChange: onChange }, other)) }) }) })] })] }));
 }
 exports.default = AdRow;

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

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -43,24 +54,38 @@ var react_1 = require("react");
 var recoil_1 = require("recoil");
 var atoms_1 = require("./atoms");
 var Hooks_1 = __importDefault(require("../../Hooks"));
+var Recoils_1 = require("../Recoils");
 function useSearchPage(type) {
     var _this = this;
     var directoryId = (0, recoil_1.useRecoilValue)(atoms_1.campaignPageIdState);
+    var _a = (0, recoil_1.useRecoilState)(Recoils_1.cacheSearchPageState), cache = _a[0], setCache = _a[1];
     var service = (0, Hooks_1.default)().service;
     return (0, react_1.useCallback)(function (searchString) { return __awaiter(_this, void 0, void 0, function () {
-        var temp;
+        var options;
         var _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
-                case 0: return [4 /*yield*/, service.pagesPaging(searchString, 10, 0, directoryId[type])];
+                case 0:
+                    if (Object.keys(cache).includes(searchString || type)) {
+                        return [2 /*return*/, cache[searchString || type]];
+                    }
+                    return [4 /*yield*/, service
+                            .pagesPaging(searchString, 10, 0, directoryId[type])
+                            .then(function (_a) {
+                            var items = _a.items;
+                            return items === null || items === void 0 ? void 0 : items.map(function (page) { return ({
+                                text: page.title,
+                                value: page.pageId,
+                            }); });
+                        })];
                 case 1:
-                    temp = _b.sent();
-                    return [2 /*return*/, (_a = temp.items) === null || _a === void 0 ? void 0 : _a.map(function (page) { return ({
-                            text: page.title,
-                            value: page.pageId,
-                        }); })];
+                    options = _b.sent();
+                    setCache(__assign(__assign({}, cache), (_a = {}, _a[searchString || type] = options, _a)));
+                    return [2 /*return*/, options];
             }
         });
-    }); }, [service, directoryId, type]);
+    }); }, 
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [directoryId, type]);
 }
 exports.default = useSearchPage;

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

@@ -111,7 +111,8 @@ var CreateOrEdit = function () {
         if (service.attributesGetByObjectTypeCode) {
             service.attributesGetByObjectTypeCode(Enum_1.DirectoryRoot.Campaign).then(setAttributes);
         }
-    }, [service, setDirectories, setAttributes]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
     (0, react_1.useLayoutEffect)(function () {
         if (tabName && route.includes(tabName)) {
             setValue(String(route.indexOf(tabName)));

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

@@ -260,7 +260,6 @@ interface CampaignService extends PrmissionService {
     campaignsPut: (id: string, body: CampaignModel) => Promise<void>;
     campaignsPost: (body: CampaignModel) => Promise<void>;
     directoriesPost: (body: Directory) => Promise<void>;
-    pagesPaging: (searchString?: string, pageSize?: number, pageIndex?: number, directoryId?: string) => Promise<any>;
     pagesGetSources: (loginId?: string, welcomeId?: string) => Promise<any>;
     deviceInfoGetAllRuleOsVersions: () => Promise<RuleOsVersion[]>;
     deviceInfoGetAllRuleDevices: () => Promise<RuleDevice[]>;

package/lib/AWING/AsyncAutocomplete/index.js

@@ -33,7 +33,7 @@ var Autocomplete_1 = __importDefault(require("@mui/material/Autocomplete"));
 var Checkbox_1 = __importDefault(require("@mui/material/Checkbox"));
 var CheckBoxOutlineBlank_1 = __importDefault(require("@mui/icons-material/CheckBoxOutlineBlank"));
 var CheckBox_1 = __importDefault(require("@mui/icons-material/CheckBox"));
-var throttle_1 = __importDefault(require("lodash/throttle"));
+var lodash_1 = require("lodash");
 function AsyncAutocomplete(props) {
     var _a;
     var multiple = props.multiple, _b = props.value, value = _b === void 0 ? null : _b, onChange = props.onChange, fetchData = props.fetchData, getOptionValue = props.getOptionValue, getOptionLabel = props.getOptionLabel, readOnly = props.readOnly, TextFieldProps = props.TextFieldProps, renderOption = props.renderOption;
@@ -41,7 +41,7 @@ function AsyncAutocomplete(props) {
     var _d = react_2.default.useState([]), options = _d[0], setOptions = _d[1];
     var _e = react_2.default.useState(false), loading = _e[0], setLoading = _e[1];
     var fetch = react_2.default.useMemo(function () {
-        return (0, throttle_1.default)(function (input, callback) {
+        return (0, lodash_1.debounce)(function (input, callback) {
             setLoading(true);
             fetchData(input)
                 .then(function (response) {

package/lib/Commons/Components/ClassicDrawer.js

@@ -52,7 +52,7 @@ var Drawer = function (props) {
     var navigate = (0, Router_1.useNavigate)();
     var location = (0, Router_1.useLocation)();
     var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18n_1.default }).t;
-    var _b = react_1.default.useState(true), open = _b[0], setOpen = _b[1];
+    var _b = react_1.default.useState(false), open = _b[0], setOpen = _b[1];
     var _c = react_1.default.useState(false), loading = _c[0], setLoading = _c[1];
     var timer = react_1.default.useRef();
     react_1.default.useEffect(function () {
@@ -63,6 +63,7 @@ var Drawer = function (props) {
     }, []);
     var closeDrawer = function (action) {
         if (action === void 0) { action = CloseAction.Close; }
+        setOpen(false);
         timer.current = window.setTimeout(function () {
             var _a;
             ((_a = location.state) === null || _a === void 0 ? void 0 : _a.type) === 'history'

package/package.json

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