[lib] Narrow `threadInfo` argument of `threadFrozenDueToViewerBlock`
ClosedPublic
Actions

Authored by atul on Jun 1 2024, 10:00 PM.

Details

Reviewers

ashoat
ginsu
tomek
varun

Commits

rCOMMc2da721a842f: [lib] Narrow `threadInfo` argument of `threadFrozenDueToViewerBlock`

Summary

This change is kind of useless. Thought I'd be able to do a lot more narrowing of types "along" the memberHasAdminPowers callstack, but this was pretty much it. Figured I may as well put it up.

Depends on D12265

Test Plan

NA, flow

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

atul created this revision.Jun 1 2024, 10:00 PM

Harbormaster completed remote builds in B29343: Diff 40823.Jun 1 2024, 10:17 PM

atul requested review of this revision.Jun 1 2024, 10:17 PM

ashoat accepted this revision.Jun 2 2024, 2:09 PM

This revision is now accepted and ready to land.Jun 2 2024, 2:09 PM

rebase and land

Harbormaster completed remote builds in B29390: Diff 40889.Jun 3 2024, 11:42 AM

Closed by commit rCOMMc2da721a842f: [lib] Narrow `threadInfo` argument of `threadFrozenDueToViewerBlock` (authored by atul). · Explain WhyJun 3 2024, 12:08 PM

This revision was automatically updated to reflect the committed changes.

atul added a commit: rCOMMc2da721a842f: [lib] Narrow `threadInfo` argument of `threadFrozenDueToViewerBlock`.

Revision Contents
Changeset List

Path

Size

lib/

shared/

thread-utils.js

4 lines

Diff 40891

View Options

lib/shared/thread-utils.js

	// @flow			// @flow

	import _keyBy from 'lodash/fp/keyBy.js';
	import _mapValues from 'lodash/fp/mapValues.js';
	import * as React from 'react';			import * as React from 'react';
	import { createSelector } from 'reselect';			import { createSelector } from 'reselect';

	import { useENSNames } from '../hooks/ens-cache.js';			import { useENSNames } from '../hooks/ens-cache.js';
	import SearchIndex from '../shared/search-index.js';			import SearchIndex from '../shared/search-index.js';
	import { roleIsAdminRole } from '../shared/thread-utils.js';			import {
				roleIsAdminRole,
				useCommunityRootMembersToRole,
				} from '../shared/thread-utils.js';
	import type { Platform } from '../types/device-types.js';			import type { Platform } from '../types/device-types.js';
	import {			import {
	type CalendarQuery,			type CalendarQuery,
	defaultCalendarQuery,			defaultCalendarQuery,
	} from '../types/entry-types.js';			} from '../types/entry-types.js';
	import type { CalendarFilter } from '../types/filter-types.js';			import type { CalendarFilter } from '../types/filter-types.js';
	import type {			import type {
	ThreadInfo,			ThreadInfo,
	RelativeMemberInfo,			RelativeMemberInfo,
	RawThreadInfo,			RawThreadInfo,
	MemberInfo,
	} from '../types/minimally-encoded-thread-permissions-types.js';			} from '../types/minimally-encoded-thread-permissions-types.js';
	import type { BaseNavInfo } from '../types/nav-types.js';			import type { BaseNavInfo } from '../types/nav-types.js';
	import type { BaseAppState } from '../types/redux-types.js';			import type { BaseAppState } from '../types/redux-types.js';
	import { threadTypeIsCommunityRoot } from '../types/thread-types-enum.js';
	import type { UserInfo } from '../types/user-types.js';			import type { UserInfo } from '../types/user-types.js';
	import { getConfig } from '../utils/config.js';			import { getConfig } from '../utils/config.js';
	import { values } from '../utils/objects.js';			import { values } from '../utils/objects.js';
	import { useSelector } from '../utils/redux-utils.js';			import { useSelector } from '../utils/redux-utils.js';

	function timeUntilCalendarRangeExpiration(			function timeUntilCalendarRangeExpiration(
	lastUserInteractionCalendar: number,			lastUserInteractionCalendar: number,
	): ?number {			): ?number {
	▲ Show 20 Lines • Show All 92 Lines • ▼ Show 20 Lines
	function useThreadSearchIndex(			function useThreadSearchIndex(
	threadInfos: $ReadOnlyArray<RawThreadInfo \| ThreadInfo>,			threadInfos: $ReadOnlyArray<RawThreadInfo \| ThreadInfo>,
	): SearchIndex {			): SearchIndex {
	const userInfos = useSelector(state => state.userStore.userInfos);			const userInfos = useSelector(state => state.userStore.userInfos);
	const viewerID = useSelector(			const viewerID = useSelector(
	state => state.currentUserInfo && state.currentUserInfo.id,			state => state.currentUserInfo && state.currentUserInfo.id,
	);			);

	const communityRootMembersToRole = React.useMemo(() => {			const communityRootMembersToRole = useCommunityRootMembersToRole(threadInfos);
	const communityThreadInfos = threadInfos.filter(threadInfo =>
	threadTypeIsCommunityRoot(threadInfo.type),
	);
	const communityRoots = _keyBy('id')(communityThreadInfos);

	return _mapValues((threadInfo: ThreadInfo \| RawThreadInfo) => {
	const keyedMembers = _keyBy('id')(threadInfo.members);
	const keyedMembersToRole = _mapValues(
	(member: MemberInfo \| RelativeMemberInfo) => {
	return member.role ? threadInfo.roles[member.role] : null;
	},
	)(keyedMembers);
	return keyedMembersToRole;
	})(communityRoots);
	}, [threadInfos]);

	const nonViewerMembers = React.useMemo(() => {			const nonViewerMembers = React.useMemo(() => {
	const allMembersOfAllThreads = new Map<string, UserInfo>();			const allMembersOfAllThreads = new Map<string, UserInfo>();
	for (const threadInfo of threadInfos) {			for (const threadInfo of threadInfos) {
	for (const member of threadInfo.members) {			for (const member of threadInfo.members) {
	const communityRole =			const communityRole =
	communityRootMembersToRole[threadInfo.community]?.[member.id];			communityRootMembersToRole[threadInfo.community]?.[member.id];
	const isParentAdmin = roleIsAdminRole(communityRole);			const isParentAdmin = roleIsAdminRole(communityRole);
	▲ Show 20 Lines • Show All 84 Lines • Show Last 20 Lines

[lib] Narrow `threadInfo` argument of `threadFrozenDueToViewerBlock`ClosedPublicActions