Skip to content

feat(commit): view commits #851

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.

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
merged 5 commits into from
Dec 1, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ import {
IssueListScreen,
PullListScreen,
PullDiffScreen,
CommitScreen,
CommitListScreen,
ReadMeScreen,
} from 'repository';

Expand Down Expand Up @@ -164,6 +166,18 @@ const sharedRoutes = {
title: navigation.state.params.title,
}),
},
CommitList: {
screen: CommitListScreen,
navigationOptions: ({ navigation }) => ({
title: navigation.state.params.title,
}),
},
Commit: {
screen: CommitScreen,
navigationOptions: ({ navigation }) => ({
title: navigation.state.params.title,
}),
},
EditIssueComment: {
screen: EditIssueCommentScreen,
navigationOptions: ({ navigation }) => ({
Expand Down
17 changes: 16 additions & 1 deletion src/auth/screens/events.screen.js
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ class Events extends Component {
const actor = this.getActorLink(userEvent);
const repo = this.getRepoLink(userEvent);
const ref = (
<LinkBranchDescription>
<LinkBranchDescription onPress={() => this.navigateToCommitList(userEvent)}>
{userEvent.payload.ref.replace('refs/heads/', '')}
</LinkBranchDescription>
);
Expand Down Expand Up @@ -543,6 +543,21 @@ class Events extends Component {
});
};

navigateToCommitList = userEvent => {
if (userEvent.payload.commits > 1) {
this.props.navigation.navigate('CommitList', {
commits: userEvent.payload.commits,
title: t('Commits', this.props.locale),
locale: this.props.locale,
});
} else {
this.props.navigation.navigate('Commit', {
commit: userEvent.payload.commits[0],
title: userEvent.payload.commits[0].sha.substring(0, 7),
});
}
};

navigateToIssue = userEvent => {
this.props.navigation.navigate('Issue', {
issue:
Expand Down
57 changes: 57 additions & 0 deletions src/components/commit-list-item.component.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import React from 'react';
import { StyleSheet, TouchableHighlight, View } from 'react-native';
import { ListItem } from 'react-native-elements';
import { colors, fonts } from 'config';

type Props = {
commit: Object,
navigation: Object,
};

const styles = StyleSheet.create({
container: {
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'center',
paddingRight: 10,
paddingVertical: 5,
borderBottomWidth: 1,
borderBottomColor: colors.greyLight,
},
listItemContainer: {
flex: 1,
borderBottomWidth: 0,
},
title: {
color: colors.primaryDark,
...fonts.fontPrimary,
},
});

export const CommitListItem = ({ commit, navigation }: Props) =>
<TouchableHighlight
onPress={() =>
navigation.navigate('Commit', {
commit,
})}
underlayColor={colors.greyLight}
>
<View style={styles.container}>
<ListItem
containerStyle={styles.listItemContainer}
title={commit.commit.message.split('\n')[0]}
titleNumberOfLines={1}
subtitle={
`${commit.sha.substring(0, 7)} - ${commit.commit.author.name}` || ''
}
leftIcon={{
name: 'git-commit',
size: 36,
color: colors.grey,
type: 'octicon',
}}
hideChevron
titleStyle={styles.title}
/>
</View>
</TouchableHighlight>;
1 change: 1 addition & 0 deletions src/components/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export * from './code-line.component';
export * from './error-screen';
export * from './comment-input.component';
export * from './comment-list-item.component';
export * from './commit-list-item.component';
export * from './diff-blocks.component';
export * from './entity-info.component';
export * from './issue-description.component';
Expand Down
46 changes: 43 additions & 3 deletions src/components/issue-description.component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import React, { Component } from 'react';
import { ActivityIndicator } from 'react-native';
import {
Text,
ActivityIndicator,
TouchableHighlight,
} from 'react-native';
import { ListItem } from 'react-native-elements';

import Parse from 'parse-diff';
import styled from 'styled-components';

Expand Down Expand Up @@ -56,8 +61,9 @@ const IssueTitle = styled(ListItem).attrs({

const DiffBlocksContainer = styled.View`
flex-direction: row;
align-items: center;
justify-content: flex-end;
align-items: stretch;
justify-content: space-between;
padding-left: 10;
padding-right: 10;
padding-bottom: 10;
`;
Expand Down Expand Up @@ -85,16 +91,35 @@ export class IssueDescription extends Component {
issue: Object,
repository: Object,
diff: string,
commits: Array,
isMergeable: boolean,
isMerged: boolean,
isPendingDiff: boolean,
isPendingCommit: boolean,
isPendingCheckMerge: boolean,
onRepositoryPress: Function,
userHasPushPermission: boolean,
locale: string,
navigation: Object,
};

navigateToCommitList = () => {
const { commits, locale } = this.props;

if (commits.length > 1) {
this.props.navigation.navigate('CommitList', {
title: t('Commits', locale),
commits,
locale,
});
} else {
this.props.navigation.navigate('Commit', {
commit: commits[0],
title: commits[0].sha.substring(0, 7),
});
}
};

renderLabelButtons = labels => {
return labels
.slice(0, 3)
Expand All @@ -105,10 +130,12 @@ export class IssueDescription extends Component {
const {
diff,
issue,
commits,
repository,
isMergeable,
isMerged,
isPendingDiff,
isPendingCommit,
isPendingCheckMerge,
onRepositoryPress,
userHasPushPermission,
Expand Down Expand Up @@ -168,10 +195,23 @@ export class IssueDescription extends Component {

{issue.pull_request && (
<DiffBlocksContainer>
{isPendingCommit && (
<ActivityIndicator animating={isPendingCommit} size="small" />
)}

{isPendingDiff && (
<ActivityIndicator animating={isPendingDiff} size="small" />
)}

{!isPendingCommit && (
<TouchableHighlight
onPress={() => this.navigateToCommitList()}
underlayColor={colors.greyLight}
>
<Text>{`${commits.length} commits`}</Text>
</TouchableHighlight>
)}

{!isPendingDiff &&
(lineAdditions !== 0 || lineDeletions !== 0) && (
<DiffBlocks
Expand Down
24 changes: 24 additions & 0 deletions src/issue/issue.action.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
EDIT_ISSUE_BODY,
CHANGE_LOCK_STATUS,
GET_ISSUE_DIFF,
GET_ISSUE_COMMITS,
GET_ISSUE_MERGE_STATUS,
GET_PULL_REQUEST_FROM_URL,
MERGE_PULL_REQUEST,
Expand Down Expand Up @@ -128,6 +129,29 @@ export const getIssueComments = issueCommentsURL => {
};
};

export const getCommits = url => {
return (dispatch, getState) => {
const accessToken = getState().auth.accessToken;

dispatch({ type: GET_ISSUE_COMMITS.PENDING });

return v3
.getJson(url, accessToken)
.then(data => {
dispatch({
type: GET_ISSUE_COMMITS.SUCCESS,
payload: data,
});
})
.catch(error => {
dispatch({
type: GET_ISSUE_COMMITS.ERROR,
payload: error,
});
});
};
};

export const postIssueComment = (body, owner, repoName, issueNum) => {
return (dispatch, getState) => {
const accessToken = getState().auth.accessToken;
Expand Down
21 changes: 21 additions & 0 deletions src/issue/issue.reducer.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
EDIT_ISSUE_BODY,
CHANGE_LOCK_STATUS,
GET_ISSUE_DIFF,
GET_ISSUE_COMMITS,
GET_ISSUE_MERGE_STATUS,
GET_PULL_REQUEST_FROM_URL,
MERGE_PULL_REQUEST,
Expand All @@ -21,6 +22,7 @@ export const initialState = {
events: [],
pr: {},
diff: '',
commits: [],
isMerged: false,
isPendingComments: false,
isPendingEvents: false,
Expand All @@ -30,6 +32,7 @@ export const initialState = {
isEditingIssue: false,
isChangingLockStatus: false,
isPendingDiff: false,
isPendingCommits: false,
isPendingCheckMerge: false,
isPendingMerging: false,
isPendingIssue: false,
Expand Down Expand Up @@ -210,6 +213,24 @@ export const issueReducer = (state = initialState, action = {}) => {
error: action.payload,
isPendingDiff: false,
};
case GET_ISSUE_COMMITS.PENDING:
return {
...state,
commits: [],
isPendingCommits: true,
};
case GET_ISSUE_COMMITS.SUCCESS:
return {
...state,
commits: action.payload,
isPendingCommits: false,
};
case GET_ISSUE_COMMITS.ERROR:
return {
...state,
error: action.payload,
isPendingCommits: false,
};
case GET_ISSUE_MERGE_STATUS.PENDING:
return {
...state,
Expand Down
1 change: 1 addition & 0 deletions src/issue/issue.type.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export const EDIT_ISSUE = createActionSet('EDIT_ISSUE');
export const EDIT_ISSUE_BODY = createActionSet('EDIT_ISSUE_BODY');
export const CHANGE_LOCK_STATUS = createActionSet('CHANGE_LOCK_STATUS');
export const GET_ISSUE_DIFF = createActionSet('GET_ISSUE_DIFF');
export const GET_ISSUE_COMMITS = createActionSet('GET_ISSUE_COMMITS');
export const GET_ISSUE_MERGE_STATUS = createActionSet('GET_ISSUE_MERGE_STATUS');
export const GET_PULL_REQUEST_FROM_URL = createActionSet(
'GET_PULL_REQUEST_FROM_URL'
Expand Down
Loading