Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 07:25:44 +01:00
Code Issues Packages Projects Releases Activity

add loading spinner and error handling for codeOverview

Browse Source
This commit is contained in:
Eduard Heimbuch
2020-01-08 11:01:00 +01:00
parent c73e85e3d6
commit 987436e335
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scm-ui/ui-webapp/src/repos/codeSection/containers/CodeOverview.tsx
View File

@@ -4,7 +4,7 @@ import { Route, RouteComponentProps, withRouter } from "react-router-dom";
import Sources from "../../sources/containers/Sources";
import ChangesetsRoot from "../../containers/ChangesetsRoot";
import { Branch, Repository } from "@scm-manager/ui-types";
import { BranchSelector, Level } from "@scm-manager/ui-components";
import { BranchSelector, ErrorPage, Level, Loading } from "@scm-manager/ui-components";
import CodeViewSwitcher from "../components/CodeViewSwitcher";
import { compose } from "redux";
import { WithTranslation, withTranslation } from "react-i18next";
@@ -23,8 +23,8 @@ type Props = RouteComponentProps &
// State props
branches: Branch[];
loading: boolean;
error: Error;
loading: boolean;
selectedView: string;
selectedBranch: string;
@@ -50,7 +50,7 @@ class CodeOverview extends React.Component<Props> {
new Promise(() => {
this.props.fetchBranches(repository);
}).then(() => {
if (branches?.length > 0) {
if (this.props.branches?.length > 0) {
const defaultBranch = branches.filter((branch: Branch) => branch.defaultBranch === true)[0];
this.branchSelected(defaultBranch);
}
@@ -71,9 +71,19 @@ class CodeOverview extends React.Component<Props> {
};
render() {
const { repository, baseUrl, branches, t } = this.props;
const { repository, baseUrl, branches, error, loading, t } = this.props;
const url = baseUrl;
if (!branches || loading) {
return <Loading />;
}
if (error) {
return (
<ErrorPage title={t("repositoryRoot.errorTitle")} subtitle={t("repositoryRoot.errorSubtitle")} error={error} />
);
}
return (
<div>
<CodeActionBar>
@@ -92,11 +102,11 @@ class CodeOverview extends React.Component<Props> {
<Route
path={`${url}/sources`}
exact={true}
render={() => <Sources repository={repository} baseUrl={`${url}/sources`} />}
render={() => <Sources repository={repository} baseUrl={`${url}/sources`} branches={branches} />}
/>
<Route
path={`${url}/sources/:revision/:path*`}
render={() => <Sources repository={repository} baseUrl={`${url}/sources`} />}
render={() => <Sources repository={repository} baseUrl={`${url}/sources`} branches={branches} />}
/>
<Route
path={`${url}/changesets`}
@@ -122,15 +132,15 @@ const mapDispatchToProps = (dispatch: any) => {
const mapStateToProps = (state: any, ownProps: Props) => {
const { repository, location } = ownProps;
const loading = isFetchBranchesPending(state, repository);
const error = getFetchBranchesFailure(state, repository);
const loading = isFetchBranchesPending(state, repository);
const branches = getBranches(state, repository);
const selectedView = decodeURIComponent(location.pathname.split("/")[5]);
const selectedBranch = decodeURIComponent(location.pathname.split("/")[6]);
return {
loading,
error,
loading,
branches,
selectedView,
selectedBranch