Page MenuHomePhabricator
Differential D3840

[web] Push `accountPassword` state and related functionality down to `ThreadSettingsDeleteTab`
ClosedPublic
Actions

Authored by atul on Apr 25 2022, 11:38 AM.
Tags
None
Referenced Files
F5105538: D3840.id12085.diff
Tue, Apr 1, 7:42 AM
Unknown Object (File)
Mon, Mar 31, 5:10 PM
Unknown Object (File)
Mon, Mar 31, 8:18 AM
Unknown Object (File)
Sun, Mar 30, 9:09 PM
Unknown Object (File)
Sun, Mar 30, 12:55 PM
Unknown Object (File)
Sat, Mar 29, 5:29 AM
Unknown Object (File)
Fri, Mar 28, 3:31 AM
Unknown Object (File)
Fri, Mar 28, 2:12 AM
View All Files
Subscribers
• abosh
• adrian
ashoat
• karol

Details

Reviewers
• jacek
tomek
Commits
rCOMMe9ae786729d6: [web] Push `accountPassword` state and related functionality down to…
Summary

We don't need to be holding onto this state in the parent component and passing it down to ThreadSettingsDeleteTab as a prop.

Depends on D3838

Test Plan

Careful reading, just drag and drop

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

atul created this revision.Apr 25 2022, 11:38 AM
Herald added subscribers: • abosh, • karol, • adrian, ashoat. · View Herald TranscriptApr 25 2022, 11:38 AM
Harbormaster returned this revision to the author for changes because remote builds failed.Apr 25 2022, 11:38 AM
Harbormaster failed remote builds in B8527: Diff 11886!
Harbormaster completed remote builds in B8527: Diff 11886.Apr 25 2022, 11:43 AM
atul requested review of this revision.Apr 25 2022, 11:43 AM
atul added a child revision: D3842: [web] Push `changeThreadSettingsAction` down to `ThreadSettingsGeneralTab`.Apr 25 2022, 12:39 PM
tomek accepted this revision.Apr 26 2022, 8:54 AM
tomek added inline comments.
web/modals/threads/thread-settings-modal.react.js
151 ↗(On Diff #11886)

Please make sure that after failing to submit the changes, and opening delete tab, the input is cleared.

This revision is now accepted and ready to land.Apr 26 2022, 8:54 AM
atul updated this revision to Diff 11954.Apr 26 2022, 10:46 AM

rebase

Harbormaster completed remote builds in B8575: Diff 11954.Apr 26 2022, 10:52 AM
atul updated this revision to Diff 12085.Apr 28 2022, 2:33 PM

rebase before landing

Harbormaster completed remote builds in B8678: Diff 12085.Apr 28 2022, 2:37 PM
Closed by commit rCOMMe9ae786729d6: [web] Push `accountPassword` state and related functionality down to… (authored by atul). · Explain WhyApr 28 2022, 2:43 PM
This revision was automatically updated to reflect the committed changes.
atul added a commit: rCOMMe9ae786729d6: [web] Push `accountPassword` state and related functionality down to….

Revision Contents
Changeset List

Diff 12086

View Options

web/modals/threads/thread-settings-delete-tab.react.js

Show All 36 Lines const {
threadInfo, threadInfo,
setErrorMessage, setErrorMessage,
} = props; } = props;
const modalContext = useModalContext(); const modalContext = useModalContext();
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const callDeleteThread = useServerCall(deleteThread); const callDeleteThread = useServerCall(deleteThread);
const accountPasswordInputRef = React.useRef();
const deleteThreadAction = React.useCallback(async () => { const deleteThreadAction = React.useCallback(async () => {
try { try {
const response = await callDeleteThread(threadInfo.id, accountPassword); const response = await callDeleteThread(threadInfo.id, accountPassword);
modalContext.clearModal(); modalContext.clearModal();
return response; return response;
} catch (e) { } catch (e) {
setErrorMessage( setErrorMessage(
e.message === 'invalid_credentials' ? 'wrong password' : 'unkown error', e.message === 'invalid_credentials' ? 'wrong password' : 'unkown error',
); );
setAccountPassword(''); setAccountPassword('');
// TODO: accountPasswordInput.focus() accountPasswordInputRef.current?.focus();
// (once ref is moved up to functional component)
throw e; throw e;
} }
}, [ }, [
accountPassword, accountPassword,
callDeleteThread, callDeleteThread,
modalContext, modalContext,
setAccountPassword, setAccountPassword,
setErrorMessage, setErrorMessage,
Show All 23 Lines <>
<div className={css.form_title}>Account password</div> <div className={css.form_title}>Account password</div>
<div className={css.form_content}> <div className={css.form_content}>
<input <input
type="password" type="password"
placeholder="Personal account password" placeholder="Personal account password"
value={accountPassword} value={accountPassword}
onChange={onChangeAccountPassword} onChange={onChangeAccountPassword}
disabled={inputDisabled} disabled={inputDisabled}
ref={accountPasswordInputRef}
/> />
</div> </div>
</div> </div>
<Button onClick={onDelete} variant="danger" disabled={inputDisabled}> <Button onClick={onDelete} variant="danger" disabled={inputDisabled}>
Delete Delete
</Button> </Button>
</> </>
); );
} }
export default ThreadSettingsDeleteTab; export default ThreadSettingsDeleteTab;
View Options

web/modals/threads/thread-settings-modal.react.js

Show All 36 Lines const {
threadInfo, threadInfo,
setErrorMessage, setErrorMessage,
} = props; } = props;
const modalContext = useModalContext(); const modalContext = useModalContext();
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const callDeleteThread = useServerCall(deleteThread); const callDeleteThread = useServerCall(deleteThread);
const accountPasswordInputRef = React.useRef();
const deleteThreadAction = React.useCallback(async () => { const deleteThreadAction = React.useCallback(async () => {
try { try {
const response = await callDeleteThread(threadInfo.id, accountPassword); const response = await callDeleteThread(threadInfo.id, accountPassword);
modalContext.clearModal(); modalContext.clearModal();
return response; return response;
} catch (e) { } catch (e) {
setErrorMessage( setErrorMessage(
e.message === 'invalid_credentials' ? 'wrong password' : 'unkown error', e.message === 'invalid_credentials' ? 'wrong password' : 'unkown error',
); );
setAccountPassword(''); setAccountPassword('');
// TODO: accountPasswordInput.focus() accountPasswordInputRef.current?.focus();
// (once ref is moved up to functional component)
throw e; throw e;
} }
}, [ }, [
accountPassword, accountPassword,
callDeleteThread, callDeleteThread,
modalContext, modalContext,
setAccountPassword, setAccountPassword,
setErrorMessage, setErrorMessage,
Show All 23 Lines <>
<div className={css.form_title}>Account password</div> <div className={css.form_title}>Account password</div>
<div className={css.form_content}> <div className={css.form_content}>
<input <input
type="password" type="password"
placeholder="Personal account password" placeholder="Personal account password"
value={accountPassword} value={accountPassword}
onChange={onChangeAccountPassword} onChange={onChangeAccountPassword}
disabled={inputDisabled} disabled={inputDisabled}
ref={accountPasswordInputRef}
/> />
</div> </div>
</div> </div>
<Button onClick={onDelete} variant="danger" disabled={inputDisabled}> <Button onClick={onDelete} variant="danger" disabled={inputDisabled}>
Delete Delete
</Button> </Button>
</> </>
); );
} }
export default ThreadSettingsDeleteTab; export default ThreadSettingsDeleteTab;