Page MenuHomePhabricator
Differential D8236

[keyserver] Return invite links in initial web state
ClosedPublic
Actions

Authored by tomek on Jun 16 2023, 4:21 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 15, 5:59 PM
Unknown Object (File)
Thu, Mar 6, 5:07 PM
Unknown Object (File)
Thu, Mar 6, 5:07 PM
Unknown Object (File)
Thu, Mar 6, 5:07 PM
Unknown Object (File)
Thu, Mar 6, 5:00 PM
Unknown Object (File)
Feb 20 2025, 4:30 AM
Unknown Object (File)
Feb 20 2025, 4:22 AM
Unknown Object (File)
Feb 13 2025, 10:16 AM
View All Files
Subscribers
ashoat

Details

Reviewers
bartek
kamil
inka
michal
Commits
rCOMM79342e60cd2b: [keyserver] Return invite links in initial web state
Summary

When we return initial redux state, we should include invite links which the viewer can use.

The stack contains the implementation of https://linear.app/comm/issue/ENG-3930/accessing-invite-links-non-admin-users-web.

Test Plan

Open web app and check if the links are included in initial redux state.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
keyserver/
src/
responders/
19 lines
lib/
types/
9 lines

Diff 28104

View Options

keyserver/src/responders/website-responders.js

Show First 20 Lines • Show All 91 Lines • ▼ Show 20 Linestype Props = {
+currentTabType: TabType, +currentTabType: TabType,
+setCurrentTabType: SetState<TabType>, +setCurrentTabType: SetState<TabType>,
+queuedChanges: ThreadChanges, +queuedChanges: ThreadChanges,
+setQueuedChanges: SetState<ThreadChanges>, +setQueuedChanges: SetState<ThreadChanges>,
+namePlaceholder: string, +namePlaceholder: string,
+changeQueued: boolean, +changeQueued: boolean,
+setTab: (tabType: TabType) => void, +setTab: (tabType: TabType) => void,
+onChangeName: (event: SyntheticEvent<HTMLInputElement>) => void, +onChangeName: (event: SyntheticEvent<HTMLInputElement>) => void,
+onChangeDescription: (event: SyntheticEvent<HTMLTextAreaElement>) => void,
}; };
class ThreadSettingsModal extends React.PureComponent<Props> { class ThreadSettingsModal extends React.PureComponent<Props> {
nameInput: ?HTMLInputElement; nameInput: ?HTMLInputElement;
accountPasswordInput: ?HTMLInputElement; accountPasswordInput: ?HTMLInputElement;
constructor(props: Props) { constructor(props: Props) {
super(props); super(props);
} }
▲ Show 20 Lines • Show All 59 Lines • ▼ Show 20 Lines if (this.props.currentTabType === 'general') {
mainContent = ( mainContent = (
<ThreadSettingsGeneralTab <ThreadSettingsGeneralTab
threadNameValue={firstLine(this.possiblyChangedValue('name'))} threadNameValue={firstLine(this.possiblyChangedValue('name'))}
threadNamePlaceholder={this.props.namePlaceholder} threadNamePlaceholder={this.props.namePlaceholder}
threadNameOnChange={this.props.onChangeName} threadNameOnChange={this.props.onChangeName}
threadNameDisabled={inputDisabled} threadNameDisabled={inputDisabled}
threadNameInputRef={this.nameInputRef} threadNameInputRef={this.nameInputRef}
threadDescriptionValue={this.possiblyChangedValue('description')} threadDescriptionValue={this.possiblyChangedValue('description')}
threadDescriptionOnChange={this.onChangeDescription} threadDescriptionOnChange={this.props.onChangeDescription}
threadDescriptionDisabled={inputDisabled} threadDescriptionDisabled={inputDisabled}
threadColorCurrentColor={this.possiblyChangedValue('color')} threadColorCurrentColor={this.possiblyChangedValue('color')}
threadColorOnColorSelection={this.onChangeColor} threadColorOnColorSelection={this.onChangeColor}
/> />
); );
} else if (this.props.currentTabType === 'privacy') { } else if (this.props.currentTabType === 'privacy') {
mainContent = ( mainContent = (
<ThreadSettingsPrivacyTab <ThreadSettingsPrivacyTab
▲ Show 20 Lines • Show All 102 Lines • ▼ Show 20 Linesclass ThreadSettingsModal extends React.PureComponent<Props> {
nameInputRef = (nameInput: ?HTMLInputElement) => { nameInputRef = (nameInput: ?HTMLInputElement) => {
this.nameInput = nameInput; this.nameInput = nameInput;
}; };
accountPasswordInputRef = (accountPasswordInput: ?HTMLInputElement) => { accountPasswordInputRef = (accountPasswordInput: ?HTMLInputElement) => {
this.accountPasswordInput = accountPasswordInput; this.accountPasswordInput = accountPasswordInput;
}; };
onChangeDescription = (event: SyntheticEvent<HTMLTextAreaElement>) => {
const target = event.currentTarget;
const newValue =
target.value !== this.props.threadInfo.description
? target.value
: undefined;
this.props.setQueuedChanges({
...this.props.queuedChanges,
description: newValue,
});
};
onChangeColor = (color: string) => { onChangeColor = (color: string) => {
const newValue = color !== this.props.threadInfo.color ? color : undefined; const newValue = color !== this.props.threadInfo.color ? color : undefined;
this.props.setQueuedChanges({ this.props.setQueuedChanges({
...this.props.queuedChanges, ...this.props.queuedChanges,
color: newValue, color: newValue,
}); });
}; };
▲ Show 20 Lines • Show All 128 Lines • ▼ Show 20 Lines const onChangeName = React.useCallback(
name: firstLine( name: firstLine(
target.value !== threadInfo.name ? target.value : undefined, target.value !== threadInfo.name ? target.value : undefined,
), ),
}); });
}, },
[queuedChanges, threadInfo], [queuedChanges, threadInfo],
); );
const onChangeDescription = React.useCallback(
(event: SyntheticEvent<HTMLTextAreaElement>) => {
invariant(threadInfo, 'threadInfo should exist in onChangeDescription');
const target = event.currentTarget;
setQueuedChanges({
...queuedChanges,
description:
target.value !== threadInfo.description ? target.value : undefined,
});
},
[queuedChanges, threadInfo],
);
if (!threadInfo) { if (!threadInfo) {
return ( return (
<Modal onClose={modalContext.clearModal} name="Invalid thread"> <Modal onClose={modalContext.clearModal} name="Invalid thread">
<div className={css.modal_body}> <div className={css.modal_body}>
<p>You no longer have permission to view this thread</p> <p>You no longer have permission to view this thread</p>
</div> </div>
</Modal> </Modal>
); );
Show All 17 Lines return (
currentTabType={currentTabType} currentTabType={currentTabType}
setCurrentTabType={setCurrentTabType} setCurrentTabType={setCurrentTabType}
queuedChanges={queuedChanges} queuedChanges={queuedChanges}
setQueuedChanges={setQueuedChanges} setQueuedChanges={setQueuedChanges}
namePlaceholder={namePlaceholder} namePlaceholder={namePlaceholder}
changeQueued={changeQueued} changeQueued={changeQueued}
setTab={setTab} setTab={setTab}
onChangeName={onChangeName} onChangeName={onChangeName}
onChangeDescription={onChangeDescription}
/> />
); );
}, },
); );
export default ConnectedThreadSettingsModal; export default ConnectedThreadSettingsModal;
View Options

lib/types/link-types.js

Show First 20 Lines • Show All 91 Lines • ▼ Show 20 Linestype Props = {
+currentTabType: TabType, +currentTabType: TabType,
+setCurrentTabType: SetState<TabType>, +setCurrentTabType: SetState<TabType>,
+queuedChanges: ThreadChanges, +queuedChanges: ThreadChanges,
+setQueuedChanges: SetState<ThreadChanges>, +setQueuedChanges: SetState<ThreadChanges>,
+namePlaceholder: string, +namePlaceholder: string,
+changeQueued: boolean, +changeQueued: boolean,
+setTab: (tabType: TabType) => void, +setTab: (tabType: TabType) => void,
+onChangeName: (event: SyntheticEvent<HTMLInputElement>) => void, +onChangeName: (event: SyntheticEvent<HTMLInputElement>) => void,
+onChangeDescription: (event: SyntheticEvent<HTMLTextAreaElement>) => void,
}; };
class ThreadSettingsModal extends React.PureComponent<Props> { class ThreadSettingsModal extends React.PureComponent<Props> {
nameInput: ?HTMLInputElement; nameInput: ?HTMLInputElement;
accountPasswordInput: ?HTMLInputElement; accountPasswordInput: ?HTMLInputElement;
constructor(props: Props) { constructor(props: Props) {
super(props); super(props);
} }
▲ Show 20 Lines • Show All 59 Lines • ▼ Show 20 Lines if (this.props.currentTabType === 'general') {
mainContent = ( mainContent = (
<ThreadSettingsGeneralTab <ThreadSettingsGeneralTab
threadNameValue={firstLine(this.possiblyChangedValue('name'))} threadNameValue={firstLine(this.possiblyChangedValue('name'))}
threadNamePlaceholder={this.props.namePlaceholder} threadNamePlaceholder={this.props.namePlaceholder}
threadNameOnChange={this.props.onChangeName} threadNameOnChange={this.props.onChangeName}
threadNameDisabled={inputDisabled} threadNameDisabled={inputDisabled}
threadNameInputRef={this.nameInputRef} threadNameInputRef={this.nameInputRef}
threadDescriptionValue={this.possiblyChangedValue('description')} threadDescriptionValue={this.possiblyChangedValue('description')}
threadDescriptionOnChange={this.onChangeDescription} threadDescriptionOnChange={this.props.onChangeDescription}
threadDescriptionDisabled={inputDisabled} threadDescriptionDisabled={inputDisabled}
threadColorCurrentColor={this.possiblyChangedValue('color')} threadColorCurrentColor={this.possiblyChangedValue('color')}
threadColorOnColorSelection={this.onChangeColor} threadColorOnColorSelection={this.onChangeColor}
/> />
); );
} else if (this.props.currentTabType === 'privacy') { } else if (this.props.currentTabType === 'privacy') {
mainContent = ( mainContent = (
<ThreadSettingsPrivacyTab <ThreadSettingsPrivacyTab
▲ Show 20 Lines • Show All 102 Lines • ▼ Show 20 Linesclass ThreadSettingsModal extends React.PureComponent<Props> {
nameInputRef = (nameInput: ?HTMLInputElement) => { nameInputRef = (nameInput: ?HTMLInputElement) => {
this.nameInput = nameInput; this.nameInput = nameInput;
}; };
accountPasswordInputRef = (accountPasswordInput: ?HTMLInputElement) => { accountPasswordInputRef = (accountPasswordInput: ?HTMLInputElement) => {
this.accountPasswordInput = accountPasswordInput; this.accountPasswordInput = accountPasswordInput;
}; };
onChangeDescription = (event: SyntheticEvent<HTMLTextAreaElement>) => {
const target = event.currentTarget;
const newValue =
target.value !== this.props.threadInfo.description
? target.value
: undefined;
this.props.setQueuedChanges({
...this.props.queuedChanges,
description: newValue,
});
};
onChangeColor = (color: string) => { onChangeColor = (color: string) => {
const newValue = color !== this.props.threadInfo.color ? color : undefined; const newValue = color !== this.props.threadInfo.color ? color : undefined;
this.props.setQueuedChanges({ this.props.setQueuedChanges({
...this.props.queuedChanges, ...this.props.queuedChanges,
color: newValue, color: newValue,
}); });
}; };
▲ Show 20 Lines • Show All 128 Lines • ▼ Show 20 Lines const onChangeName = React.useCallback(
name: firstLine( name: firstLine(
target.value !== threadInfo.name ? target.value : undefined, target.value !== threadInfo.name ? target.value : undefined,
), ),
}); });
}, },
[queuedChanges, threadInfo], [queuedChanges, threadInfo],
); );
const onChangeDescription = React.useCallback(
(event: SyntheticEvent<HTMLTextAreaElement>) => {
invariant(threadInfo, 'threadInfo should exist in onChangeDescription');
const target = event.currentTarget;
setQueuedChanges({
...queuedChanges,
description:
target.value !== threadInfo.description ? target.value : undefined,
});
},
[queuedChanges, threadInfo],
);
if (!threadInfo) { if (!threadInfo) {
return ( return (
<Modal onClose={modalContext.clearModal} name="Invalid thread"> <Modal onClose={modalContext.clearModal} name="Invalid thread">
<div className={css.modal_body}> <div className={css.modal_body}>
<p>You no longer have permission to view this thread</p> <p>You no longer have permission to view this thread</p>
</div> </div>
</Modal> </Modal>
); );
Show All 17 Lines return (
currentTabType={currentTabType} currentTabType={currentTabType}
setCurrentTabType={setCurrentTabType} setCurrentTabType={setCurrentTabType}
queuedChanges={queuedChanges} queuedChanges={queuedChanges}
setQueuedChanges={setQueuedChanges} setQueuedChanges={setQueuedChanges}
namePlaceholder={namePlaceholder} namePlaceholder={namePlaceholder}
changeQueued={changeQueued} changeQueued={changeQueued}
setTab={setTab} setTab={setTab}
onChangeName={onChangeName} onChangeName={onChangeName}
onChangeDescription={onChangeDescription}
/> />
); );
}, },
); );
export default ConnectedThreadSettingsModal; export default ConnectedThreadSettingsModal;