IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web: People: refactoring

Browse Source
This commit is contained in:
Viktor Fomin 2021-05-20 02:09:49 +03:00
parent ece8fcaabb
commit 0a5662220c
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
products/ASC.People/Client/src/components/dialogs/BackupCodesDialog/index.js
View File

@ -52,17 +52,9 @@ class BackupCodesDialogComponent extends React.Component {
render() { render() {
//console.log("Render BackupCodesDialog"); //console.log("Render BackupCodesDialog");
const { backupCodes } = this.state; const { backupCodes } = this.state;
const { t, visible, onClose } = this.props; const { t, visible, onClose, backupCodesCount } = this.props;
let count = 0; let count = 0;
if (backupCodes.length > 0) {
backupCodes.map((item) => {
if (!item.isUsed) {
count++;
}
});
}
return ( return (
<ModalDialogContainer visible={visible} onClose={onClose}> <ModalDialogContainer visible={visible} onClose={onClose}>
<ModalDialog.Header>{t("BackupCodesTitle")}</ModalDialog.Header> <ModalDialog.Header>{t("BackupCodesTitle")}</ModalDialog.Header>
@ -77,10 +69,10 @@ class BackupCodesDialogComponent extends React.Component {
t={t} t={t}
i18nKey="CodesCounter" i18nKey="CodesCounter"
ns="BackupCodesDialog" ns="BackupCodesDialog"
count={count} count={backupCodesCount}
> >
<Text className="text-dialog"> <Text className="text-dialog">
<strong>{{ count }} codes:</strong> <strong>{{ count: backupCodesCount }} codes:</strong>
</Text> </Text>
</Trans> </Trans>
<Text className="text-dialog" isBold={true}> <Text className="text-dialog" isBold={true}>
@ -128,6 +120,7 @@ BackupCodesDialog.propTypes = {
onClose: PropTypes.func.isRequired, onClose: PropTypes.func.isRequired,
getBackupCodes: PropTypes.func.isRequired, getBackupCodes: PropTypes.func.isRequired,
getNewBackupCodes: PropTypes.func.isRequired, getNewBackupCodes: PropTypes.func.isRequired,
backupCodesCount: PropTypes.number.isRequired,
}; };
export default BackupCodesDialog; export default BackupCodesDialog;

11
products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
View File

@ -331,12 +331,12 @@ class SectionBodyContent extends React.PureComponent {
const infoContacts = contacts && createContacts(contacts.contact); const infoContacts = contacts && createContacts(contacts.contact);
//const isSelf = isMe(viewer, profile.userName); //const isSelf = isMe(viewer, profile.userName);
let count = 0; let backupCodesCount = 0;
if (backupCodes && backupCodes.length > 0) { if (backupCodes && backupCodes.length > 0) {
backupCodes.map((item) => { backupCodes.map((item) => {
if (!item.isUsed) { if (!item.isUsed) {
count++; backupCodesCount++;
} }
}); });
} }
@ -425,9 +425,11 @@ class SectionBodyContent extends React.PureComponent {
t={t} t={t}
i18nKey="CountCodesRemaining" i18nKey="CountCodesRemaining"
ns="Profile" ns="Profile"
count={count} count={backupCodesCount}
> >
<Text color="#A3A9AE">({{ count }} codes remaining)</Text> <Text color="#A3A9AE">
({{ count: backupCodesCount }} codes remaining)
</Text>
</Trans> </Trans>
</LinkActionWrapper> </LinkActionWrapper>
</ToggleContent> </ToggleContent>
@ -468,6 +470,7 @@ class SectionBodyContent extends React.PureComponent {
onClose={this.toggleBackupCodesDialogVisible} onClose={this.toggleBackupCodesDialogVisible}
getBackupCodes={this.props.getBackupCodes} getBackupCodes={this.props.getBackupCodes}
getNewBackupCodes={this.props.getNewBackupCodes} getNewBackupCodes={this.props.getNewBackupCodes}
backupCodesCount={backupCodesCount}
/> />
)} )}
</ProfileWrapper> </ProfileWrapper>