Page MenuHomePhabricator
Differential D3336

[web] Introduce settings section to NavInfo
ClosedPublic
Actions

Authored by tomek on Mar 4 2022, 8:02 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 31, 11:44 PM
Unknown Object (File)
Mon, Mar 31, 9:25 PM
Unknown Object (File)
Mon, Mar 31, 3:02 PM
Unknown Object (File)
Sun, Mar 30, 8:25 PM
Unknown Object (File)
Sun, Mar 30, 5:35 AM
Unknown Object (File)
Thu, Mar 20, 6:44 AM
Unknown Object (File)
Mon, Mar 17, 4:43 PM
Unknown Object (File)
Thu, Mar 13, 11:14 PM
View All Files
Subscribers
• adrian
ashoat
• karol

Details

Reviewers
• benschac
atul
• jacek
Commits
rCOMM1346e679edc6: [web] Introduce settings section to NavInfo
Summary

After this change it is possible to open /settings/account path - currently empty.
Depends on D3335
Depends on D3265

Test Plan

Open /settings/account path and check if empty page is rendered (with app and community switchers and correct background).

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

tomek created this revision.Mar 4 2022, 8:02 AM
Herald added subscribers: • karol, • adrian, ashoat. · View Herald TranscriptMar 4 2022, 8:02 AM
tomek added inline comments.Mar 4 2022, 8:04 AM
web/types/nav-types.js
11 ↗(On Diff #10078)

Currently we have only one settings section

web/url-utils.js
104–109 ↗(On Diff #10078)

This code is borrowed from D3265 which is a dependency of this diff

Harbormaster completed remote builds in B7152: Diff 10078.Mar 4 2022, 8:07 AM
tomek requested review of this revision.Mar 4 2022, 8:07 AM
tomek added a child revision: D3340: [web] Export navigation tab types.Mar 4 2022, 8:15 AM
atul accepted this revision.Mar 8 2022, 8:18 AM
atul added inline comments.
web/url-utils.js
61–62 ↗(On Diff #10078)

Should we combine these into a single conditional? Or is it better to be symmetrical with what's above?

This revision is now accepted and ready to land.Mar 8 2022, 8:18 AM
tomek added inline comments.Mar 9 2022, 4:55 AM
web/url-utils.js
61–62 ↗(On Diff #10078)

I think that keeping the symmetry doesn't bring a lot of value, so going to merge these

tomek updated this revision to Diff 10210.Mar 9 2022, 7:03 AM

Merge if conditions

Harbormaster completed remote builds in B7251: Diff 10210.Mar 9 2022, 7:08 AM
Closed by commit rCOMM1346e679edc6: [web] Introduce settings section to NavInfo (authored by tomek). · Explain WhyMar 9 2022, 7:11 AM
This revision was automatically updated to reflect the committed changes.
tomek added a commit: rCOMM1346e679edc6: [web] Introduce settings section to NavInfo.

Revision Contents
Changeset List

PathSize
web/
types/
3 lines
15 lines

Diff 10212

View Options

web/types/nav-types.js

Show First 20 Lines • Show All 226 Lines • ▼ Show 20 Lines const row = [
description, description,
viewer.userID, viewer.userID,
time, time,
color, color,
parentThreadID, parentThreadID,
threadAncestry.containingThreadID, threadAncestry.containingThreadID,
threadAncestry.community, threadAncestry.community,
threadAncestry.depth, threadAncestry.depth,
newRoles.default.id,
sourceMessageID, sourceMessageID,
]; ];
let existingThreadQuery = null; let existingThreadQuery = null;
if (threadType === threadTypes.PERSONAL) { if (threadType === threadTypes.PERSONAL) {
const otherMemberID = initialMemberIDs?.[0]; const otherMemberID = initialMemberIDs?.[0];
invariant( invariant(
otherMemberID, otherMemberID,
'Other member id should be set for a PERSONAL thread', 'Other member id should be set for a PERSONAL thread',
); );
existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID); existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID);
} else if (sourceMessageID) { } else if (sourceMessageID) {
existingThreadQuery = SQL` existingThreadQuery = SQL`
SELECT t.id SELECT t.id
FROM threads t FROM threads t
WHERE t.source_message = ${sourceMessageID} WHERE t.source_message = ${sourceMessageID}
`; `;
} }
if (existingThreadQuery) { if (existingThreadQuery) {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
SELECT ${row} SELECT ${row}
WHERE NOT EXISTS (`; WHERE NOT EXISTS (`;
query.append(existingThreadQuery).append(SQL`)`); query.append(existingThreadQuery).append(SQL`)`);
const [result] = await dbQuery(query); const [result] = await dbQuery(query);
if (result.affectedRows === 0) { if (result.affectedRows === 0) {
const deleteRoles = SQL` const deleteRoles = SQL`
DELETE FROM roles DELETE FROM roles
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines if (result.affectedRows === 0) {
userInfos, userInfos,
newMessageInfos, newMessageInfos,
}; };
} }
} else { } else {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
VALUES ${[row]} VALUES ${[row]}
`; `;
await dbQuery(query); await dbQuery(query);
} }
let initialMemberPromise; let initialMemberPromise;
if (initialMemberIDs) { if (initialMemberIDs) {
initialMemberPromise = changeRole(id, initialMemberIDs, null, { initialMemberPromise = changeRole(id, initialMemberIDs, null, {
▲ Show 20 Lines • Show All 178 Lines • Show Last 20 Lines
View Options

web/url-utils.js

Show First 20 Lines • Show All 226 Lines • ▼ Show 20 Lines const row = [
description, description,
viewer.userID, viewer.userID,
time, time,
color, color,
parentThreadID, parentThreadID,
threadAncestry.containingThreadID, threadAncestry.containingThreadID,
threadAncestry.community, threadAncestry.community,
threadAncestry.depth, threadAncestry.depth,
newRoles.default.id,
sourceMessageID, sourceMessageID,
]; ];
let existingThreadQuery = null; let existingThreadQuery = null;
if (threadType === threadTypes.PERSONAL) { if (threadType === threadTypes.PERSONAL) {
const otherMemberID = initialMemberIDs?.[0]; const otherMemberID = initialMemberIDs?.[0];
invariant( invariant(
otherMemberID, otherMemberID,
'Other member id should be set for a PERSONAL thread', 'Other member id should be set for a PERSONAL thread',
); );
existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID); existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID);
} else if (sourceMessageID) { } else if (sourceMessageID) {
existingThreadQuery = SQL` existingThreadQuery = SQL`
SELECT t.id SELECT t.id
FROM threads t FROM threads t
WHERE t.source_message = ${sourceMessageID} WHERE t.source_message = ${sourceMessageID}
`; `;
} }
if (existingThreadQuery) { if (existingThreadQuery) {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
SELECT ${row} SELECT ${row}
WHERE NOT EXISTS (`; WHERE NOT EXISTS (`;
query.append(existingThreadQuery).append(SQL`)`); query.append(existingThreadQuery).append(SQL`)`);
const [result] = await dbQuery(query); const [result] = await dbQuery(query);
if (result.affectedRows === 0) { if (result.affectedRows === 0) {
const deleteRoles = SQL` const deleteRoles = SQL`
DELETE FROM roles DELETE FROM roles
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines if (result.affectedRows === 0) {
userInfos, userInfos,
newMessageInfos, newMessageInfos,
}; };
} }
} else { } else {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
VALUES ${[row]} VALUES ${[row]}
`; `;
await dbQuery(query); await dbQuery(query);
} }
let initialMemberPromise; let initialMemberPromise;
if (initialMemberIDs) { if (initialMemberIDs) {
initialMemberPromise = changeRole(id, initialMemberIDs, null, { initialMemberPromise = changeRole(id, initialMemberIDs, null, {
▲ Show 20 Lines • Show All 178 Lines • Show Last 20 Lines