122638 fix json password-reset-modal

apps/app/public/static/locales/en_US/admin.json

@@ -758,7 +758,8 @@
       "send_new_password": "Please send the new password to the user.",
       "target_user": "Target User",
       "new_password": "New Password",
-      "send_password_email": "Send the password to user"
+      "send_password_email": "Send the password to user",
+      "mail_setting_link":"<i class='icon-settings mr-2'></i><a href='/admin/app'>Email settings</a>"
     },
     "external_account": "External Account Management",
     "external_accounts":"External accounts",

apps/app/public/static/locales/ja_JP/admin.json

@@ -766,7 +766,8 @@
       "send_new_password": "新規発行したパスワードを、対象ユーザーへ連絡してください。",
       "target_user": "対象ユーザー",
       "new_password": "新しいパスワード",
-      "send_password_email": "メールを送信する"
+      "send_password_email": "メールを送信する",
+      "mail_setting_link": "<i class='icon-settings mr-2'></i><a href='/admin/app'>メールの設定</a>"
     },
     "external_account": "外部アカウントの管理",
     "external_accounts": "外部アカウント",

apps/app/public/static/locales/zh_CN/admin.json

@@ -766,7 +766,8 @@
       "send_new_password": "Please send the new password to the user.",
       "target_user": "Target User",
       "new_password": "New Password",
-      "send_password_email": "Send the password to user"
+      "send_password_email": "Send the password to user",
+      "mail_setting_link":"<i class='icon-settings mr-2'></i><a href='/admin/app'>Email settings</a>"
     },
     "external_account": "外部账户管理",
     "external_accounts": "外部账户",

apps/app/src/components/Admin/Users/PasswordResetModal.jsx

@@ -31,8 +31,7 @@ class PasswordResetModal extends React.Component {
     const { t, userForPasswordResetModal } = this.props;
     try {
       const res = await apiv3Put('/users/reset-password', { id: userForPasswordResetModal._id });
-      const { newPassword } = res.data;
-      const { failedToSendEmail } = res.data;
+      const { newPassword, failedToSendEmail } = res.data;
       if (failedToSendEmail == null) {
         const msg = `Email has been sent<br>・${userForPasswordResetModal.email}`;
         toastSuccess(msg);
@@ -98,7 +97,7 @@ class PasswordResetModal extends React.Component {
           </label>
           {isMailerSetup
             // eslint-disable-next-line react/no-danger
-            ? <p className="form-text text-muted" dangerouslySetInnerHTML={{ __html: t('admin:user_management.invite_modal.mail_setting_link') }} />
+            ? <p className="form-text text-muted" dangerouslySetInnerHTML={{ __html: t('admin:user_management.reset_password_modal.mail_setting_link') }} />
             // eslint-disable-next-line react/no-danger
             : <p className="form-text text-muted" dangerouslySetInnerHTML={{ __html: t('admin:mailer_setup_required') }} />
           }
@@ -113,8 +112,7 @@ class PasswordResetModal extends React.Component {
   }
 
   returnModalFooterAfterReset() {
-    const { t, isMailerSetup } = this.props;
-    const { isCreateUserButtonPushed } = this.state;
+    const { t } = this.props;
 
     return (
       <button type="submit" className="btn btn-primary" onClick={this.props.onClose}>