Skip to content
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

Jump to bottom

[Code] add a more button for commit history #35329

Merged
merged 1 commit into from
Apr 20, 2019
Merged

[Code] add a more button for commit history #35329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions x-pack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
"@types/proper-lockfile": "^3.0.0",
"@types/react": "^16.8.0",
"@types/react-dom": "^16.8.0",
"@types/react-infinite-scroller": "^1.2.0",
"@types/react-redux": "^6.0.6",
"@types/react-router-dom": "^4.3.1",
"@types/react-test-renderer": "^16.8.0",
Expand Down Expand Up @@ -288,7 +287,6 @@
"react-dom": "^16.8.0",
"react-dropzone": "^4.2.9",
"react-fast-compare": "^2.0.4",
"react-infinite-scroller": "^1.2.4",
"react-markdown": "^3.4.1",
"react-markdown-renderer": "^1.4.0",
"react-portal": "^3.2.0",
Expand Down
64 changes: 54 additions & 10 deletions x-pack/plugins/code/public/components/main/commit_history.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/

import {
EuiButton,
EuiFlexGroup,
EuiFlexItem,
EuiLoadingSpinner,
Expand All @@ -15,8 +16,12 @@ import {
import _ from 'lodash';
import moment from 'moment';
import React from 'react';
import { connect } from 'react-redux';
import { CommitInfo } from '../../../model/commit';
import { CommitLink } from '../diff_page/commit_link';
import { RootState } from '../../reducers';
import { hasMoreCommitsSelector, treeCommitsSelector } from '../../selectors';
import { fetchMoreCommits } from '../../actions';

const COMMIT_ID_LENGTH = 8;

Expand Down Expand Up @@ -75,20 +80,35 @@ export const CommitHistoryLoading = () => (
</div>
);

export const CommitHistory = (props: {
export const PageButtons = (props: {
loading?: boolean;
disabled: boolean;
onClick: () => void;
}) => (
<EuiFlexGroup justifyContent="spaceAround">
<EuiFlexItem grow={false}>
<EuiButton
onClick={props.onClick}
iconType="arrowDown"
isLoading={props.loading}
isDisabled={props.disabled}
size="s"
>
More
</EuiButton>
</EuiFlexItem>
</EuiFlexGroup>
);

export const CommitHistoryComponent = (props: {
commits: CommitInfo[];
repoUri: string;
header: React.ReactNode;
hideLoading?: boolean;
loadingCommits?: boolean;
showPagination?: boolean;
hasMoreCommit?: boolean;
fetchMoreCommits: any;
}) => {
if (!props.commits) {
return (
<div className="codeContainer__commitMessages">
<h1>Commits</h1>
{!props.hideLoading && <CommitHistoryLoading />}
</div>
);
}
const commits = _.groupBy(props.commits, commit => moment(commit.updated).format('YYYYMMDD'));
const commitDates = Object.keys(commits).sort((a, b) => b.localeCompare(a)); // sort desc
const commitList = commitDates.map(cd => (
Expand All @@ -103,6 +123,30 @@ export const CommitHistory = (props: {
<div className="codeContainer__commitMessages">
<div className="codeHeader__commit">{props.header}</div>
{commitList}
{!props.showPagination && props.loadingCommits && <CommitHistoryLoading />}
{props.showPagination && (
<PageButtons
disabled={!props.hasMoreCommit || props.commits.length < 10}
onClick={() => props.fetchMoreCommits(props.repoUri)}
loading={props.loadingCommits}
/>
)}
</div>
);
};

const mapStateToProps = (state: RootState) => ({
file: state.file.file,
commits: treeCommitsSelector(state) || [],
loadingCommits: state.file.loadingCommits,
hasMoreCommit: hasMoreCommitsSelector(state),
});

const mapDispatchToProps = {
fetchMoreCommits,
};
export const CommitHistory = connect(
mapStateToProps,
mapDispatchToProps
// @ts-ignore
)(CommitHistoryComponent);
45 changes: 13 additions & 32 deletions x-pack/plugins/code/public/components/main/content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import { EuiButton, EuiButtonGroup, EuiFlexGroup, EuiTitle } from '@elastic/eui';
import 'github-markdown-css/github-markdown.css';
import React from 'react';
import InfiniteScroll from 'react-infinite-scroller';
import Markdown from 'react-markdown';
import { connect } from 'react-redux';
import { RouteComponentProps } from 'react-router-dom';
Expand All @@ -23,25 +22,19 @@ import {
Repository,
} from '../../../model';
import { CommitInfo, ReferenceInfo } from '../../../model/commit';
import {
changeSearchScope,
FetchFileResponse,
fetchMoreCommits,
SearchOptions,
} from '../../actions';
import { changeSearchScope, FetchFileResponse, SearchOptions } from '../../actions';
import { MainRouteParams, PathTypes } from '../../common/types';
import { RepoState, RepoStatus, RootState } from '../../reducers';
import {
currentTreeSelector,
hasMoreCommitsSelector,
repoUriSelector,
statusSelector,
treeCommitsSelector,
} from '../../selectors';
import { encodeRevisionString, history } from '../../utils/url';
import { Editor } from '../editor/editor';
import { CloneStatus } from './clone_status';
import { CommitHistory, CommitHistoryLoading } from './commit_history';
import { CommitHistory } from './commit_history';
import { Directory } from './directory';
import { ErrorPanel } from './error_panel';
import { NotFound } from './not_found';
Expand All @@ -58,8 +51,8 @@ interface Props extends RouteComponentProps<MainRouteParams> {
hasMoreCommits: boolean;
loadingCommits: boolean;
onSearchScopeChanged: (s: SearchScope) => void;
repoScope: string[];
searchOptions: SearchOptions;
fetchMoreCommits(repoUri: string): void;
currentRepository?: Repository;
}
const LANG_MD = 'markdown';
Expand Down Expand Up @@ -278,7 +271,7 @@ class CodeContent extends React.PureComponent<Props> {
return this.renderProgress();
}

const { file, commits, match, tree, hasMoreCommits, loadingCommits } = this.props;
const { file, match, tree } = this.props;
const { path, pathType, resource, org, repo, revision } = match.params;
const repoUri = `${resource}/${org}/${repo}`;
switch (pathType) {
Expand All @@ -288,7 +281,6 @@ class CodeContent extends React.PureComponent<Props> {
<div className="codeContainer__directoryView">
<Directory node={node} />
<CommitHistory
commits={commits}
repoUri={repoUri}
header={
<React.Fragment>
Expand Down Expand Up @@ -362,24 +354,15 @@ class CodeContent extends React.PureComponent<Props> {
case PathTypes.commits:
return (
<div className="codeContainer__history">
<InfiniteScroll
initialLoad={true}
loadMore={() => !loadingCommits && this.props.fetchMoreCommits(repoUri)}
hasMore={hasMoreCommits}
useWindow={false}
loader={<CommitHistoryLoading />}
>
<CommitHistory
hideLoading={true}
commits={commits}
repoUri={repoUri}
header={
<EuiTitle className="codeMargin__title">
<h3>Commit History</h3>
</EuiTitle>
}
/>
</InfiniteScroll>
<CommitHistory
repoUri={repoUri}
header={
<EuiTitle className="codeMargin__title">
<h3>Commit History</h3>
</EuiTitle>
}
showPagination={true}
/>
</div>
);
}
Expand All @@ -391,7 +374,6 @@ const mapStateToProps = (state: RootState) => ({
file: state.file.file,
tree: state.file.tree,
currentTree: currentTreeSelector(state),
commits: treeCommitsSelector(state),
branches: state.file.branches,
hasMoreCommits: hasMoreCommitsSelector(state),
loadingCommits: state.file.loadingCommits,
Expand All @@ -401,7 +383,6 @@ const mapStateToProps = (state: RootState) => ({
});

const mapDispatchToProps = {
fetchMoreCommits,
onSearchScopeChanged: changeSearchScope,
};

Expand Down
14 changes: 0 additions & 14 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3403,13 +3403,6 @@
dependencies:
"@types/react" "*"

"@types/react-infinite-scroller@^1.2.0":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@types/react-infinite-scroller/-/react-infinite-scroller-1.2.1.tgz#1cd747ef8f50d3c883e375c0491a906e5436fcb2"
integrity sha512-64bpbqdSgtmy1zSZ2AQoFzguwZO7TyKjqJRTEnfNMCAQbnrX90kz+rYufZyY9CmzhwpXMwRO8xR9fMQnbYUkgQ==
dependencies:
"@types/react" "*"

"@types/react-intl@^2.3.15":
version "2.3.17"
resolved "https://registry.yarnpkg.com/@types/react-intl/-/react-intl-2.3.17.tgz#e1fc6e46e8af58bdef9531259d509380a8a99e8e"
Expand Down Expand Up @@ -21049,13 +21042,6 @@ react-hotkeys@2.0.0-pre4:
dependencies:
prop-types "^15.6.1"

react-infinite-scroller@^1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/react-infinite-scroller/-/react-infinite-scroller-1.2.4.tgz#f67eaec4940a4ce6417bebdd6e3433bfc38826e9"
integrity sha512-/oOa0QhZjXPqaD6sictN2edFMsd3kkMiE19Vcz5JDgHpzEJVqYcmq+V3mkwO88087kvKGe1URNksHEOt839Ubw==
dependencies:
prop-types "^15.5.8"

react-input-autosize@^2.1.2, react-input-autosize@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.2.1.tgz#ec428fa15b1592994fb5f9aa15bb1eb6baf420f8"
Expand Down