[web] Move `onChangeThreadType` up from `ThreadSettingsModal` to `ConnectedThreadSettingsModal`
ClosedPublic
Actions

Authored by atul on Apr 18 2022, 3:04 PM.

Details

Reviewers

• jacek
tomek

Commits

rCOMM669e261b8c74: [web] Move `onChangeThreadType` up from `ThreadSettingsModal` to…

Summary

Move onChangeThreadType out from inner class component to outer "Connected" functional component.

As part of the work to refactor ThreadSettingsModal... specifically to turn it into a functional component.

Depends on D3767

Test Plan

Open ThreadSettingsModal
Change the thread type
Log values in onChangeThreadtype to ensure that they continue to be as expected
Hit save after changing the color and ensure that the thread description changed as expected

Diff Detail

Repository

rCOMM Comm

Branch

actuallylandapril21 (branched from master)

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

atul created this revision.Apr 18 2022, 3:04 PM

Herald added subscribers: • abosh, • benschac, • karol and 2 others. · View Herald TranscriptApr 18 2022, 3:04 PM

Harbormaster completed remote builds in B8281: Diff 11577.Apr 18 2022, 3:09 PM

atul requested review of this revision.Apr 18 2022, 3:09 PM

atul added a child revision: D3769: [web] Move `onChangeAccountPassword` up from `ThreadSettingsModal` to `ConnectedThreadSettingsModal`.Apr 18 2022, 3:25 PM

rebase

Harbormaster completed remote builds in B8339: Diff 11649.Apr 19 2022, 3:23 PM

tomek accepted this revision.Apr 21 2022, 3:09 AM

tomek added inline comments.

web/modals/threads/thread-settings-modal.react.js
449–459 ↗	(On Diff #11649)

This revision is now accepted and ready to land.Apr 21 2022, 3:09 AM

rebase before addressing feedback

address feedback

Harbormaster completed remote builds in B8421: Diff 11749.Apr 21 2022, 11:11 AM

Harbormaster completed remote builds in B8422: Diff 11750.Apr 21 2022, 11:15 AM

Closed by commit rCOMM669e261b8c74: [web] Move `onChangeThreadType` up from `ThreadSettingsModal` to… (authored by atul). · Explain WhyApr 21 2022, 11:15 AM

This revision was automatically updated to reflect the committed changes.

atul added a commit: rCOMM669e261b8c74: [web] Move `onChangeThreadType` up from `ThreadSettingsModal` to….

Revision Contents
Changeset List

Path

Size

web/

modals/

threads/

thread-settings-modal.react.js

30 lines

Diff 11749

View Options

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

Show First 20 Lines • Show All 951 Lines • ▼ Show 20 Lines	return createPromiseAsJSIValue(
promise->resolve(std::move(jsiRandomString));		promise->resolve(std::move(jsiRandomString));
}		}
});		});
};		};
this->cryptoThread->scheduleTask(job);		this->cryptoThread->scheduleTask(job);
});		});
}		}

		jsi::Value CommCoreModule::setCommServicesAuthMetadata(
		jsi::Runtime &rt,
		jsi::String userID,
		jsi::String deviceID,
		jsi::String accessToken) {
		auto userIDStr{userID.utf8(rt)};
		auto deviceIDStr{deviceID.utf8(rt)};
		auto accessTokenStr{accessToken.utf8(rt)};
		return createPromiseAsJSIValue(
		rt,
		[this, userIDStr, deviceIDStr, accessTokenStr](
		jsi::Runtime &innerRt, std::shared_ptr<Promise> promise) {
		taskType job =
		[this, promise, userIDStr, deviceIDStr, accessTokenStr]() {
		std::string error;
		try {
		this->secureStore.set(this->secureStore.userID, userIDStr);
		this->secureStore.set(this->secureStore.deviceID, deviceIDStr);
		this->secureStore.set(
		this->secureStore.commServicesAccessToken, accessTokenStr);
		} catch (const std::exception &e) {
		error = e.what();
		}
		this->jsInvoker_->invokeAsync([error, promise]() {
		if (error.size()) {
		promise->reject(error);
		} else {
		promise->resolve(jsi::Value::undefined());
		}
		});
		};
		GlobalDBSingleton::instance.scheduleOrRunCancellable(
		job, promise, this->jsInvoker_);
		});
		}

		jsi::Value CommCoreModule::getCommServicesAuthMetadata(jsi::Runtime &rt) {
		return createPromiseAsJSIValue(
		rt, [this](jsi::Runtime &innerRt, std::shared_ptr<Promise> promise) {
		taskType job = [this, &innerRt, promise]() {
		std::string error;
		std::string userID;
		std::string deviceID;
		std::string accessToken;
		try {
		folly::Optional<std::string> userIDOpt =
		this->secureStore.get(this->secureStore.userID);
		if (userIDOpt.hasValue()) {
		userID = userIDOpt.value();
		}
		folly::Optional<std::string> deviceIDOpt =
		this->secureStore.get(this->secureStore.deviceID);
		if (deviceIDOpt.hasValue()) {
		deviceID = deviceIDOpt.value();
		}
		folly::Optional<std::string> accessTokenOpt = this->secureStore.get(
		this->secureStore.commServicesAccessToken);
		if (accessTokenOpt.hasValue()) {
		accessToken = accessTokenOpt.value();
		}
		} catch (const std::exception &e) {
		error = e.what();
		}
		this->jsInvoker_->invokeAsync(
		[&innerRt, error, userID, deviceID, accessToken, promise]() {
		if (error.size()) {
		promise->reject(error);
		} else {
		auto authMetadata = jsi::Object(innerRt);
		if (!userID.empty()) {
		authMetadata.setProperty(
		innerRt,
		"userID",
		jsi::String::createFromUtf8(innerRt, userID));
		}
		if (!deviceID.empty()) {
		authMetadata.setProperty(
		innerRt,
		"deviceID",
		jsi::String::createFromUtf8(innerRt, deviceID));
		}
		if (!accessToken.empty()) {
		authMetadata.setProperty(
		innerRt,
		"accessToken",
		jsi::String::createFromUtf8(innerRt, accessToken));
		}
		promise->resolve(std::move(authMetadata));
		}
		});
		};
		GlobalDBSingleton::instance.scheduleOrRunCancellable(
		job, promise, this->jsInvoker_);
		});
		}

		jsi::Value CommCoreModule::setCommServicesAccessToken(
		jsi::Runtime &rt,
		jsi::String accessToken) {
		auto accessTokenStr{accessToken.utf8(rt)};
		return createPromiseAsJSIValue(
		rt,
		[this, accessTokenStr](
		jsi::Runtime &innerRt, std::shared_ptr<Promise> promise) {
		taskType job = [this, promise, accessTokenStr]() {
		std::string error;
		try {
		this->secureStore.set(
		this->secureStore.commServicesAccessToken, accessTokenStr);
		} catch (const std::exception &e) {
		error = e.what();
		}
		this->jsInvoker_->invokeAsync([error, promise]() {
		if (error.size()) {
		promise->reject(error);
		} else {
		promise->resolve(jsi::Value::undefined());
		}
		});
		};
		GlobalDBSingleton::instance.scheduleOrRunCancellable(
		job, promise, this->jsInvoker_);
		});
		}

		jsi::Value CommCoreModule::clearCommServicesAccessToken(jsi::Runtime &rt) {
		return createPromiseAsJSIValue(
		rt, [this](jsi::Runtime &innerRt, std::shared_ptr<Promise> promise) {
		taskType job = [this, promise]() {
		std::string error;
		try {
		this->secureStore.set(
		this->secureStore.commServicesAccessToken, "");
		} catch (const std::exception &e) {
		error = e.what();
		}
		this->jsInvoker_->invokeAsync([error, promise]() {
		if (error.size()) {
		promise->reject(error);
		} else {
		promise->resolve(jsi::Value::undefined());
		}
		});
		};
		GlobalDBSingleton::instance.scheduleOrRunCancellable(
		job, promise, this->jsInvoker_);
		});
		}

} // namespace comm		} // namespace comm

[web] Move `onChangeThreadType` up from `ThreadSettingsModal` to `ConnectedThreadSettingsModal`ClosedPublicActions