diff --git a/src/components/adminPage/users/userIsActive.tsx b/src/components/adminPage/users/userIsActive.tsx index ad20e066..17352490 100644 --- a/src/components/adminPage/users/userIsActive.tsx +++ b/src/components/adminPage/users/userIsActive.tsx @@ -64,64 +64,51 @@ const UserIsActive = ({ user }: Iuser) => { }); return ( -
-
-
- {t("users.users.userOptionModal.userAccountLabel")} -
- -
-
-

{t("users.users.userOptionModal.userExpireLabel")}

-
- +
+

+ {t("users.users.userOptionModal.account.title")} +

+
+
+
+ {t("users.users.userOptionModal.account.userAccountLabel")} +
+ +
+
+

+ {t("users.users.userOptionModal.account.userExpireLabel")} +

+
+ updateUser( { id: user?.id, - params: { expiresAt: null }, + params: { expiresAt: date }, }, { onSuccess: () => { @@ -130,10 +117,30 @@ const UserIsActive = ({ user }: Iuser) => { }, ) } - > - Reset - - ) : null} + calendarContainer={DateContainer} + customInput={} + /> + {user.expiresAt ? ( + + ) : null} +
diff --git a/src/locales/en/common.json b/src/locales/en/common.json index c1efa1e4..376ad9fd 100644 --- a/src/locales/en/common.json +++ b/src/locales/en/common.json @@ -367,8 +367,11 @@ "userOptionModal": { "userGroupLabel": "User Group", "userRoleLabel": "User Role", - "userAccountLabel": "Account Status", - "userExpireLabel": "Account Expiration", + "account": { + "title": "ZTNet performs a daily check for expired users. If a user is found to be expired, all associated peers will be de-authorized, and the user's account will be deactivated.", + "userAccountLabel": "Account Status", + "userExpireLabel": "Account Expiration" + }, "userActionsLabel": "User Actions", "typeUserName": "Type the name of the user.", "buttons": { diff --git a/src/locales/es/common.json b/src/locales/es/common.json index 38d0df5f..e95b5d92 100644 --- a/src/locales/es/common.json +++ b/src/locales/es/common.json @@ -367,8 +367,11 @@ "userOptionModal": { "userGroupLabel": "Grupo de usuarios", "userRoleLabel": "Rol de usuario", - "userAccountLabel": "Cuenta de usuario", - "userExpireLabel": "Expirar usuario", + "account": { + "title": "ZTNet realiza una revisión diaria para encontrar usuarios expirados. Si se encuentra que un usuario ha expirado, todos los pares asociados serán desautorizados y la cuenta del usuario se desactivará.", + "userAccountLabel": "Estado de la Cuenta", + "userExpireLabel": "Expiración de la Cuenta" + }, "userActionsLabel": "Acciones del usuario", "typeUserName": "Escribe el nombre del usuario.", "buttons": { diff --git a/src/locales/no/common.json b/src/locales/no/common.json index b489cfa6..dbdb44e7 100644 --- a/src/locales/no/common.json +++ b/src/locales/no/common.json @@ -367,8 +367,11 @@ "userOptionModal": { "userGroupLabel": "Brukergruppe", "userRoleLabel": "Brukerrolle", - "userAccountLabel": "Brukerkonto", - "userExpireLabel": "Utløpsdato", + "account": { + "title": "ZTNet utfører en daglig sjekk for utløpte brukere. Hvis en bruker blir funnet å ha utløpt, vil alle tilknyttede noder bli deautorisert, og brukerens konto vil bli deaktivert.", + "userAccountLabel": "Kontostatus", + "userExpireLabel": "Konto Utløp" + }, "userActionsLabel": "Brukerhandlinger", "typeUserName": "Skriv inn brukerens navn.", "buttons": { diff --git a/src/locales/zh/common.json b/src/locales/zh/common.json index 54253eaf..3bc83feb 100644 --- a/src/locales/zh/common.json +++ b/src/locales/zh/common.json @@ -367,8 +367,11 @@ "userOptionModal": { "userGroupLabel": "用户组", "userRoleLabel": "用户角色", - "userAccountLabel": "用户帐户", - "userExpireLabel": "用户过期", + "account": { + "title": "ZTNet 每天进行一次检查,查找是否有用户已过期。如果发现用户已过期,所有相关的节点将被取消授权,用户帐户将被停用。", + "userAccountLabel": "账户状态", + "userExpireLabel": "账户到期" + }, "userActionsLabel": "用户操作", "typeUserName": "输入用户的名称。", "buttons": {