Page MenuHomePhabricator
Differential D11206

[web] Compute `existingRole` instead of `existingRoleID` in `RoleActionsMenu`
ClosedPublic
Actions

Authored by atul on Mar 1 2024, 12:21 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Apr 17, 2:07 AM
Unknown Object (File)
Wed, Apr 16, 3:23 PM
Unknown Object (File)
Wed, Apr 16, 7:39 AM
Unknown Object (File)
Wed, Apr 16, 7:15 AM
Unknown Object (File)
Tue, Apr 15, 11:06 PM
Unknown Object (File)
Tue, Apr 15, 7:38 AM
Unknown Object (File)
Mar 7 2025, 5:24 AM
Unknown Object (File)
Feb 24 2025, 7:32 PM
View All 93 Files
Subscribers
ashoat

Details

Reviewers
ginsu
tomek
kamil
michal
Commits
rCOMM1c8fd0995bab: [web] Compute `existingRole` instead of `existingRoleID` in `RoleActionsMenu`
Summary

This should be a noop refactor that I'm separating into separate diff to make next diff easier to remove.

We basically grab the RoleInfo instead of the RoleInfo.id so that we can access the specialRole field and deprecate useRoleDeletableAndEditableStatus.

Depends on D11205

Test Plan

flow, the invariant, logging the value, making sure RoleActionsMenu continues to look/work as expected

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
web/
roles/
22 lines

Diff 38191

View Options

web/roles/role-actions-menu.react.js

Show All 36 Linesfunction KeyserverConnectionHandler(props: Props) {
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const callLogOut = useLogOut(); const callLogOut = useLogOut();
const keyserverAuth = useKeyserverAuth(); const keyserverAuth = useKeyserverAuth();
const hasConnectionIssue = useSelector( const hasConnectionIssue = useSelector(
state => !!connectionSelector(keyserverID)(state)?.connectionIssue, state => !!connectionSelector(keyserverID)(state)?.connectionIssue,
); );
const cookie = useSelector(cookieSelector(keyserverID)); const cookie = useSelector(cookieSelector(keyserverID));
const dataLoaded = useSelector(state => state.dataLoaded);
const keyserverDeviceToken = useSelector(deviceTokenSelector(keyserverID)); const keyserverDeviceToken = useSelector(deviceTokenSelector(keyserverID));
// We have an assumption that we should be always connected to Ashoat's // We have an assumption that we should be always connected to Ashoat's
// keyserver. It is possible that a token which it has is correct, so we can // keyserver. It is possible that a token which it has is correct, so we can
// try to use it. In worst case it is invalid and our push-handler will try // try to use it. In worst case it is invalid and our push-handler will try
// to fix it. // to fix it.
const ashoatKeyserverDeviceToken = useSelector( const ashoatKeyserverDeviceToken = useSelector(
deviceTokenSelector(ashoatKeyserverID), deviceTokenSelector(ashoatKeyserverID),
▲ Show 20 Lines • Show All 85 Lines • ▼ Show 20 Lines void (async () => {
}, },
}), }),
); );
} catch (e) { } catch (e) {
console.log( console.log(
`Error while authenticating to keyserver with id ${keyserverID}`, `Error while authenticating to keyserver with id ${keyserverID}`,
e, e,
); );
if (!dataLoaded && keyserverID === ashoatKeyserverID) {
await dispatchActionPromise(logOutActionTypes, callLogOut());
}
} finally { } finally {
authInProgress.current = false; authInProgress.current = false;
} }
})(); })();
}, [ }, [
keyserverID, keyserverID,
identityClient, identityClient,
olmSessionCreator, olmSessionCreator,
cookie, cookie,
getAuthMetadata, getAuthMetadata,
dispatchActionPromise, dispatchActionPromise,
keyserverAuth, keyserverAuth,
deviceToken, deviceToken,
calendarQuery, calendarQuery,
isUserAuthenticated, isUserAuthenticated,
callLogOut,
dataLoaded,
]); ]);
if (keyserverID !== ashoatKeyserverID) { if (keyserverID !== ashoatKeyserverID) {
return null; return null;
} }
return <Socket {...rest} />; return <Socket {...rest} />;
} }
const Handler: React.ComponentType<Props> = React.memo<Props>( const Handler: React.ComponentType<Props> = React.memo<Props>(
KeyserverConnectionHandler, KeyserverConnectionHandler,
); );
export default Handler; export default Handler;