Chore: Migrate NotificationPreferencesView to Typescript
* chore: migrate the view NotificationPreferencesView to ts * chore: change the type of `room` to use Observable and Subscription
This commit is contained in:
parent
f52a017ff3
commit
7d15e2d309
|
@ -1,6 +1,9 @@
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { StyleSheet, Switch, Text } from 'react-native';
|
import { StyleSheet, Switch, Text } from 'react-native';
|
||||||
import PropTypes from 'prop-types';
|
import { RouteProp } from '@react-navigation/core';
|
||||||
|
import { StackNavigationProp } from '@react-navigation/stack';
|
||||||
|
import Model from '@nozbe/watermelondb/Model';
|
||||||
|
import { Observable, Subscription } from 'rxjs';
|
||||||
|
|
||||||
import database from '../../lib/database';
|
import database from '../../lib/database';
|
||||||
import { SWITCH_TRACK_COLOR, themes } from '../../constants/colors';
|
import { SWITCH_TRACK_COLOR, themes } from '../../constants/colors';
|
||||||
|
@ -22,18 +25,31 @@ const styles = StyleSheet.create({
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
class NotificationPreferencesView extends React.Component {
|
interface INotificationPreferencesView {
|
||||||
|
navigation: StackNavigationProp<any, 'NotificationPreferencesView'>;
|
||||||
|
route: RouteProp<
|
||||||
|
{
|
||||||
|
NotificationPreferencesView: {
|
||||||
|
rid: string;
|
||||||
|
room: Model;
|
||||||
|
};
|
||||||
|
},
|
||||||
|
'NotificationPreferencesView'
|
||||||
|
>;
|
||||||
|
theme: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
class NotificationPreferencesView extends React.Component<INotificationPreferencesView, any> {
|
||||||
static navigationOptions = () => ({
|
static navigationOptions = () => ({
|
||||||
title: I18n.t('Notification_Preferences')
|
title: I18n.t('Notification_Preferences')
|
||||||
});
|
});
|
||||||
|
|
||||||
static propTypes = {
|
private mounted: boolean;
|
||||||
navigation: PropTypes.object,
|
private rid: string | undefined;
|
||||||
route: PropTypes.object,
|
private roomObservable?: Observable<Model>;
|
||||||
theme: PropTypes.string
|
private subscription?: Subscription;
|
||||||
};
|
|
||||||
|
|
||||||
constructor(props) {
|
constructor(props: INotificationPreferencesView) {
|
||||||
super(props);
|
super(props);
|
||||||
this.mounted = false;
|
this.mounted = false;
|
||||||
this.rid = props.route.params?.rid;
|
this.rid = props.route.params?.rid;
|
||||||
|
@ -43,10 +59,11 @@ class NotificationPreferencesView extends React.Component {
|
||||||
};
|
};
|
||||||
if (room && room.observe) {
|
if (room && room.observe) {
|
||||||
this.roomObservable = room.observe();
|
this.roomObservable = room.observe();
|
||||||
this.subscription = this.roomObservable.subscribe(changes => {
|
this.subscription = this.roomObservable.subscribe((changes: any) => {
|
||||||
if (this.mounted) {
|
if (this.mounted) {
|
||||||
this.setState({ room: changes });
|
this.setState({ room: changes });
|
||||||
} else {
|
} else {
|
||||||
|
// @ts-ignore
|
||||||
this.state.room = changes;
|
this.state.room = changes;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -63,7 +80,8 @@ class NotificationPreferencesView extends React.Component {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
saveNotificationSettings = async (key, value, params) => {
|
saveNotificationSettings = async (key: string, value: string | boolean, params: any) => {
|
||||||
|
// @ts-ignore
|
||||||
logEvent(events[`NP_${key.toUpperCase()}`]);
|
logEvent(events[`NP_${key.toUpperCase()}`]);
|
||||||
const { room } = this.state;
|
const { room } = this.state;
|
||||||
const db = database.active;
|
const db = database.active;
|
||||||
|
@ -71,7 +89,7 @@ class NotificationPreferencesView extends React.Component {
|
||||||
try {
|
try {
|
||||||
await db.action(async () => {
|
await db.action(async () => {
|
||||||
await room.update(
|
await room.update(
|
||||||
protectedFunction(r => {
|
protectedFunction((r: any) => {
|
||||||
r[key] = value;
|
r[key] = value;
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
@ -88,36 +106,38 @@ class NotificationPreferencesView extends React.Component {
|
||||||
|
|
||||||
await db.action(async () => {
|
await db.action(async () => {
|
||||||
await room.update(
|
await room.update(
|
||||||
protectedFunction(r => {
|
protectedFunction((r: any) => {
|
||||||
r[key] = room[key];
|
r[key] = room[key];
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
// @ts-ignore
|
||||||
logEvent(events[`NP_${key.toUpperCase()}_F`]);
|
logEvent(events[`NP_${key.toUpperCase()}_F`]);
|
||||||
log(e);
|
log(e);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
onValueChangeSwitch = (key, value) => this.saveNotificationSettings(key, value, { [key]: value ? '1' : '0' });
|
onValueChangeSwitch = (key: string, value: string | boolean) =>
|
||||||
|
this.saveNotificationSettings(key, value, { [key]: value ? '1' : '0' });
|
||||||
|
|
||||||
onValueChangePicker = (key, value) => this.saveNotificationSettings(key, value, { [key]: value.toString() });
|
onValueChangePicker = (key: string, value: string) => this.saveNotificationSettings(key, value, { [key]: value.toString() });
|
||||||
|
|
||||||
pickerSelection = (title, key) => {
|
pickerSelection = (title: string, key: string) => {
|
||||||
const { room } = this.state;
|
const { room } = this.state;
|
||||||
const { navigation } = this.props;
|
const { navigation } = this.props;
|
||||||
navigation.navigate('PickerView', {
|
navigation.navigate('PickerView', {
|
||||||
title,
|
title,
|
||||||
data: OPTIONS[key],
|
data: OPTIONS[key],
|
||||||
value: room[key],
|
value: room[key],
|
||||||
onChangeValue: value => this.onValueChangePicker(key, value)
|
onChangeValue: (value: string) => this.onValueChangePicker(key, value)
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
renderPickerOption = key => {
|
renderPickerOption = (key: string) => {
|
||||||
const { room } = this.state;
|
const { room } = this.state;
|
||||||
const { theme } = this.props;
|
const { theme } = this.props;
|
||||||
const text = room[key] ? OPTIONS[key].find(option => option.value === room[key]) : OPTIONS[key][0];
|
const text = room[key] ? OPTIONS[key].find((option: any) => option.value === room[key]) : OPTIONS[key][0];
|
||||||
return (
|
return (
|
||||||
<Text style={[styles.pickerText, { color: themes[theme].actionTintColor }]}>
|
<Text style={[styles.pickerText, { color: themes[theme].actionTintColor }]}>
|
||||||
{I18n.t(text?.label, { defaultValue: text?.label, second: text?.second })}
|
{I18n.t(text?.label, { defaultValue: text?.label, second: text?.second })}
|
||||||
|
@ -125,7 +145,7 @@ class NotificationPreferencesView extends React.Component {
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
renderSwitch = key => {
|
renderSwitch = (key: string) => {
|
||||||
const { room } = this.state;
|
const { room } = this.state;
|
||||||
return (
|
return (
|
||||||
<Switch
|
<Switch
|
||||||
|
@ -181,7 +201,7 @@ class NotificationPreferencesView extends React.Component {
|
||||||
<List.Item
|
<List.Item
|
||||||
title='Alert'
|
title='Alert'
|
||||||
testID='notification-preference-view-alert'
|
testID='notification-preference-view-alert'
|
||||||
onPress={title => this.pickerSelection(title, 'desktopNotifications')}
|
onPress={(title: string) => this.pickerSelection(title, 'desktopNotifications')}
|
||||||
right={() => this.renderPickerOption('desktopNotifications')}
|
right={() => this.renderPickerOption('desktopNotifications')}
|
||||||
/>
|
/>
|
||||||
<List.Separator />
|
<List.Separator />
|
||||||
|
@ -193,7 +213,7 @@ class NotificationPreferencesView extends React.Component {
|
||||||
<List.Item
|
<List.Item
|
||||||
title='Alert'
|
title='Alert'
|
||||||
testID='notification-preference-view-push-notification'
|
testID='notification-preference-view-push-notification'
|
||||||
onPress={title => this.pickerSelection(title, 'mobilePushNotifications')}
|
onPress={(title: string) => this.pickerSelection(title, 'mobilePushNotifications')}
|
||||||
right={() => this.renderPickerOption('mobilePushNotifications')}
|
right={() => this.renderPickerOption('mobilePushNotifications')}
|
||||||
/>
|
/>
|
||||||
<List.Separator />
|
<List.Separator />
|
||||||
|
@ -205,21 +225,21 @@ class NotificationPreferencesView extends React.Component {
|
||||||
<List.Item
|
<List.Item
|
||||||
title='Audio'
|
title='Audio'
|
||||||
testID='notification-preference-view-audio'
|
testID='notification-preference-view-audio'
|
||||||
onPress={title => this.pickerSelection(title, 'audioNotifications')}
|
onPress={(title: string) => this.pickerSelection(title, 'audioNotifications')}
|
||||||
right={() => this.renderPickerOption('audioNotifications')}
|
right={() => this.renderPickerOption('audioNotifications')}
|
||||||
/>
|
/>
|
||||||
<List.Separator />
|
<List.Separator />
|
||||||
<List.Item
|
<List.Item
|
||||||
title='Sound'
|
title='Sound'
|
||||||
testID='notification-preference-view-sound'
|
testID='notification-preference-view-sound'
|
||||||
onPress={title => this.pickerSelection(title, 'audioNotificationValue')}
|
onPress={(title: string) => this.pickerSelection(title, 'audioNotificationValue')}
|
||||||
right={() => this.renderPickerOption('audioNotificationValue')}
|
right={() => this.renderPickerOption('audioNotificationValue')}
|
||||||
/>
|
/>
|
||||||
<List.Separator />
|
<List.Separator />
|
||||||
<List.Item
|
<List.Item
|
||||||
title='Notification_Duration'
|
title='Notification_Duration'
|
||||||
testID='notification-preference-view-notification-duration'
|
testID='notification-preference-view-notification-duration'
|
||||||
onPress={title => this.pickerSelection(title, 'desktopNotificationDuration')}
|
onPress={(title: string) => this.pickerSelection(title, 'desktopNotificationDuration')}
|
||||||
right={() => this.renderPickerOption('desktopNotificationDuration')}
|
right={() => this.renderPickerOption('desktopNotificationDuration')}
|
||||||
/>
|
/>
|
||||||
<List.Separator />
|
<List.Separator />
|
||||||
|
@ -230,7 +250,7 @@ class NotificationPreferencesView extends React.Component {
|
||||||
<List.Item
|
<List.Item
|
||||||
title='Alert'
|
title='Alert'
|
||||||
testID='notification-preference-view-email-alert'
|
testID='notification-preference-view-email-alert'
|
||||||
onPress={title => this.pickerSelection(title, 'emailNotifications')}
|
onPress={(title: string) => this.pickerSelection(title, 'emailNotifications')}
|
||||||
right={() => this.renderPickerOption('emailNotifications')}
|
right={() => this.renderPickerOption('emailNotifications')}
|
||||||
/>
|
/>
|
||||||
<List.Separator />
|
<List.Separator />
|
|
@ -1,4 +1,18 @@
|
||||||
export const OPTIONS = {
|
interface IOptionsField {
|
||||||
|
label: string;
|
||||||
|
value: string | number;
|
||||||
|
second?: number;
|
||||||
|
}
|
||||||
|
export interface INotificationOptions {
|
||||||
|
[desktopNotifications: string]: IOptionsField[];
|
||||||
|
audioNotifications: IOptionsField[];
|
||||||
|
mobilePushNotifications: IOptionsField[];
|
||||||
|
emailNotifications: IOptionsField[];
|
||||||
|
desktopNotificationDuration: IOptionsField[];
|
||||||
|
audioNotificationValue: IOptionsField[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export const OPTIONS: INotificationOptions = {
|
||||||
desktopNotifications: [
|
desktopNotifications: [
|
||||||
{
|
{
|
||||||
label: 'Default',
|
label: 'Default',
|
Loading…
Reference in New Issue