Paths

Table of Contentst

-
keyserver/src/creators/
-
src/
-
creators/
-
update-creator.js
-
lib/shared/updates/
-
shared/
-
updates/
1
bad-device-token-spec.js
1
delete-account-spec.js
1
delete-thread-spec.js
-
join-thread-spec.js
-
update-current-user-spec.js
-
update-entry-spec.js
-
update-spec.js
-
update-thread-read-status-spec.js
-
update-thread-spec.js
-
update-user-spec.js

[keyserver] Move update delete condition to a spec
ClosedPublic
Actions

Authored by tomek on Oct 31 2023, 8:56 AM.

Details

Reviewers

kamil
inka
bartek

Commits

rCOMMeeed0650fd0b: [keyserver] Move update delete condition to a spec

Summary

Add a field to a spec defining delete condition for a type.

Depends on D9657

Test Plan

Generate some updates, reintroduce old code, and compare new with old result using _.isEqual

Diff Detail

Repository

rCOMM Comm

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

tomek created this revision.Oct 31 2023, 8:56 AM

Herald added subscribers: will, ashoat. · View Herald TranscriptOct 31 2023, 8:56 AM

tomek added a child revision: D9659: [keyserver] Simplify updates merging.Oct 31 2023, 9:00 AM

Harbormaster completed remote builds in B23615: Diff 32558.Oct 31 2023, 10:02 AM

tomek requested review of this revision.Oct 31 2023, 10:02 AM

kamil accepted this revision.Nov 2 2023, 9:37 AM

kamil added inline comments.

keyserver/src/creators/update-creator.js
72	it's used twice, can we make a type alias?

This revision is now accepted and ready to land.Nov 2 2023, 9:37 AM

kamil mentioned this in D9660: [keyserver] Move merging of updates to a spec.Nov 3 2023, 2:54 AM

Create shared type

Harbormaster completed remote builds in B23785: Diff 32753.Nov 6 2023, 5:36 AM

Closed by commit rCOMMeeed0650fd0b: [keyserver] Move update delete condition to a spec (authored by tomek). · Explain WhyNov 6 2023, 6:59 AM

This revision was automatically updated to reflect the committed changes.

tomek added a commit: rCOMMeeed0650fd0b: [keyserver] Move update delete condition to a spec.

Revision Contents
Changeset List

Path

Size

keyserver/

src/

creators/

update-creator.js

28 lines

lib/

shared/

updates/

bad-device-token-spec.js

1 line

delete-account-spec.js

4 lines

delete-thread-spec.js

1 line

join-thread-spec.js

1 line

update-current-user-spec.js

1 line

update-entry-spec.js

1 line

update-spec.js

2 lines

update-thread-read-status-spec.js

1 line

update-thread-spec.js

4 lines

update-user-spec.js

1 line

Diff 32558

View Options

keyserver/src/creators/update-creator.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

View Options

lib/shared/updates/bad-device-token-spec.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

View Options

lib/shared/updates/delete-account-spec.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

View Options

lib/shared/updates/delete-thread-spec.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

View Options

lib/shared/updates/join-thread-spec.js

View Options

lib/shared/updates/update-current-user-spec.js

View Options

lib/shared/updates/update-entry-spec.js

View Options

lib/shared/updates/update-spec.js

View Options

lib/shared/updates/update-thread-read-status-spec.js

View Options

lib/shared/updates/update-thread-spec.js

View Options

lib/shared/updates/update-user-spec.js

[keyserver] Move update delete condition to a specClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 32558

keyserver/src/creators/update-creator.js

lib/shared/updates/bad-device-token-spec.js

lib/shared/updates/delete-account-spec.js

lib/shared/updates/delete-thread-spec.js

lib/shared/updates/join-thread-spec.js

lib/shared/updates/update-current-user-spec.js

lib/shared/updates/update-entry-spec.js

lib/shared/updates/update-spec.js

lib/shared/updates/update-thread-read-status-spec.js

lib/shared/updates/update-thread-spec.js

lib/shared/updates/update-user-spec.js

[keyserver] Move update delete condition to a spec
ClosedPublic
Actions

Revision Contents
Changeset List