Skip to content

Chore: Migrate SelectServerView to Typescript #3521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diegolmello merged 4 commits into from
Dec 2, 2021
Merged

Chore: Migrate SelectServerView to Typescript #3521

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9640311
Chore: Migrate SelectServerView to Typescript
reinaldonetof Nov 24, 2021
3a77e53
minor tweak
reinaldonetof Nov 24, 2021
270c59e
refactor: minor tweak
AlexAlexandre Nov 29, 2021
0353054
Merge branch 'develop' into chore.ts-selectserverview
diegolmello Dec 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 26 additions & 17 deletions app/views/SelectServerView.js → app/views/SelectServerView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import { FlatList } from 'react-native';
import PropTypes from 'prop-types';
import { StackNavigationOptions, StackNavigationProp } from '@react-navigation/stack';
import { connect } from 'react-redux';
import { Q } from '@nozbe/watermelondb';
import { Q, Model } from '@nozbe/watermelondb';

import I18n from '../i18n';
import StatusBar from '../containers/StatusBar';
Expand All @@ -12,29 +12,39 @@ import database from '../lib/database';
import SafeAreaView from '../containers/SafeAreaView';
import * as List from '../containers/List';

const getItemLayout = (data, index) => ({ length: ROW_HEIGHT, offset: ROW_HEIGHT * index, index });
const keyExtractor = item => item.id;
const getItemLayout = (data: any, index: number) => ({ length: ROW_HEIGHT, offset: ROW_HEIGHT * index, index });
const keyExtractor = (item: IServer) => item.id;

class SelectServerView extends React.Component {
static navigationOptions = () => ({
interface IServer extends Model {
id: string;
iconURL?: string;
name?: string;
}

interface ISelectServerViewState {
servers: IServer[];
}

interface ISelectServerViewProps {
navigation: StackNavigationProp<any, 'SelectServerView'>;
server: string;
}

class SelectServerView extends React.Component<ISelectServerViewProps, ISelectServerViewState> {
static navigationOptions = (): StackNavigationOptions => ({
title: I18n.t('Select_Server')
});

static propTypes = {
server: PropTypes.string,
navigation: PropTypes.object
};

state = { servers: [] };
state = { servers: [] as IServer[] };

async componentDidMount() {
const serversDB = database.servers;
const serversCollection = serversDB.get('servers');
const servers = await serversCollection.query(Q.where('rooms_updated_at', Q.notEq(null))).fetch();
const servers: IServer[] = await serversCollection.query(Q.where('rooms_updated_at', Q.notEq(null))).fetch();
this.setState({ servers });
}

select = async server => {
select = async (server: string) => {
const { server: currentServer, navigation } = this.props;

navigation.navigate('ShareListView');
Expand All @@ -43,7 +53,7 @@ class SelectServerView extends React.Component {
}
};

renderItem = ({ item }) => {
renderItem = ({ item }: { item: IServer }) => {
const { server } = this.props;
return <ServerItem onPress={() => this.select(item.id)} item={item} hasCheck={item.id === server} />;
};
Expand All @@ -62,7 +72,6 @@ class SelectServerView extends React.Component {
ItemSeparatorComponent={List.Separator}
ListHeaderComponent={List.Separator}
ListFooterComponent={List.Separator}
enableEmptySections
removeClippedSubviews
keyboardShouldPersistTaps='always'
/>
Expand All @@ -71,7 +80,7 @@ class SelectServerView extends React.Component {
}
}

const mapStateToProps = ({ share }) => ({
const mapStateToProps = ({ share }: any) => ({
server: share.server.server
});

Expand Down