awing-library 2.1.81-beta → 2.1.82-beta

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

@@ -47,6 +47,7 @@ var recoil_1 = require("recoil");
 var AWING_1 = require("../../../AWING");
 var Recoils_1 = require("./Recoils");
 var Hooks_1 = __importDefault(require("../Hooks"));
+var i18n_1 = __importDefault(require("../../../i18n"));
 var Infomation = function () {
     var service = (0, Hooks_1.default)().service;
     var directories = (0, recoil_1.useRecoilValue)(Recoils_1.directoriesState);
@@ -54,7 +55,7 @@ var Infomation = function () {
     var _a = (0, recoil_1.useRecoilState)(Recoils_1.campaignState), campaign = _a[0], setCampaign = _a[1];
     var _b = (0, recoil_1.useRecoilState)(Recoils_1.campaignAttributesState), campaignAttributes = _b[0], setCampaignAttributes = _b[1];
     var setCampaignModel = (0, recoil_1.useSetRecoilState)(Recoils_1.campaignModelState);
-    var t = (0, react_i18next_1.useTranslation)().t;
+    var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18n_1.default }).t;
     (0, react_1.useEffect)(function () {
         if (!campaign.directoryId) {
             setCampaignModel((0, immer_1.default)(function (draft) {

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

@@ -232,13 +232,13 @@ function AdList(props) {
     /**
      * Hàm khi xem preview
      */
-    var handlePreview = function (e, ad, doaminId) {
+    var handlePreview = function (e, ad, domainId) {
         e.stopPropagation();
-        var url = "".concat(Constant_1.Constants.CAPTIVE_DOMAIN, "/").concat(Constant_1.Constants.PAGE_LOGIN_PREVIEW, "?loginId=").concat(ad.loginId, "&isNetworkCampaign=false");
+        var url = "".concat(Constant_1.Constants.CAPTIVE_DOMAIN, "/").concat(Constant_1.Constants.PAGE_LOGIN_PREVIEW, "?loginId=").concat(ad.loginId, "&isNetworkCampaign=").concat(Boolean(service.domainsGetAll).toString());
         if (ad.welcomeId.length)
             url += "&welcomeId=".concat(ad.welcomeId);
-        if (doaminId)
-            url += "&doaminId=".concat(doaminId);
+        if (domainId)
+            url += "&domainId=".concat(domainId);
         window.open(url, '_blank');
     };
     var handlePreviewPage = function (e, ad) {

package/lib/ACM-AXN/GroupUser/CreateOrEdit.js

@@ -10,6 +10,15 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -25,18 +34,18 @@ var SearchUser_1 = __importDefault(require("./User/SearchUser"));
 var Hooks_1 = __importDefault(require("./Hooks"));
 var Constants_1 = require("../../ACM-AXN/User/Constants");
 var CreateOrEdit = function () {
-    var _a;
+    var _a, _b;
     var groupId = (0, Router_1.useParams)().groupId;
     var t = (0, react_i18next_1.useTranslation)().t;
     var service = (0, Hooks_1.default)().service;
-    var _b = (0, react_1.useState)(false), confirmExit = _b[0], setConfirmExit = _b[1];
-    var _c = (0, react_1.useState)(false), isValid = _c[0], setValid = _c[1];
-    var _d = (0, react_1.useState)([]), users = _d[0], setUsers = _d[1];
-    var _e = (0, react_1.useState)({
+    var _c = (0, react_1.useState)(false), confirmExit = _c[0], setConfirmExit = _c[1];
+    var _d = (0, react_1.useState)(false), isValid = _d[0], setValid = _d[1];
+    var _e = (0, react_1.useState)([]), users = _e[0], setUsers = _e[1];
+    var _f = (0, react_1.useState)({
         userIds: [],
         group: { name: '', description: '' },
-    }), businessUnitdata = _e[0], setBusinessUnitData = _e[1];
-    var _f = (0, react_1.useState)(true), loading = _f[0], setloading = _f[1];
+    }), businessUnitdata = _f[0], setBusinessUnitData = _f[1];
+    var _g = (0, react_1.useState)(true), loading = _g[0], setloading = _g[1];
     (0, react_1.useEffect)(function () {
         setloading(true);
         Promise.all([
@@ -62,7 +71,7 @@ var CreateOrEdit = function () {
         }
         return service.groupsPost(businessUnitdata);
     }, [businessUnitdata, service, groupId]);
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(ClassicDrawer_1.default, { title: "".concat(t(['UserGroup', groupId ? 'Edit' : 'Create'].join('.'))).concat(groupId ? ": ".concat((_a = businessUnitdata.group) === null || _a === void 0 ? void 0 : _a.name) : '', "\n                   "), onSubmit: handleSubmit, isLoadingButtonSubmit: false, disableButtonSubmit: !isValid, confirmExit: confirmExit, childrenWrapperStyle: { padding: 0 }, children: loading ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(AWING_1.DataForm, { caption: t('UserGroup.TitleUserGroupInfo'), fields: [
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(ClassicDrawer_1.default, { title: "".concat(t(['UserGroup', groupId ? 'Edit' : 'Create'].join('.'))).concat(groupId ? ": ".concat((_a = businessUnitdata.group) === null || _a === void 0 ? void 0 : _a.name) : '', "\n                   "), onSubmit: handleSubmit, isLoadingButtonSubmit: false, disableButtonSubmit: !(isValid && ((_b = businessUnitdata.group) === null || _b === void 0 ? void 0 : _b.name)), confirmExit: confirmExit, childrenWrapperStyle: { padding: 0 }, children: loading ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(AWING_1.DataForm, { caption: t('UserGroup.TitleUserGroupInfo'), fields: [
                                 {
                                     fieldName: 'name',
                                     type: 'text',
@@ -78,14 +87,7 @@ var CreateOrEdit = function () {
                             ], oldValue: businessUnitdata === null || businessUnitdata === void 0 ? void 0 : businessUnitdata.group, onUpdate: handleUpdate }), (0, jsx_runtime_1.jsx)(UserComponent_1.default, { rows: users.filter(function (user) { var _a; return (_a = businessUnitdata === null || businessUnitdata === void 0 ? void 0 : businessUnitdata.userIds) === null || _a === void 0 ? void 0 : _a.includes(user.userId); }), onChangeAddUser: function (userIds) {
                                 setBusinessUnitData(function (prev) { return (__assign(__assign({}, prev), { userIds: userIds })); });
                             } })] })) }), (0, jsx_runtime_1.jsx)(Router_1.Routes, { children: (0, jsx_runtime_1.jsx)(Router_1.Route, { path: Constants_1.ADD_USER_TO_GROUP, element: (0, jsx_runtime_1.jsx)(SearchUser_1.default, { onChangeAddUser: function (userIds) {
-                            setBusinessUnitData(function (prev) {
-                                console.log('prev', prev);
-                                // return {
-                                //     ...prev,
-                                //     userIds: [...prev.userIds, ...userIds],
-                                // }
-                                return prev;
-                            });
+                            setBusinessUnitData(function (prev) { return (__assign(__assign({}, prev), { userIds: __spreadArray(__spreadArray([], (prev.userIds || []), true), userIds, true) })); });
                         }, listUserId: (businessUnitdata === null || businessUnitdata === void 0 ? void 0 : businessUnitdata.userIds) || [], users: users }) }, Constants_1.ADD_USER_TO_GROUP) })] }));
 };
 exports.default = CreateOrEdit;

package/lib/ACM-AXN/GroupUser/User/UserComponent.js

@@ -12,18 +12,24 @@ var Constants_1 = require("../../../ACM-AXN/User/Constants");
 var UserComponent = function (_a) {
     var rows = _a.rows, onChangeAddUser = _a.onChangeAddUser;
     var t = (0, react_i18next_1.useTranslation)().t;
-    var _b = (0, react_1.useTransition)(), startTransition = _b[1];
     var appHelper = (0, Context_1.useAwing)().appHelper;
+    var _b = (0, react_1.useTransition)(), startTransition = _b[1];
     var _c = (0, react_1.useState)([]), gridUser = _c[0], setGridUser = _c[1];
-    var _d = (0, react_1.useState)({
+    var _d = (0, react_1.useState)(true), trigger = _d[0], setTrigger = _d[1];
+    var _e = (0, react_1.useState)({
         pageIndex: 0,
         pageSize: 10,
-    }), queryParams = _d[0], setQueryParams = _d[1];
+    }), queryParams = _e[0], setQueryParams = _e[1];
     (0, react_1.useLayoutEffect)(function () {
-        setGridUser(rows);
+        if (trigger) {
+            setGridUser(rows);
+            setTrigger(false);
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [rows]);
     var handleDelete = function (id) {
         startTransition(function () {
+            setTrigger(true);
             onChangeAddUser(rows
                 .filter(function (item) { return item.userId !== id; })
                 .map(function (item) { return item.userId; }));

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

@@ -159,7 +159,7 @@ var PageContainer = function () {
         prevQuery.current = (0, lodash_1.cloneDeep)(input);
     }, [directories, handleFetchPaging]);
     var handlePreview = function (id, domainId) {
-        var url = "".concat(CONFIGS.CAPTIVE_DOMAIN, "/").concat(CONFIGS.PAGE_LOGIN_PREVIEW, "?loginId=").concat(id, "&domainId=").concat(domainId, "&isNetworkCampaign=false");
+        var url = "".concat(CONFIGS.CAPTIVE_DOMAIN, "/").concat(CONFIGS.PAGE_LOGIN_PREVIEW, "?loginId=").concat(id, "&domainId=").concat(domainId, "&isNetworkCampaign=").concat(Boolean(service.domainsGetAll).toString());
         window.open(url, '_blank');
     };
     var handlePreviewClick = function (id) {

package/lib/ACM-AXN/Page/CreateOrEdit/DrawerAction.js

@@ -36,7 +36,12 @@ var DrawerAction = function (_a) {
         setAnchorEl(null);
     };
     var handlePreview = function (domainId) {
-        var url = "".concat(CONFIGS.CAPTIVE_DOMAIN, "/").concat(CONFIGS.PAGE_LOGIN_PREVIEW, "?loginId=").concat(pageId, "&domainId=").concat(domainId, "&isNetworkCampaign=false");
+        var params = new URLSearchParams({
+            loginId: pageId,
+            domainId: domainId,
+            isNetworkCampaign: Boolean(service.domainsGetAll).toString(),
+        });
+        var url = "".concat(CONFIGS.CAPTIVE_DOMAIN, "/").concat(CONFIGS.PAGE_LOGIN_PREVIEW, "?").concat(params.toString());
         window.open(url, '_blank');
     };
     var handlePreviewPage = function (e) {

package/lib/AWING/Directory/CreateDirectory.js

@@ -75,12 +75,12 @@ var CreateDirectory = function (props) {
             .directoriesPost(newDirectory)
             .then(function () { return ClassicDrawer_1.CloseAction.ReloadDirectory; });
     };
-    return ((0, jsx_runtime_1.jsx)(ClassicDrawer_1.default, { title: t('DirectoryManagement.CreateDirectory'), onSubmit: handleSubmit, disableButtonSubmit: !isValid, confirmExit: confirmExit, childrenWrapperStyle: { padding: 0 }, children: loading ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsx)(AWING_1.DataForm, { onUpdate: handleUpdate, fields: [
+    return ((0, jsx_runtime_1.jsx)(ClassicDrawer_1.default, { title: t('DirectoryManagement.CreateDirectory'), onSubmit: handleSubmit, disableButtonSubmit: !(isValid && newDirectory.order && newDirectory.name), confirmExit: confirmExit, childrenWrapperStyle: { padding: 0 }, children: loading ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsx)(AWING_1.DataForm, { onUpdate: handleUpdate, fields: [
                 {
                     fieldName: 'parentDirectoryId',
                     type: 'select',
-                    label: t('DirectoryManagement.ParentDirectory'),
                     required: true,
+                    label: t('DirectoryManagement.ParentDirectory'),
                     options: directories.map(function (directory) { return ({
                         value: directory.directoryId,
                         text: directory.name,

package/lib/translate/en/translation.json

@@ -132,6 +132,10 @@
         "All": "All",
         "TotalSelected": "Total selected"
     },
+    "InvalidMessage": {
+        "InvalidNotExistedUsername": "Username is invalid or not existed",
+        "InvalidAccountConnected": "Account has been added to this domain!"
+    },
     "ViewTemplate": {
         "Value": "Value",
         "StaticUseFormat": "To use uploaded resources, use format",

package/lib/translate/vi/translation.json

@@ -119,6 +119,10 @@
         "InvalidLength": "Độ dài chuỗi không hợp lệ",
         "RequestHasApprove": "Yêu cầu đã được thay đổi"
     },
+    "InvalidMessage": {
+        "InvalidNotExistedUsername": "Tài khoản không tồn tại",
+        "InvalidAccountConnected": "Tài khoản đã được gắn vào domain này rồi!"
+    },
     "User": {
         "Username": "Tài khoản",
         "Password": "Mật khẩu",

package/package.json

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