Paths

Table of Contentst

-
native/chat/
-
chat/
1
message-reactions-modal.react.js

[native] make user profile accessible from MessageReactionsModal
ClosedPublic
Actions

Authored by ginsu on Oct 6 2023, 4:28 AM.

Details

Reviewers

atul
inka

Commits

rCOMM8ddf0f4df65a: [native] make user profile accessible from MessageReactionsModal

Summary

This diff makes the renderItem inside of MessageReactionsModal into a touchable that will navigate to the user profile whenever onPress is triggered

Depends on D9389

Test Plan

Please see the demo video below:

Diff Detail

Repository

rCOMM Comm

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

ginsu created this revision.Oct 6 2023, 4:28 AM

Herald added subscribers: will, tomek, ashoat. · View Herald TranscriptOct 6 2023, 4:28 AM

ginsu edited the summary of this revision. (Show Details)Oct 6 2023, 4:32 AM

ginsu edited the test plan for this revision. (Show Details)

ginsu added reviewers: atul, inka.

ginsu added a parent revision: D9389: [lib/native/web] make user profile accessible from a user entity in a robotext.

ginsu attached a referenced file: F794352: Screen Recording 2023-10-06 at 7.31.21 AM.mov. (Show Details)

ginsu added inline comments.Oct 6 2023, 4:39 AM

native/chat/message-reactions-modal.react.js
51–58 ↗	(On Diff #31737)	I created this `useEffect` that will call the `navigateToUserProfileBottomSheet` callback whenever the `MessageReactionsModal` is unmounting and there is a `selectedUserID`. This will make sure that the user profile bottom sheet slides in only after the `MessageReactionsModal` has finished sliding out.

Harbormaster completed remote builds in B23048: Diff 31737.Oct 6 2023, 4:45 AM

ginsu requested review of this revision.Oct 6 2023, 4:45 AM

ginsu added a child revision: D9391: [lib/native/web] introduce createMemberMapForUserMentions function.Oct 6 2023, 4:55 AM

atul accepted this revision.Oct 9 2023, 1:19 PM

atul added inline comments.

native/chat/message-reactions-modal.react.js
51–58 ↗	(On Diff #31737)	Hm, it seems like a clever solution but isn't super intuitive without this annotation.... at a minimum could you add a comment above the `useEffect` explaining what's going on? I'm guessing you discussed with eg Ted that we don't want the `UserProfileBottomSheet` appearing over the reactions modal? Just brainstorming... Could we have some `bottomSheetPresented` state "above" this component that gets set/unset as part of the `useEffect`? Could be consumed in a separate `useEffect` to `navigateToUserProfileBottomSheet`? Similar to `ModalProvider` on `web` could we have some higher level abstraction that handles "stacks" of `BottomSheet`s? Might be overkill but may allow for simpler API

This revision is now accepted and ready to land.Oct 9 2023, 1:19 PM

atul added inline comments.Oct 9 2023, 1:20 PM

native/chat/message-reactions-modal.react.js
51–58 ↗	(On Diff #31737)	Might be overkill but may allow for simpler API (eg `presentSheet(...)`) that handles fading in/out/etc

ginsu added inline comments.Oct 11 2023, 1:41 AM

native/chat/message-reactions-modal.react.js
51–58 ↗	(On Diff #31737)	Hm, it seems like a clever solution but isn't super intuitive without this annotation.... at a minimum could you add a comment above the useEffect explaining what's going on? Yea definitely > I'm guessing you discussed with eg Ted that we don't want the UserProfileBottomSheet appearing over the reactions modal? Here is what is on the Figma Might be overkill but may allow for simpler API (eg presentSheet(...)) that handles fading in/out/etc Agree that this API could be improved. Will create a Linear task to track for the time being

ginsu attached a referenced file: F808269: Screenshot 2023-10-11 at 4.38.48 AM.png. (Show Details)Oct 11 2023, 1:41 AM

address comments + rebase before landing

Harbormaster completed remote builds in B23164: Diff 31895.Oct 11 2023, 2:06 AM

https://linear.app/comm/issue/ENG-5228/add-a-isbottomsheetvisible-state-to-the-bottom-sheet-provider

Closed by commit rCOMM8ddf0f4df65a: [native] make user profile accessible from MessageReactionsModal (authored by ginsu). · Explain WhyOct 11 2023, 2:39 AM

This revision was automatically updated to reflect the committed changes.

ginsu added a commit: rCOMM8ddf0f4df65a: [native] make user profile accessible from MessageReactionsModal.

Revision Contents
Changeset List

Path

Size

native/

chat/

message-reactions-modal.react.js

57 lines

Diff 31895

View Options

native/chat/message-reactions-modal.react.js

Show First 20 Lines • Show All 487 Lines • ▼ Show 20 Lines	attempt_delete_file(
"Failed to delete unencrypted database.");		"Failed to delete unencrypted database.");
attempt_rename_file(		attempt_rename_file(
temp_encrypted_db_path,		temp_encrypted_db_path,
SQLiteQueryExecutor::sqliteFilePath,		SQLiteQueryExecutor::sqliteFilePath,
"Failed to move encrypted database to default location.");		"Failed to move encrypted database to default location.");
Logger::log("Encryption completed successfully.");		Logger::log("Encryption completed successfully.");
}		}

		auto &SQLiteQueryExecutor::getStorage() {
		static auto storage = make_storage(
		SQLiteQueryExecutor::sqliteFilePath,
		make_index("messages_idx_thread_time", &Message::thread, &Message::time),
		make_index("media_idx_container", &Media::container),
		make_table(
		"drafts",
		make_column("key", &Draft::key, unique(), primary_key()),
		make_column("text", &Draft::text)),
		make_table(
		"messages",
		make_column("id", &Message::id, unique(), primary_key()),
		make_column("local_id", &Message::local_id),
		make_column("thread", &Message::thread),
		make_column("user", &Message::user),
		make_column("type", &Message::type),
		make_column("future_type", &Message::future_type),
		make_column("content", &Message::content),
		make_column("time", &Message::time)),
		make_table(
		"olm_persist_account",
		make_column("id", &OlmPersistAccount::id, unique(), primary_key()),
		make_column("account_data", &OlmPersistAccount::account_data)),
		make_table(
		"olm_persist_sessions",
		make_column(
		"target_user_id",
		&OlmPersistSession::target_user_id,
		unique(),
		primary_key()),
		make_column("session_data", &OlmPersistSession::session_data)),
		make_table(
		"media",
		make_column("id", &Media::id, unique(), primary_key()),
		make_column("container", &Media::container),
		make_column("thread", &Media::thread),
		make_column("uri", &Media::uri),
		make_column("type", &Media::type),
		make_column("extras", &Media::extras)),
		make_table(
		"threads",
		make_column("id", &Thread::id, unique(), primary_key()),
		make_column("type", &Thread::type),
		make_column("name", &Thread::name),
		make_column("description", &Thread::description),
		make_column("color", &Thread::color),
		make_column("creation_time", &Thread::creation_time),
		make_column("parent_thread_id", &Thread::parent_thread_id),
		make_column("containing_thread_id", &Thread::containing_thread_id),
		make_column("community", &Thread::community),
		make_column("members", &Thread::members),
		make_column("roles", &Thread::roles),
		make_column("current_user", &Thread::current_user),
		make_column("source_message_id", &Thread::source_message_id),
		make_column("replies_count", &Thread::replies_count)),
		make_table(
		"metadata",
		make_column("name", &Metadata::name, unique(), primary_key()),
		make_column("data", &Metadata::data)));
		storage.on_open = on_database_open;
		return storage;
		}

typedef bool ShouldBeInTransaction;		typedef bool ShouldBeInTransaction;
typedef std::pair<std::function<bool(sqlite3 *)>, ShouldBeInTransaction>		typedef std::pair<std::function<bool(sqlite3 *)>, ShouldBeInTransaction>
SQLiteMigration;		SQLiteMigration;
std::vector<std::pair<uint, SQLiteMigration>> migrations{		std::vector<std::pair<uint, SQLiteMigration>> migrations{
{{1, {create_drafts_table, true}},		{{1, {create_drafts_table, true}},
{2, {rename_threadID_to_key, true}},		{2, {rename_threadID_to_key, true}},
{4, {create_persist_account_table, true}},		{4, {create_persist_account_table, true}},
{5, {create_persist_sessions_table, true}},		{5, {create_persist_sessions_table, true}},
Show All 28 Lines	void SQLiteQueryExecutor::migrate() const {

int current_user_version = sqlite3_column_int(user_version_stmt, 0);		int current_user_version = sqlite3_column_int(user_version_stmt, 0);
sqlite3_finalize(user_version_stmt);		sqlite3_finalize(user_version_stmt);

std::stringstream version_msg;		std::stringstream version_msg;
version_msg << "db version: " << current_user_version << std::endl;		version_msg << "db version: " << current_user_version << std::endl;
Logger::log(version_msg.str());		Logger::log(version_msg.str());

		if (current_user_version == 0) {
		SQLiteQueryExecutor::getStorage().sync_schema();

		Logger::log("Creating new database, syncing structure with ORM storage.");

		auto latest_version = migrations.back().first;

		std::stringstream update_version;
		update_version << "PRAGMA user_version=" << latest_version << ";";
		auto update_version_str = update_version.str();

		char *error;
		sqlite3_exec(db, update_version_str.c_str(), nullptr, nullptr, &error);

		if (error) {
		std::ostringstream errorStream;
		errorStream << "Error saving database version: " << error;
		Logger::log(errorStream.str());
		marcinUnsubmitted Not Done Inline Actions How is application going to function if this error occurs? In most places we the runtime error to kill the app if database operation fails since application is not going to work correctly. I just want to know whether it is also the case here. marcin: How is application going to function if this error occurs? In most places we the runtime error…
		sqlite3_free(error);
		}

		return;
		}

for (const auto &[idx, migration] : migrations) {		for (const auto &[idx, migration] : migrations) {
if (idx <= current_user_version) {		if (idx <= current_user_version) {
continue;		continue;
}		}
const auto &[applyMigration, shouldBeInTransaction] = migration;		const auto &[applyMigration, shouldBeInTransaction] = migration;

std::stringstream migration_msg;		std::stringstream migration_msg;

Show All 28 Lines	void SQLiteQueryExecutor::assign_encryption_key() {
CommSecureStore commSecureStore{};		CommSecureStore commSecureStore{};
std::string encryptionKey = comm::crypto::Tools::generateRandomHexString(		std::string encryptionKey = comm::crypto::Tools::generateRandomHexString(
SQLiteQueryExecutor::sqlcipherEncryptionKeySize);		SQLiteQueryExecutor::sqlcipherEncryptionKeySize);
commSecureStore.set(		commSecureStore.set(
SQLiteQueryExecutor::secureStoreEncryptionKeyID, encryptionKey);		SQLiteQueryExecutor::secureStoreEncryptionKeyID, encryptionKey);
SQLiteQueryExecutor::encryptionKey = encryptionKey;		SQLiteQueryExecutor::encryptionKey = encryptionKey;
}		}

auto &SQLiteQueryExecutor::getStorage() {
static auto storage = make_storage(
SQLiteQueryExecutor::sqliteFilePath,
make_index("messages_idx_thread_time", &Message::thread, &Message::time),
make_index("media_idx_container", &Media::container),
make_table(
"drafts",
make_column("key", &Draft::key, unique(), primary_key()),
make_column("text", &Draft::text)),
make_table(
"messages",
make_column("id", &Message::id, unique(), primary_key()),
make_column("local_id", &Message::local_id),
make_column("thread", &Message::thread),
make_column("user", &Message::user),
make_column("type", &Message::type),
make_column("future_type", &Message::future_type),
make_column("content", &Message::content),
make_column("time", &Message::time)),
make_table(
"olm_persist_account",
make_column("id", &OlmPersistAccount::id, unique(), primary_key()),
make_column("account_data", &OlmPersistAccount::account_data)),
make_table(
"olm_persist_sessions",
make_column(
"target_user_id",
&OlmPersistSession::target_user_id,
unique(),
primary_key()),
make_column("session_data", &OlmPersistSession::session_data)),
make_table(
"media",
make_column("id", &Media::id, unique(), primary_key()),
make_column("container", &Media::container),
make_column("thread", &Media::thread),
make_column("uri", &Media::uri),
make_column("type", &Media::type),
make_column("extras", &Media::extras)),
make_table(
"threads",
make_column("id", &Thread::id, unique(), primary_key()),
make_column("type", &Thread::type),
make_column("name", &Thread::name),
make_column("description", &Thread::description),
make_column("color", &Thread::color),
make_column("creation_time", &Thread::creation_time),
make_column("parent_thread_id", &Thread::parent_thread_id),
make_column("containing_thread_id", &Thread::containing_thread_id),
make_column("community", &Thread::community),
make_column("members", &Thread::members),
make_column("roles", &Thread::roles),
make_column("current_user", &Thread::current_user),
make_column("source_message_id", &Thread::source_message_id),
make_column("replies_count", &Thread::replies_count)),
make_table(
"metadata",
make_column("name", &Metadata::name, unique(), primary_key()),
make_column("data", &Metadata::data)));
storage.on_open = on_database_open;
return storage;
}

void SQLiteQueryExecutor::initialize(std::string &databasePath) {		void SQLiteQueryExecutor::initialize(std::string &databasePath) {
std::call_once(SQLiteQueryExecutor::initialized, [&databasePath]() {		std::call_once(SQLiteQueryExecutor::initialized, [&databasePath]() {
SQLiteQueryExecutor::sqliteFilePath = databasePath;		SQLiteQueryExecutor::sqliteFilePath = databasePath;
CommSecureStore commSecureStore{};		CommSecureStore commSecureStore{};
folly::Optional<std::string> maybeEncryptionKey =		folly::Optional<std::string> maybeEncryptionKey =
commSecureStore.get(SQLiteQueryExecutor::secureStoreEncryptionKeyID);		commSecureStore.get(SQLiteQueryExecutor::secureStoreEncryptionKeyID);

if (file_exists(databasePath) && maybeEncryptionKey) {		if (file_exists(databasePath) && maybeEncryptionKey) {
▲ Show 20 Lines • Show All 277 Lines • Show Last 20 Lines

[native] make user profile accessible from MessageReactionsModalClosedPublicActions