Paths

Table of Contentst

-
lib/shared/
-
shared/
-
message-utils.test.js

[lib] Move test messages outside of the describe scope to reuse them
ClosedPublic
Actions

Authored by rohan on Sep 29 2023, 11:08 AM.

Details

Reviewers

atul
ginsu

Commits

rCOMM67624a7d12c7: [lib] Move test messages outside of the describe scope to reuse them

Summary

Just moving the test messages outside of the sceop of the describe block so I can reuse them for the upcoming tests for the pinned messages

Depends on D9330

Resolves https://linear.app/comm/issue/ENG-5210/move-test-messages-outside-of-the-describe-scope-to-reuse-them

Test Plan

Ran flow and yarn workspace lib test

Diff Detail

Repository

rCOMM Comm

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

rohan created this revision.Sep 29 2023, 11:08 AM

Herald added subscribers: tomek, ashoat. · View Herald TranscriptSep 29 2023, 11:08 AM

rohan edited the summary of this revision. (Show Details)Sep 29 2023, 11:09 AM

rohan added a parent revision: D9330: [keyserver/lib] Update isInvalidSidebarSource to check messageSpec.canBeSidebarSource.

Harbormaster completed remote builds in B22917: Diff 31551.Sep 29 2023, 11:25 AM

rohan requested review of this revision.Sep 29 2023, 11:25 AM

might make further sense to pull out to separate test data file?

This revision is now accepted and ready to land.Sep 29 2023, 1:12 PM

In D9331#274297, @atul wrote:

might make further sense to pull out to separate test data file?

Yeah it would make it easier, I'll probably do that after landing since I could also import them into the message ops utils tests

Rebase

Harbormaster completed remote builds in B23149: Diff 31876.Oct 10 2023, 8:21 AM

rohan added a child revision: D9444: [lib] Introduce a canBePinned boolean to message specs.Oct 10 2023, 8:38 AM

rohan edited the summary of this revision. (Show Details)Oct 10 2023, 9:00 AM

Closed by commit rCOMM67624a7d12c7: [lib] Move test messages outside of the describe scope to reuse them (authored by rohan). · Explain WhyOct 20 2023, 8:27 AM

This revision was automatically updated to reflect the committed changes.

rohan added a commit: rCOMM67624a7d12c7: [lib] Move test messages outside of the describe scope to reuse them.

Revision Contents
Changeset List

Path

Size

lib/

shared/

message-utils.test.js

459 lines

Diff 31876

View Options

lib/shared/message-utils.test.js

// @flow

import * as React from 'react';

import { FlatList, Platform } from 'react-native';

import { SafeAreaView } from 'react-native-safe-area-context';

import { useSelector } from 'react-redux';

import {

childThreadInfos,

communityThreadSelector,

} from 'lib/selectors/thread-selectors';

import { threadIsChannel } from 'lib/shared/thread-utils';

import {

import { type ThreadInfo, communitySubthreads } from 'lib/types/thread-types';

createRecursiveDrawerItemsData,

appendSuffix,

} from 'lib/utils/drawer-utils.react';

import { useNavigateToThread } from '../chat/message-list-types';

import { useStyles } from '../themes/colors';

import type { TextStyle } from '../types/styles';

import CommunityDrawerItemCommunity from './community-drawer-item-cummunity.react';

const maxDepth = 2;

const safeAreaEdges = Platform.select({

ios: ['top'],

default: ['top', 'bottom'],

});

Show All 10 Lines

function CommunityDrawerContent(): React.Node {

const navigateToThread = useNavigateToThread();

const childThreadInfosMap = useSelector(childThreadInfos);

const setOpenCommunnityOrClose = React.useCallback((index: string) => {

setOpenCommunity(open => (open === index ? null : index));

}, []);

const renderItem = React.useCallback(

({ item }) => {

const itemData = {

threadInfo: item.threadInfo,

itemChildren: item.itemChildren,

labelStyle: item.labelStyle,

hasSubchannelsButton: item.subchannelsButton,

};

return (

<CommunityDrawerItemCommunity

key={item.key}

key={item.threadInfo.id}

itemData={itemData}

itemData={item}

toggleExpanded={setOpenCommunnityOrClose}

expanded={itemData.threadInfo.id === openCommunity}

expanded={item.threadInfo.id === openCommunity}

navigateToThread={navigateToThread}

);

michalUnsubmitted

Not Done

}, []);

const renderItem = React.useCallback(

- ({ item }) => {

- return (

+ ({ item }) => (

<CommunityDrawerItemCommunity

key={item.threadInfo.id}

itemData={item}

toggleExpanded={setOpenCommunnityOrClose}

expanded={item.threadInfo.id === openCommunity}

navigateToThread={navigateToThread}

- );

- },

+ ),

[navigateToThread, openCommunity, setOpenCommunnityOrClose],

This now can be simplified.

michal: This now can be simplified.

[navigateToThread, openCommunity, setOpenCommunnityOrClose],

);

const labelStylesObj = useStyles(labelUnboundStyles);

const labelStyles = React.useMemo(

() => [

labelStylesObj.level0Label,

labelStylesObj.level1Label,

labelStylesObj.level2Label,

[labelStylesObj],

);

const drawerItemsData = React.useMemo(

() =>

createRecursiveDrawerItemsData(

childThreadInfosMap,

communitiesSuffixed,

labelStyles,

maxDepth,

[childThreadInfosMap, communitiesSuffixed, labelStyles],

);

return (

</SafeAreaView>

);

}

function createRecursiveDrawerItemsData(

childThreadInfosMap: { +[id: string]: $ReadOnlyArray<ThreadInfo> },

communities: $ReadOnlyArray<ThreadInfo>,

labelStyles: $ReadOnlyArray<TextStyle>,

) {

const result = communities.map(community => ({

key: community.id,

threadInfo: community,

itemChildren: [],

labelStyle: labelStyles[0],

subchannelsButton: false,

}));

let queue = result.map(item => [item, 0]);

for (let i = 0; i < queue.length; i++) {

const [item, lvl] = queue[i];

const itemChildThreadInfos = childThreadInfosMap[item.threadInfo.id] ?? [];

if (lvl < maxDepth) {

item.itemChildren = itemChildThreadInfos

.filter(childItem => communitySubthreads.includes(childItem.type))

.map(childItem => ({

threadInfo: childItem,

itemChildren: [],

labelStyle: labelStyles[Math.min(lvl + 1, labelStyles.length - 1)],

hasSubchannelsButton:

lvl + 1 === maxDepth &&

threadHasSubchannels(childItem, childThreadInfosMap),

}));

queue = queue.concat(

item.itemChildren.map(childItem => [childItem, lvl + 1]),

);

}

return result;

}

function threadHasSubchannels(

threadInfo: ThreadInfo,

childThreadInfosMap: { +[id: string]: $ReadOnlyArray<ThreadInfo> },

) {

if (!childThreadInfosMap[threadInfo.id]?.length) {

return false;

}

return childThreadInfosMap[threadInfo.id].some(thread =>

threadIsChannel(thread),

);

}

function appendSuffix(chats: $ReadOnlyArray<ThreadInfo>): ThreadInfo[] {

const result = [];

const names = new Map<string, number>();

for (const chat of chats) {

let name = chat.uiName;

const numberOfOccurrences = names.get(name);

names.set(name, (numberOfOccurrences ?? 0) + 1);

if (numberOfOccurrences) {

name = `${name} (${numberOfOccurrences.toString()})`;

}

result.push({ ...chat, uiName: name });

}

return result;

}

const unboundStyles = {

drawerContent: {

flex: 1,

paddingRight: 8,

paddingTop: 8,

backgroundColor: 'drawerBackgroud',

};

Show All 26 Lines

[lib] Move test messages outside of the describe scope to reuse themClosedPublicActions