Page MenuHomePhabricator
Differential D9658

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

Authored by tomek on Oct 31 2023, 8:56 AM.
Tags
None
Referenced Files
F5071240: D9658.id32558.diff
Fri, Mar 28, 4:10 AM
Unknown Object (File)
Wed, Mar 26, 3:56 AM
Unknown Object (File)
Sat, Mar 1, 11:13 AM
Unknown Object (File)
Sat, Mar 1, 10:56 AM
Unknown Object (File)
Sat, Mar 1, 10:56 AM
Unknown Object (File)
Sat, Mar 1, 10:56 AM
Unknown Object (File)
Sat, Mar 1, 9:35 AM
Unknown Object (File)
Jan 31 2025, 4:11 PM
View All 93 Files
Subscribers
ashoat
will

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
Lint Not Applicable
Unit
Tests Not Applicable

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 ↗(On Diff #32558)

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
tomek updated this revision to Diff 32753.Nov 6 2023, 5:17 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

Diff 32777

View Options

keyserver/src/creators/update-creator.js

Show All 20 Lines
import Button from '../../../components/button.react'; import Button from '../../../components/button.react';
import EnumSettingsOption from '../../../components/enum-settings-option.react'; import EnumSettingsOption from '../../../components/enum-settings-option.react';
import { useSelector } from '../../../redux/redux-utils'; import { useSelector } from '../../../redux/redux-utils';
import Modal from '../../modal.react'; import Modal from '../../modal.react';
import css from './notifications-modal.css'; import css from './notifications-modal.css';
type NotificationSettings = 'focused' | 'badge-only' | 'background'; type NotificationSettings = 'focused' | 'badge-only' | 'background';
const BANNER_NOTIFS = 'Banner notifs';
const BADGE_COUNT = 'Badge count';
const IN_FOCUSED_TAB = 'Lives in Focused tab';
const IN_BACKGROUND_TAB = 'Lives in Background tab';
const focusedStatements = [
{ statement: BANNER_NOTIFS, isStatementValid: true },
{ statement: BADGE_COUNT, isStatementValid: true },
{ statement: IN_FOCUSED_TAB, isStatementValid: true },
];
const badgeOnlyStatements = [
{ statement: BANNER_NOTIFS, isStatementValid: false },
{ statement: BADGE_COUNT, isStatementValid: true },
{ statement: IN_FOCUSED_TAB, isStatementValid: true },
];
const backgroundStatements = [
{ statement: BANNER_NOTIFS, isStatementValid: false },
{ statement: BADGE_COUNT, isStatementValid: false },
{ statement: IN_BACKGROUND_TAB, isStatementValid: true },
];
type Props = { type Props = {
+threadID: string, +threadID: string,
+onClose: () => void, +onClose: () => void,
}; };
function NotificationsModal(props: Props): React.Node { function NotificationsModal(props: Props): React.Node {
const { onClose, threadID } = props; const { onClose, threadID } = props;
const threadInfo = useSelector(state => threadInfoSelector(state)[threadID]); const threadInfo = useSelector(state => threadInfoSelector(state)[threadID]);
const { subscription } = threadInfo.currentUser; const { subscription } = threadInfo.currentUser;
const initialThreadSetting = React.useMemo<NotificationSettings>(() => { const initialThreadSetting = React.useMemo<NotificationSettings>(() => {
if (!subscription.home) { if (!subscription.home) {
return 'background'; return 'background';
Show All 19 Linesfunction NotificationsModal(props: Props): React.Node {
); );
const onBackgroundSelected = React.useCallback( const onBackgroundSelected = React.useCallback(
() => setNotificationSettings('background'), () => setNotificationSettings('background'),
[], [],
); );
const isFocusedSelected = notificationSettings === 'focused'; const isFocusedSelected = notificationSettings === 'focused';
const focusedItem = React.useMemo(() => { const focusedItem = React.useMemo(() => {
const statements = [
{ statement: 'Banner notifs', isStatementValid: true },
{ statement: 'Badge count', isStatementValid: true },
{ statement: 'Lives in Focused tab', isStatementValid: true },
];
const icon = ( const icon = (
<img <img
src={`${assetCacheURLPrefix}/${focusedNotificationsIllustrationAsset.fileName}`} src={`${assetCacheURLPrefix}/${focusedNotificationsIllustrationAsset.fileName}`}
height={focusedNotificationsIllustrationAsset.height} height={focusedNotificationsIllustrationAsset.height}
width={focusedNotificationsIllustrationAsset.width} width={focusedNotificationsIllustrationAsset.width}
/> />
); );
return ( return (
<EnumSettingsOption <EnumSettingsOption
selected={isFocusedSelected} selected={isFocusedSelected}
title="Focused (enabled)" title="Focused (enabled)"
statements={statements} statements={focusedStatements}
icon={icon} icon={icon}
onSelect={onFocusedSelected} onSelect={onFocusedSelected}
/> />
); );
}, [isFocusedSelected, onFocusedSelected]); }, [isFocusedSelected, onFocusedSelected]);
const isFocusedBadgeOnlySelected = notificationSettings === 'badge-only'; const isFocusedBadgeOnlySelected = notificationSettings === 'badge-only';
const focusedBadgeOnlyItem = React.useMemo(() => { const focusedBadgeOnlyItem = React.useMemo(() => {
const statements = [
{ statement: 'Banner notifs', isStatementValid: false },
{ statement: 'Badge count', isStatementValid: true },
{ statement: 'Lives in Focused tab', isStatementValid: true },
];
const icon = ( const icon = (
<img <img
src={`${assetCacheURLPrefix}/${badgeOnlyNotificationsIllustrationAsset.fileName}`} src={`${assetCacheURLPrefix}/${badgeOnlyNotificationsIllustrationAsset.fileName}`}
height={badgeOnlyNotificationsIllustrationAsset.height} height={badgeOnlyNotificationsIllustrationAsset.height}
width={badgeOnlyNotificationsIllustrationAsset.width} width={badgeOnlyNotificationsIllustrationAsset.width}
/> />
); );
return ( return (
<EnumSettingsOption <EnumSettingsOption
selected={isFocusedBadgeOnlySelected} selected={isFocusedBadgeOnlySelected}
title="Focused (badge only)" title="Focused (badge only)"
statements={statements} statements={badgeOnlyStatements}
icon={icon} icon={icon}
onSelect={onBadgeOnlySelected} onSelect={onBadgeOnlySelected}
/> />
); );
}, [isFocusedBadgeOnlySelected, onBadgeOnlySelected]); }, [isFocusedBadgeOnlySelected, onBadgeOnlySelected]);
const isBackgroundSelected = notificationSettings === 'background'; const isBackgroundSelected = notificationSettings === 'background';
const backgroundItem = React.useMemo(() => { const backgroundItem = React.useMemo(() => {
const statements = [
{ statement: 'Banner notifs', isStatementValid: false },
{ statement: 'Badge count', isStatementValid: false },
{ statement: 'Lives in Background tab', isStatementValid: true },
];
const icon = ( const icon = (
<img <img
src={`${assetCacheURLPrefix}/${backgroundNotificationsIllustrationAsset.fileName}`} src={`${assetCacheURLPrefix}/${backgroundNotificationsIllustrationAsset.fileName}`}
height={backgroundNotificationsIllustrationAsset.height} height={backgroundNotificationsIllustrationAsset.height}
width={backgroundNotificationsIllustrationAsset.width} width={backgroundNotificationsIllustrationAsset.width}
/> />
); );
return ( return (
<EnumSettingsOption <EnumSettingsOption
selected={isBackgroundSelected} selected={isBackgroundSelected}
title="Background" title="Background"
statements={statements} statements={backgroundStatements}
icon={icon} icon={icon}
onSelect={onBackgroundSelected} onSelect={onBackgroundSelected}
/> />
); );
}, [isBackgroundSelected, onBackgroundSelected]); }, [isBackgroundSelected, onBackgroundSelected]);
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
▲ Show 20 Lines • Show All 43 Lines • Show Last 20 Lines
View Options

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

Show All 20 Lines
import Button from '../../../components/button.react'; import Button from '../../../components/button.react';
import EnumSettingsOption from '../../../components/enum-settings-option.react'; import EnumSettingsOption from '../../../components/enum-settings-option.react';
import { useSelector } from '../../../redux/redux-utils'; import { useSelector } from '../../../redux/redux-utils';
import Modal from '../../modal.react'; import Modal from '../../modal.react';
import css from './notifications-modal.css'; import css from './notifications-modal.css';
type NotificationSettings = 'focused' | 'badge-only' | 'background'; type NotificationSettings = 'focused' | 'badge-only' | 'background';
const BANNER_NOTIFS = 'Banner notifs';
const BADGE_COUNT = 'Badge count';
const IN_FOCUSED_TAB = 'Lives in Focused tab';
const IN_BACKGROUND_TAB = 'Lives in Background tab';
const focusedStatements = [
{ statement: BANNER_NOTIFS, isStatementValid: true },
{ statement: BADGE_COUNT, isStatementValid: true },
{ statement: IN_FOCUSED_TAB, isStatementValid: true },
];
const badgeOnlyStatements = [
{ statement: BANNER_NOTIFS, isStatementValid: false },
{ statement: BADGE_COUNT, isStatementValid: true },
{ statement: IN_FOCUSED_TAB, isStatementValid: true },
];
const backgroundStatements = [
{ statement: BANNER_NOTIFS, isStatementValid: false },
{ statement: BADGE_COUNT, isStatementValid: false },
{ statement: IN_BACKGROUND_TAB, isStatementValid: true },
];
type Props = { type Props = {
+threadID: string, +threadID: string,
+onClose: () => void, +onClose: () => void,
}; };
function NotificationsModal(props: Props): React.Node { function NotificationsModal(props: Props): React.Node {
const { onClose, threadID } = props; const { onClose, threadID } = props;
const threadInfo = useSelector(state => threadInfoSelector(state)[threadID]); const threadInfo = useSelector(state => threadInfoSelector(state)[threadID]);
const { subscription } = threadInfo.currentUser; const { subscription } = threadInfo.currentUser;
const initialThreadSetting = React.useMemo<NotificationSettings>(() => { const initialThreadSetting = React.useMemo<NotificationSettings>(() => {
if (!subscription.home) { if (!subscription.home) {
return 'background'; return 'background';
Show All 19 Linesfunction NotificationsModal(props: Props): React.Node {
); );
const onBackgroundSelected = React.useCallback( const onBackgroundSelected = React.useCallback(
() => setNotificationSettings('background'), () => setNotificationSettings('background'),
[], [],
); );
const isFocusedSelected = notificationSettings === 'focused'; const isFocusedSelected = notificationSettings === 'focused';
const focusedItem = React.useMemo(() => { const focusedItem = React.useMemo(() => {
const statements = [
{ statement: 'Banner notifs', isStatementValid: true },
{ statement: 'Badge count', isStatementValid: true },
{ statement: 'Lives in Focused tab', isStatementValid: true },
];
const icon = ( const icon = (
<img <img
src={`${assetCacheURLPrefix}/${focusedNotificationsIllustrationAsset.fileName}`} src={`${assetCacheURLPrefix}/${focusedNotificationsIllustrationAsset.fileName}`}
height={focusedNotificationsIllustrationAsset.height} height={focusedNotificationsIllustrationAsset.height}
width={focusedNotificationsIllustrationAsset.width} width={focusedNotificationsIllustrationAsset.width}
/> />
); );
return ( return (
<EnumSettingsOption <EnumSettingsOption
selected={isFocusedSelected} selected={isFocusedSelected}
title="Focused (enabled)" title="Focused (enabled)"
statements={statements} statements={focusedStatements}
icon={icon} icon={icon}
onSelect={onFocusedSelected} onSelect={onFocusedSelected}
/> />
); );
}, [isFocusedSelected, onFocusedSelected]); }, [isFocusedSelected, onFocusedSelected]);
const isFocusedBadgeOnlySelected = notificationSettings === 'badge-only'; const isFocusedBadgeOnlySelected = notificationSettings === 'badge-only';
const focusedBadgeOnlyItem = React.useMemo(() => { const focusedBadgeOnlyItem = React.useMemo(() => {
const statements = [
{ statement: 'Banner notifs', isStatementValid: false },
{ statement: 'Badge count', isStatementValid: true },
{ statement: 'Lives in Focused tab', isStatementValid: true },
];
const icon = ( const icon = (
<img <img
src={`${assetCacheURLPrefix}/${badgeOnlyNotificationsIllustrationAsset.fileName}`} src={`${assetCacheURLPrefix}/${badgeOnlyNotificationsIllustrationAsset.fileName}`}
height={badgeOnlyNotificationsIllustrationAsset.height} height={badgeOnlyNotificationsIllustrationAsset.height}
width={badgeOnlyNotificationsIllustrationAsset.width} width={badgeOnlyNotificationsIllustrationAsset.width}
/> />
); );
return ( return (
<EnumSettingsOption <EnumSettingsOption
selected={isFocusedBadgeOnlySelected} selected={isFocusedBadgeOnlySelected}
title="Focused (badge only)" title="Focused (badge only)"
statements={statements} statements={badgeOnlyStatements}
icon={icon} icon={icon}
onSelect={onBadgeOnlySelected} onSelect={onBadgeOnlySelected}
/> />
); );
}, [isFocusedBadgeOnlySelected, onBadgeOnlySelected]); }, [isFocusedBadgeOnlySelected, onBadgeOnlySelected]);
const isBackgroundSelected = notificationSettings === 'background'; const isBackgroundSelected = notificationSettings === 'background';
const backgroundItem = React.useMemo(() => { const backgroundItem = React.useMemo(() => {
const statements = [
{ statement: 'Banner notifs', isStatementValid: false },
{ statement: 'Badge count', isStatementValid: false },
{ statement: 'Lives in Background tab', isStatementValid: true },
];
const icon = ( const icon = (
<img <img
src={`${assetCacheURLPrefix}/${backgroundNotificationsIllustrationAsset.fileName}`} src={`${assetCacheURLPrefix}/${backgroundNotificationsIllustrationAsset.fileName}`}
height={backgroundNotificationsIllustrationAsset.height} height={backgroundNotificationsIllustrationAsset.height}
width={backgroundNotificationsIllustrationAsset.width} width={backgroundNotificationsIllustrationAsset.width}
/> />
); );
return ( return (
<EnumSettingsOption <EnumSettingsOption
selected={isBackgroundSelected} selected={isBackgroundSelected}
title="Background" title="Background"
statements={statements} statements={backgroundStatements}
icon={icon} icon={icon}
onSelect={onBackgroundSelected} onSelect={onBackgroundSelected}
/> />
); );
}, [isBackgroundSelected, onBackgroundSelected]); }, [isBackgroundSelected, onBackgroundSelected]);
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
▲ Show 20 Lines • Show All 43 Lines • Show Last 20 Lines
View Options

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

Show All 20 Lines
import Button from '../../../components/button.react'; import Button from '../../../components/button.react';
import EnumSettingsOption from '../../../components/enum-settings-option.react'; import EnumSettingsOption from '../../../components/enum-settings-option.react';
import { useSelector } from '../../../redux/redux-utils'; import { useSelector } from '../../../redux/redux-utils';
import Modal from '../../modal.react'; import Modal from '../../modal.react';
import css from './notifications-modal.css'; import css from './notifications-modal.css';
type NotificationSettings = 'focused' | 'badge-only' | 'background'; type NotificationSettings = 'focused' | 'badge-only' | 'background';
const BANNER_NOTIFS = 'Banner notifs';
const BADGE_COUNT = 'Badge count';
const IN_FOCUSED_TAB = 'Lives in Focused tab';
const IN_BACKGROUND_TAB = 'Lives in Background tab';
const focusedStatements = [
{ statement: BANNER_NOTIFS, isStatementValid: true },
{ statement: BADGE_COUNT, isStatementValid: true },
{ statement: IN_FOCUSED_TAB, isStatementValid: true },
];
const badgeOnlyStatements = [
{ statement: BANNER_NOTIFS, isStatementValid: false },
{ statement: BADGE_COUNT, isStatementValid: true },
{ statement: IN_FOCUSED_TAB, isStatementValid: true },
];
const backgroundStatements = [
{ statement: BANNER_NOTIFS, isStatementValid: false },
{ statement: BADGE_COUNT, isStatementValid: false },
{ statement: IN_BACKGROUND_TAB, isStatementValid: true },
];
type Props = { type Props = {
+threadID: string, +threadID: string,
+onClose: () => void, +onClose: () => void,
}; };
function NotificationsModal(props: Props): React.Node { function NotificationsModal(props: Props): React.Node {
const { onClose, threadID } = props; const { onClose, threadID } = props;
const threadInfo = useSelector(state => threadInfoSelector(state)[threadID]); const threadInfo = useSelector(state => threadInfoSelector(state)[threadID]);
const { subscription } = threadInfo.currentUser; const { subscription } = threadInfo.currentUser;
const initialThreadSetting = React.useMemo<NotificationSettings>(() => { const initialThreadSetting = React.useMemo<NotificationSettings>(() => {
if (!subscription.home) { if (!subscription.home) {
return 'background'; return 'background';
Show All 19 Linesfunction NotificationsModal(props: Props): React.Node {
); );
const onBackgroundSelected = React.useCallback( const onBackgroundSelected = React.useCallback(
() => setNotificationSettings('background'), () => setNotificationSettings('background'),
[], [],
); );
const isFocusedSelected = notificationSettings === 'focused'; const isFocusedSelected = notificationSettings === 'focused';
const focusedItem = React.useMemo(() => { const focusedItem = React.useMemo(() => {
const statements = [
{ statement: 'Banner notifs', isStatementValid: true },
{ statement: 'Badge count', isStatementValid: true },
{ statement: 'Lives in Focused tab', isStatementValid: true },
];
const icon = ( const icon = (
<img <img
src={`${assetCacheURLPrefix}/${focusedNotificationsIllustrationAsset.fileName}`} src={`${assetCacheURLPrefix}/${focusedNotificationsIllustrationAsset.fileName}`}
height={focusedNotificationsIllustrationAsset.height} height={focusedNotificationsIllustrationAsset.height}
width={focusedNotificationsIllustrationAsset.width} width={focusedNotificationsIllustrationAsset.width}
/> />
); );
return ( return (
<EnumSettingsOption <EnumSettingsOption
selected={isFocusedSelected} selected={isFocusedSelected}
title="Focused (enabled)" title="Focused (enabled)"
statements={statements} statements={focusedStatements}
icon={icon} icon={icon}
onSelect={onFocusedSelected} onSelect={onFocusedSelected}
/> />
); );
}, [isFocusedSelected, onFocusedSelected]); }, [isFocusedSelected, onFocusedSelected]);
const isFocusedBadgeOnlySelected = notificationSettings === 'badge-only'; const isFocusedBadgeOnlySelected = notificationSettings === 'badge-only';
const focusedBadgeOnlyItem = React.useMemo(() => { const focusedBadgeOnlyItem = React.useMemo(() => {
const statements = [
{ statement: 'Banner notifs', isStatementValid: false },
{ statement: 'Badge count', isStatementValid: true },
{ statement: 'Lives in Focused tab', isStatementValid: true },
];
const icon = ( const icon = (
<img <img
src={`${assetCacheURLPrefix}/${badgeOnlyNotificationsIllustrationAsset.fileName}`} src={`${assetCacheURLPrefix}/${badgeOnlyNotificationsIllustrationAsset.fileName}`}
height={badgeOnlyNotificationsIllustrationAsset.height} height={badgeOnlyNotificationsIllustrationAsset.height}
width={badgeOnlyNotificationsIllustrationAsset.width} width={badgeOnlyNotificationsIllustrationAsset.width}
/> />
); );
return ( return (
<EnumSettingsOption <EnumSettingsOption
selected={isFocusedBadgeOnlySelected} selected={isFocusedBadgeOnlySelected}
title="Focused (badge only)" title="Focused (badge only)"
statements={statements} statements={badgeOnlyStatements}
icon={icon} icon={icon}
onSelect={onBadgeOnlySelected} onSelect={onBadgeOnlySelected}
/> />
); );
}, [isFocusedBadgeOnlySelected, onBadgeOnlySelected]); }, [isFocusedBadgeOnlySelected, onBadgeOnlySelected]);
const isBackgroundSelected = notificationSettings === 'background'; const isBackgroundSelected = notificationSettings === 'background';
const backgroundItem = React.useMemo(() => { const backgroundItem = React.useMemo(() => {
const statements = [
{ statement: 'Banner notifs', isStatementValid: false },
{ statement: 'Badge count', isStatementValid: false },
{ statement: 'Lives in Background tab', isStatementValid: true },
];
const icon = ( const icon = (
<img <img
src={`${assetCacheURLPrefix}/${backgroundNotificationsIllustrationAsset.fileName}`} src={`${assetCacheURLPrefix}/${backgroundNotificationsIllustrationAsset.fileName}`}
height={backgroundNotificationsIllustrationAsset.height} height={backgroundNotificationsIllustrationAsset.height}
width={backgroundNotificationsIllustrationAsset.width} width={backgroundNotificationsIllustrationAsset.width}
/> />
); );
return ( return (
<EnumSettingsOption <EnumSettingsOption
selected={isBackgroundSelected} selected={isBackgroundSelected}
title="Background" title="Background"
statements={statements} statements={backgroundStatements}
icon={icon} icon={icon}
onSelect={onBackgroundSelected} onSelect={onBackgroundSelected}
/> />
); );
}, [isBackgroundSelected, onBackgroundSelected]); }, [isBackgroundSelected, onBackgroundSelected]);
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
▲ Show 20 Lines • Show All 43 Lines • Show Last 20 Lines
View Options

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

Show All 20 Lines
import Button from '../../../components/button.react'; import Button from '../../../components/button.react';
import EnumSettingsOption from '../../../components/enum-settings-option.react'; import EnumSettingsOption from '../../../components/enum-settings-option.react';
import { useSelector } from '../../../redux/redux-utils'; import { useSelector } from '../../../redux/redux-utils';
import Modal from '../../modal.react'; import Modal from '../../modal.react';
import css from './notifications-modal.css'; import css from './notifications-modal.css';
type NotificationSettings = 'focused' | 'badge-only' | 'background'; type NotificationSettings = 'focused' | 'badge-only' | 'background';
const BANNER_NOTIFS = 'Banner notifs';
const BADGE_COUNT = 'Badge count';
const IN_FOCUSED_TAB = 'Lives in Focused tab';
const IN_BACKGROUND_TAB = 'Lives in Background tab';
const focusedStatements = [
{ statement: BANNER_NOTIFS, isStatementValid: true },
{ statement: BADGE_COUNT, isStatementValid: true },
{ statement: IN_FOCUSED_TAB, isStatementValid: true },
];
const badgeOnlyStatements = [
{ statement: BANNER_NOTIFS, isStatementValid: false },
{ statement: BADGE_COUNT, isStatementValid: true },
{ statement: IN_FOCUSED_TAB, isStatementValid: true },
];
const backgroundStatements = [
{ statement: BANNER_NOTIFS, isStatementValid: false },
{ statement: BADGE_COUNT, isStatementValid: false },
{ statement: IN_BACKGROUND_TAB, isStatementValid: true },
];
type Props = { type Props = {
+threadID: string, +threadID: string,
+onClose: () => void, +onClose: () => void,
}; };
function NotificationsModal(props: Props): React.Node { function NotificationsModal(props: Props): React.Node {
const { onClose, threadID } = props; const { onClose, threadID } = props;
const threadInfo = useSelector(state => threadInfoSelector(state)[threadID]); const threadInfo = useSelector(state => threadInfoSelector(state)[threadID]);
const { subscription } = threadInfo.currentUser; const { subscription } = threadInfo.currentUser;
const initialThreadSetting = React.useMemo<NotificationSettings>(() => { const initialThreadSetting = React.useMemo<NotificationSettings>(() => {
if (!subscription.home) { if (!subscription.home) {
return 'background'; return 'background';
Show All 19 Linesfunction NotificationsModal(props: Props): React.Node {
); );
const onBackgroundSelected = React.useCallback( const onBackgroundSelected = React.useCallback(
() => setNotificationSettings('background'), () => setNotificationSettings('background'),
[], [],
); );
const isFocusedSelected = notificationSettings === 'focused'; const isFocusedSelected = notificationSettings === 'focused';
const focusedItem = React.useMemo(() => { const focusedItem = React.useMemo(() => {
const statements = [
{ statement: 'Banner notifs', isStatementValid: true },
{ statement: 'Badge count', isStatementValid: true },
{ statement: 'Lives in Focused tab', isStatementValid: true },
];
const icon = ( const icon = (
<img <img
src={`${assetCacheURLPrefix}/${focusedNotificationsIllustrationAsset.fileName}`} src={`${assetCacheURLPrefix}/${focusedNotificationsIllustrationAsset.fileName}`}
height={focusedNotificationsIllustrationAsset.height} height={focusedNotificationsIllustrationAsset.height}
width={focusedNotificationsIllustrationAsset.width} width={focusedNotificationsIllustrationAsset.width}
/> />
); );
return ( return (
<EnumSettingsOption <EnumSettingsOption
selected={isFocusedSelected} selected={isFocusedSelected}
title="Focused (enabled)" title="Focused (enabled)"
statements={statements} statements={focusedStatements}
icon={icon} icon={icon}
onSelect={onFocusedSelected} onSelect={onFocusedSelected}
/> />
); );
}, [isFocusedSelected, onFocusedSelected]); }, [isFocusedSelected, onFocusedSelected]);
const isFocusedBadgeOnlySelected = notificationSettings === 'badge-only'; const isFocusedBadgeOnlySelected = notificationSettings === 'badge-only';
const focusedBadgeOnlyItem = React.useMemo(() => { const focusedBadgeOnlyItem = React.useMemo(() => {
const statements = [
{ statement: 'Banner notifs', isStatementValid: false },
{ statement: 'Badge count', isStatementValid: true },
{ statement: 'Lives in Focused tab', isStatementValid: true },
];
const icon = ( const icon = (
<img <img
src={`${assetCacheURLPrefix}/${badgeOnlyNotificationsIllustrationAsset.fileName}`} src={`${assetCacheURLPrefix}/${badgeOnlyNotificationsIllustrationAsset.fileName}`}
height={badgeOnlyNotificationsIllustrationAsset.height} height={badgeOnlyNotificationsIllustrationAsset.height}
width={badgeOnlyNotificationsIllustrationAsset.width} width={badgeOnlyNotificationsIllustrationAsset.width}
/> />
); );
return ( return (
<EnumSettingsOption <EnumSettingsOption
selected={isFocusedBadgeOnlySelected} selected={isFocusedBadgeOnlySelected}
title="Focused (badge only)" title="Focused (badge only)"
statements={statements} statements={badgeOnlyStatements}
icon={icon} icon={icon}
onSelect={onBadgeOnlySelected} onSelect={onBadgeOnlySelected}
/> />
); );
}, [isFocusedBadgeOnlySelected, onBadgeOnlySelected]); }, [isFocusedBadgeOnlySelected, onBadgeOnlySelected]);
const isBackgroundSelected = notificationSettings === 'background'; const isBackgroundSelected = notificationSettings === 'background';
const backgroundItem = React.useMemo(() => { const backgroundItem = React.useMemo(() => {
const statements = [
{ statement: 'Banner notifs', isStatementValid: false },
{ statement: 'Badge count', isStatementValid: false },
{ statement: 'Lives in Background tab', isStatementValid: true },
];
const icon = ( const icon = (
<img <img
src={`${assetCacheURLPrefix}/${backgroundNotificationsIllustrationAsset.fileName}`} src={`${assetCacheURLPrefix}/${backgroundNotificationsIllustrationAsset.fileName}`}
height={backgroundNotificationsIllustrationAsset.height} height={backgroundNotificationsIllustrationAsset.height}
width={backgroundNotificationsIllustrationAsset.width} width={backgroundNotificationsIllustrationAsset.width}
/> />
); );
return ( return (
<EnumSettingsOption <EnumSettingsOption
selected={isBackgroundSelected} selected={isBackgroundSelected}
title="Background" title="Background"
statements={statements} statements={backgroundStatements}
icon={icon} icon={icon}
onSelect={onBackgroundSelected} onSelect={onBackgroundSelected}
/> />
); );
}, [isBackgroundSelected, onBackgroundSelected]); }, [isBackgroundSelected, onBackgroundSelected]);
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
▲ Show 20 Lines • Show All 43 Lines • Show Last 20 Lines
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

lib/shared/updates/update-spec.js

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...