self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-23 18:53:36 +02:00
Code Issues Releases Activity

Desktop: Resolves #8493: Draw red border around missing encryption key passwords (#8636)

Browse Source
This commit is contained in:
Henry Heino 2023-08-10 02:45:45 -07:00 committed by GitHub
parent 950b16370f
commit bce18a1614
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx
View File

@ -94,6 +94,12 @@ const EncryptionConfigScreen = (props: Props) => {
borderColor: theme.dividerColor, borderColor: theme.dividerColor,
}; };
const missingPasswordCellStyle = {
...theme.textStyle,
border: '3px solid',
borderColor: theme.colorError,
};
const password = inputPasswords[mk.id] ? inputPasswords[mk.id] : ''; const password = inputPasswords[mk.id] ? inputPasswords[mk.id] : '';
const isActive = props.activeMasterKeyId === mk.id; const isActive = props.activeMasterKeyId === mk.id;
const activeIcon = isActive ? '✔' : ''; const activeIcon = isActive ? '✔' : '';
@ -108,8 +114,15 @@ const EncryptionConfigScreen = (props: Props) => {
); );
} else { } else {
return ( return (
<td style={theme.textStyle}> <td style={missingPasswordCellStyle}>
<input type="password" style={passwordStyle} value={password} onChange={event => onInputPasswordChange(mk, event.target.value)} />{' '} <input
type="password"
placeholder={_('Enter password')}
style={passwordStyle}
value={password}
onChange={event => onInputPasswordChange(mk, event.target.value)}
/>
{' '}
<button style={theme.buttonStyle} onClick={() => onSavePasswordClick(mk, { ...props.passwords, ...inputPasswords })}> <button style={theme.buttonStyle} onClick={() => onSavePasswordClick(mk, { ...props.passwords, ...inputPasswords })}>
{_('Save')} {_('Save')}
</button> </button>