services/identity/src/database.rs
30 ↗	(On Diff #11904)	This should probably be a const, will fix
40 ↗	(On Diff #11904)	This string slice should be a const too
70 ↗	(On Diff #11904)	Defaulting to us-east-2 for now, since this is where all our tables are currently. We can revise this later to fetch the region from config
services/identity/src/service.rs
18 ↗	(On Diff #11904)	The Rusoto `DynamoDbClient` doesn't implement `Debug` so we can't derive `Debug` for `MyIdentityService`
29 ↗	(On Diff #11904)	Instruments a function to create and enter a tracing span every time the function is called. We skip self since we don't have a Debug implementation for it currently

varun added inline comments.Apr 25 2022, 9:27 PM

services/identity/src/database.rs
23 ↗	(On Diff #11904)	this string slice should be a const too

• karol added inline comments.Apr 26 2022, 2:44 AM

services/identity/src/database.rs
5 ↗	(On Diff #11904)	do we use `DynamoDb`?
15 ↗	(On Diff #11904)	so this `new` method is just a convention, right?
25–26 ↗	(On Diff #11904)	can you explain what these do?
32 ↗	(On Diff #11904)	so this means that `consistent_read` is of type `Option<bool>` and we just want to set its value to true, right?
33 ↗	(On Diff #11904)	So that uses default values for the rest of the fields of `GetItemInput`? And this is done by `impl Default for ...`?
38 ↗	(On Diff #11904)	What does this mean? What is `item` inside of `Some`?
40 ↗	(On Diff #11904)	shouldn't we use a better name than `b`?

Shouldn't @jimpo be a blocker reviewer for every identity diff since he was pointed out as one of two devs in the team who knows rust well (next to @varun)?

This diff is rather big - is there a way to split it somehow? It also looks like the diff does at least two things: we also add some instrumentation, which probably can stand on its own (correct me if I'm wrong).

@karol-bisztyga you can request changes even if it's just for the clarification. Also, when you think someone should be a blocking reviewer, you should add them.

This revision now requires changes to proceed.Apr 26 2022, 11:15 AM

Splitting diff up, addressing feedback

In D3853#107224, @palys-swm wrote:

This diff is rather big - is there a way to split it somehow? It also looks like the diff does at least two things: we also add some instrumentation, which probably can stand on its own (correct me if I'm wrong).

@karol-bisztyga you can request changes even if it's just for the clarification. Also, when you think someone should be a blocking reviewer, you should add them.

Yeah, the tracing instrumentation should be in its own diff. I'm moving the get_pake_registration method to a separate diff. cargo emits warnings if code is unused, so I was trying to avoid that, but it's not a big deal.

services/identity/src/database.rs
5 ↗	(On Diff #11904)	Yeah, `DynamoDb` is a trait implemented by `DynamoDbClient`, but the trait impl is only available if we import it. We need this implementation to call `get_item()`
15 ↗	(On Diff #11904)	Yeah it's just a constructor. We can name it anything, new is just the norm
25–26 ↗	(On Diff #11904)	`AttributeValue` represents the data for an attribute. `userID` is a string so we set the `s` field to the user_id String and then set the rest to their defaults (`None`)
32 ↗	(On Diff #11904)	correct
33 ↗	(On Diff #11904)	correct
38 ↗	(On Diff #11904)	I'm checking if the `item` field, which is an `Option<HashMap<String, AttributeValue>>`, is the `Some` variant, and then assigning the `HashMap` to a variable named `item` so I can use it on line 40.
40 ↗	(On Diff #11904)	Yeah, fair enough. I'll make it `bytes` or something

Harbormaster completed remote builds in B8784: Diff 12231.May 4 2022, 11:09 AM

varun added a child revision: D3920: [Identity] Set max width to 80 characters.May 4 2022, 11:32 AM

• karol mentioned this in D3921: [Identity] Implement database client method to get pake registration.May 5 2022, 4:18 AM

• jim requested changes to this revision.May 5 2022, 8:30 AM

• jim added inline comments.

services/identity/src/database.rs
18 ↗	(On Diff #12231)	Don't love this being hardcoded, just hardcode it in `main.rs` and pass to `new`. No need for a `Default`.
services/identity/src/service.rs
21 ↗	(On Diff #12231)	Why is this `pub`?

This revision now requires changes to proceed.May 5 2022, 8:30 AM

Address feedback

varun added inline comments.May 5 2022, 8:56 AM

services/identity/src/database.rs
18 ↗	(On Diff #12231)	ack
services/identity/src/service.rs
21 ↗	(On Diff #12231)	hmm yeah neither the client nor config should be pub

Harbormaster completed remote builds in B8822: Diff 12290.May 5 2022, 8:59 AM

• jim accepted this revision.May 5 2022, 1:38 PM

• karol accepted this revision.May 9 2022, 4:55 AM

Adding @ashoat as we're including a new library

ashoat accepted this revision.May 9 2022, 9:27 AM

This revision is now accepted and ready to land.May 9 2022, 9:27 AM

Closed by commit rCOMM1c4aae4bdd89: [Identity] Add a database client (authored by varun). · Explain WhyMay 10 2022, 12:18 PM

This revision was automatically updated to reflect the committed changes.

varun added a commit: rCOMM1c4aae4bdd89: [Identity] Add a database client.

Revision Contents
Changeset List

Path

Size

services/

identity/

Cargo.lock

Cargo.toml

2 lines

src/

database.rs

14 lines

main.rs

6 lines

service.rs

6 lines

Diff 12290

View Options

services/identity/Cargo.lock

Show First 20 Lines • Show All 89 Lines • ▼ Show 20 Lines	type Props = {
+accountPassword: string,		+accountPassword: string,
+setAccountPassword: SetState<string>,		+setAccountPassword: SetState<string>,
+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,
		+onChangeName: (event: SyntheticEvent<HTMLInputElement>) => 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 55 Lines • ▼ Show 20 Lines	const inputDisabled =
!this.hasPermissionForTab(threadInfo, this.props.currentTabType);		!this.hasPermissionForTab(threadInfo, this.props.currentTabType);

let mainContent = null;		let mainContent = null;
if (this.props.currentTabType === 'general') {		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.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.onChangeDescription}
threadDescriptionDisabled={inputDisabled}		threadDescriptionDisabled={inputDisabled}
threadColorCurrentColor={this.possiblyChangedValue('color')}		threadColorCurrentColor={this.possiblyChangedValue('color')}
threadColorOnColorSelection={this.onChangeColor}		threadColorOnColorSelection={this.onChangeColor}
/>		/>
▲ Show 20 Lines • Show All 110 Lines • ▼ Show 20 Lines	class 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;
};		};

onChangeName = (event: SyntheticEvent<HTMLInputElement>) => {
const target = event.currentTarget;
const newValue =
target.value !== this.props.threadInfo.name ? target.value : undefined;
this.props.setQueuedChanges(
Object.freeze({
...this.props.queuedChanges,
name: firstLine(newValue),
}),
);
};

onChangeDescription = (event: SyntheticEvent<HTMLTextAreaElement>) => {		onChangeDescription = (event: SyntheticEvent<HTMLTextAreaElement>) => {
const target = event.currentTarget;		const target = event.currentTarget;
const newValue =		const newValue =
target.value !== this.props.threadInfo.description		target.value !== this.props.threadInfo.description
? target.value		? target.value
: undefined;		: undefined;
this.props.setQueuedChanges(		this.props.setQueuedChanges(
Object.freeze({		Object.freeze({
▲ Show 20 Lines • Show All 127 Lines • ▼ Show 20 Lines	function ConnectedThreadSettingsModal(props) {
}, [threadInfo, userInfos, viewerID]);		}, [threadInfo, userInfos, viewerID]);

const changeQueued: boolean = React.useMemo(		const changeQueued: boolean = React.useMemo(
() =>		() =>
Object.values(queuedChanges).some(v => v !== null && v !== undefined),		Object.values(queuedChanges).some(v => v !== null && v !== undefined),
[queuedChanges],		[queuedChanges],
);		);

		const onChangeName = React.useCallback(
		(event: SyntheticEvent<HTMLInputElement>) => {
		const target = event.currentTarget;
		setQueuedChanges(
		Object.freeze({
		...queuedChanges,
		name: firstLine(
		target.value !== threadInfo?.name ? 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 15 Lines	return (
accountPassword={accountPassword}		accountPassword={accountPassword}
setAccountPassword={setAccountPassword}		setAccountPassword={setAccountPassword}
currentTabType={currentTabType}		currentTabType={currentTabType}
setCurrentTabType={setCurrentTabType}		setCurrentTabType={setCurrentTabType}
queuedChanges={queuedChanges}		queuedChanges={queuedChanges}
setQueuedChanges={setQueuedChanges}		setQueuedChanges={setQueuedChanges}
namePlaceholder={namePlaceholder}		namePlaceholder={namePlaceholder}
changeQueued={changeQueued}		changeQueued={changeQueued}
		onChangeName={onChangeName}
/>		/>
);		);
},		},
);		);

export default ConnectedThreadSettingsModal;		export default ConnectedThreadSettingsModal;

View Options

services/identity/Cargo.toml

Show First 20 Lines • Show All 89 Lines • ▼ Show 20 Lines	type Props = {
+accountPassword: string,		+accountPassword: string,
+setAccountPassword: SetState<string>,		+setAccountPassword: SetState<string>,
+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,
		+onChangeName: (event: SyntheticEvent<HTMLInputElement>) => 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 55 Lines • ▼ Show 20 Lines	const inputDisabled =
!this.hasPermissionForTab(threadInfo, this.props.currentTabType);		!this.hasPermissionForTab(threadInfo, this.props.currentTabType);

let mainContent = null;		let mainContent = null;
if (this.props.currentTabType === 'general') {		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.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.onChangeDescription}
threadDescriptionDisabled={inputDisabled}		threadDescriptionDisabled={inputDisabled}
threadColorCurrentColor={this.possiblyChangedValue('color')}		threadColorCurrentColor={this.possiblyChangedValue('color')}
threadColorOnColorSelection={this.onChangeColor}		threadColorOnColorSelection={this.onChangeColor}
/>		/>
▲ Show 20 Lines • Show All 110 Lines • ▼ Show 20 Lines	class 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;
};		};

onChangeName = (event: SyntheticEvent<HTMLInputElement>) => {
const target = event.currentTarget;
const newValue =
target.value !== this.props.threadInfo.name ? target.value : undefined;
this.props.setQueuedChanges(
Object.freeze({
...this.props.queuedChanges,
name: firstLine(newValue),
}),
);
};

onChangeDescription = (event: SyntheticEvent<HTMLTextAreaElement>) => {		onChangeDescription = (event: SyntheticEvent<HTMLTextAreaElement>) => {
const target = event.currentTarget;		const target = event.currentTarget;
const newValue =		const newValue =
target.value !== this.props.threadInfo.description		target.value !== this.props.threadInfo.description
? target.value		? target.value
: undefined;		: undefined;
this.props.setQueuedChanges(		this.props.setQueuedChanges(
Object.freeze({		Object.freeze({
▲ Show 20 Lines • Show All 127 Lines • ▼ Show 20 Lines	function ConnectedThreadSettingsModal(props) {
}, [threadInfo, userInfos, viewerID]);		}, [threadInfo, userInfos, viewerID]);

const changeQueued: boolean = React.useMemo(		const changeQueued: boolean = React.useMemo(
() =>		() =>
Object.values(queuedChanges).some(v => v !== null && v !== undefined),		Object.values(queuedChanges).some(v => v !== null && v !== undefined),
[queuedChanges],		[queuedChanges],
);		);

		const onChangeName = React.useCallback(
		(event: SyntheticEvent<HTMLInputElement>) => {
		const target = event.currentTarget;
		setQueuedChanges(
		Object.freeze({
		...queuedChanges,
		name: firstLine(
		target.value !== threadInfo?.name ? 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 15 Lines	return (
accountPassword={accountPassword}		accountPassword={accountPassword}
setAccountPassword={setAccountPassword}		setAccountPassword={setAccountPassword}
currentTabType={currentTabType}		currentTabType={currentTabType}
setCurrentTabType={setCurrentTabType}		setCurrentTabType={setCurrentTabType}
queuedChanges={queuedChanges}		queuedChanges={queuedChanges}
setQueuedChanges={setQueuedChanges}		setQueuedChanges={setQueuedChanges}
namePlaceholder={namePlaceholder}		namePlaceholder={namePlaceholder}
changeQueued={changeQueued}		changeQueued={changeQueued}
		onChangeName={onChangeName}
/>		/>
);		);
},		},
);		);

export default ConnectedThreadSettingsModal;		export default ConnectedThreadSettingsModal;

View Options

services/identity/src/database.rs

Show First 20 Lines • Show All 89 Lines • ▼ Show 20 Lines	type Props = {
+accountPassword: string,		+accountPassword: string,
+setAccountPassword: SetState<string>,		+setAccountPassword: SetState<string>,
+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,
		+onChangeName: (event: SyntheticEvent<HTMLInputElement>) => 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 55 Lines • ▼ Show 20 Lines	const inputDisabled =
!this.hasPermissionForTab(threadInfo, this.props.currentTabType);		!this.hasPermissionForTab(threadInfo, this.props.currentTabType);

let mainContent = null;		let mainContent = null;
if (this.props.currentTabType === 'general') {		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.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.onChangeDescription}
threadDescriptionDisabled={inputDisabled}		threadDescriptionDisabled={inputDisabled}
threadColorCurrentColor={this.possiblyChangedValue('color')}		threadColorCurrentColor={this.possiblyChangedValue('color')}
threadColorOnColorSelection={this.onChangeColor}		threadColorOnColorSelection={this.onChangeColor}
/>		/>
▲ Show 20 Lines • Show All 110 Lines • ▼ Show 20 Lines	class 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;
};		};

onChangeName = (event: SyntheticEvent<HTMLInputElement>) => {
const target = event.currentTarget;
const newValue =
target.value !== this.props.threadInfo.name ? target.value : undefined;
this.props.setQueuedChanges(
Object.freeze({
...this.props.queuedChanges,
name: firstLine(newValue),
}),
);
};

onChangeDescription = (event: SyntheticEvent<HTMLTextAreaElement>) => {		onChangeDescription = (event: SyntheticEvent<HTMLTextAreaElement>) => {
const target = event.currentTarget;		const target = event.currentTarget;
const newValue =		const newValue =
target.value !== this.props.threadInfo.description		target.value !== this.props.threadInfo.description
? target.value		? target.value
: undefined;		: undefined;
this.props.setQueuedChanges(		this.props.setQueuedChanges(
Object.freeze({		Object.freeze({
▲ Show 20 Lines • Show All 127 Lines • ▼ Show 20 Lines	function ConnectedThreadSettingsModal(props) {
}, [threadInfo, userInfos, viewerID]);		}, [threadInfo, userInfos, viewerID]);

const changeQueued: boolean = React.useMemo(		const changeQueued: boolean = React.useMemo(
() =>		() =>
Object.values(queuedChanges).some(v => v !== null && v !== undefined),		Object.values(queuedChanges).some(v => v !== null && v !== undefined),
[queuedChanges],		[queuedChanges],
);		);

		const onChangeName = React.useCallback(
		(event: SyntheticEvent<HTMLInputElement>) => {
		const target = event.currentTarget;
		setQueuedChanges(
		Object.freeze({
		...queuedChanges,
		name: firstLine(
		target.value !== threadInfo?.name ? 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 15 Lines	return (
accountPassword={accountPassword}		accountPassword={accountPassword}
setAccountPassword={setAccountPassword}		setAccountPassword={setAccountPassword}
currentTabType={currentTabType}		currentTabType={currentTabType}
setCurrentTabType={setCurrentTabType}		setCurrentTabType={setCurrentTabType}
queuedChanges={queuedChanges}		queuedChanges={queuedChanges}
setQueuedChanges={setQueuedChanges}		setQueuedChanges={setQueuedChanges}
namePlaceholder={namePlaceholder}		namePlaceholder={namePlaceholder}
changeQueued={changeQueued}		changeQueued={changeQueued}
		onChangeName={onChangeName}
/>		/>
);		);
},		},
);		);

export default ConnectedThreadSettingsModal;		export default ConnectedThreadSettingsModal;

View Options

services/identity/src/main.rs

Show First 20 Lines • Show All 89 Lines • ▼ Show 20 Lines	type Props = {
+accountPassword: string,		+accountPassword: string,
+setAccountPassword: SetState<string>,		+setAccountPassword: SetState<string>,
+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,
		+onChangeName: (event: SyntheticEvent<HTMLInputElement>) => 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 55 Lines • ▼ Show 20 Lines	const inputDisabled =
!this.hasPermissionForTab(threadInfo, this.props.currentTabType);		!this.hasPermissionForTab(threadInfo, this.props.currentTabType);

let mainContent = null;		let mainContent = null;
if (this.props.currentTabType === 'general') {		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.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.onChangeDescription}
threadDescriptionDisabled={inputDisabled}		threadDescriptionDisabled={inputDisabled}
threadColorCurrentColor={this.possiblyChangedValue('color')}		threadColorCurrentColor={this.possiblyChangedValue('color')}
threadColorOnColorSelection={this.onChangeColor}		threadColorOnColorSelection={this.onChangeColor}
/>		/>
▲ Show 20 Lines • Show All 110 Lines • ▼ Show 20 Lines	class 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;
};		};

onChangeName = (event: SyntheticEvent<HTMLInputElement>) => {
const target = event.currentTarget;
const newValue =
target.value !== this.props.threadInfo.name ? target.value : undefined;
this.props.setQueuedChanges(
Object.freeze({
...this.props.queuedChanges,
name: firstLine(newValue),
}),
);
};

onChangeDescription = (event: SyntheticEvent<HTMLTextAreaElement>) => {		onChangeDescription = (event: SyntheticEvent<HTMLTextAreaElement>) => {
const target = event.currentTarget;		const target = event.currentTarget;
const newValue =		const newValue =
target.value !== this.props.threadInfo.description		target.value !== this.props.threadInfo.description
? target.value		? target.value
: undefined;		: undefined;
this.props.setQueuedChanges(		this.props.setQueuedChanges(
Object.freeze({		Object.freeze({
▲ Show 20 Lines • Show All 127 Lines • ▼ Show 20 Lines	function ConnectedThreadSettingsModal(props) {
}, [threadInfo, userInfos, viewerID]);		}, [threadInfo, userInfos, viewerID]);

const changeQueued: boolean = React.useMemo(		const changeQueued: boolean = React.useMemo(
() =>		() =>
Object.values(queuedChanges).some(v => v !== null && v !== undefined),		Object.values(queuedChanges).some(v => v !== null && v !== undefined),
[queuedChanges],		[queuedChanges],
);		);

		const onChangeName = React.useCallback(
		(event: SyntheticEvent<HTMLInputElement>) => {
		const target = event.currentTarget;
		setQueuedChanges(
		Object.freeze({
		...queuedChanges,
		name: firstLine(
		target.value !== threadInfo?.name ? 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 15 Lines	return (
accountPassword={accountPassword}		accountPassword={accountPassword}
setAccountPassword={setAccountPassword}		setAccountPassword={setAccountPassword}
currentTabType={currentTabType}		currentTabType={currentTabType}
setCurrentTabType={setCurrentTabType}		setCurrentTabType={setCurrentTabType}
queuedChanges={queuedChanges}		queuedChanges={queuedChanges}
setQueuedChanges={setQueuedChanges}		setQueuedChanges={setQueuedChanges}
namePlaceholder={namePlaceholder}		namePlaceholder={namePlaceholder}
changeQueued={changeQueued}		changeQueued={changeQueued}
		onChangeName={onChangeName}
/>		/>
);		);
},		},
);		);

export default ConnectedThreadSettingsModal;		export default ConnectedThreadSettingsModal;

View Options

services/identity/src/service.rs

[Identity] Add a database clientClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 12290

services/identity/Cargo.lock

services/identity/Cargo.toml

services/identity/src/database.rs

services/identity/src/main.rs

services/identity/src/service.rs

[Identity] Add a database client
ClosedPublic
Actions

Revision Contents
Changeset List