From 987436e3356fdfdb8bd01d7ab02a26dea5b38f28 Mon Sep 17 00:00:00 2001
From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Date: Wed, 8 Jan 2020 11:01:00 +0100
Subject: [PATCH] add loading spinner and error handling for codeOverview

---
 .../codeSection/containers/CodeOverview.tsx   | 26 +++++++++++++------
 .../src/repos/sources/containers/Sources.tsx  |  9 +------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/scm-ui/ui-webapp/src/repos/codeSection/containers/CodeOverview.tsx b/scm-ui/ui-webapp/src/repos/codeSection/containers/CodeOverview.tsx
index 9dbd517175..3f7fa5c03f 100644
--- a/scm-ui/ui-webapp/src/repos/codeSection/containers/CodeOverview.tsx
+++ b/scm-ui/ui-webapp/src/repos/codeSection/containers/CodeOverview.tsx
@@ -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
diff --git a/scm-ui/ui-webapp/src/repos/sources/containers/Sources.tsx b/scm-ui/ui-webapp/src/repos/sources/containers/Sources.tsx
index 83f68ea2f6..492e48c7a8 100644
--- a/scm-ui/ui-webapp/src/repos/sources/containers/Sources.tsx
+++ b/scm-ui/ui-webapp/src/repos/sources/containers/Sources.tsx
@@ -27,7 +27,6 @@ type Props = WithTranslation & {
   sources: File;
 
   // dispatch props
-  fetchBranches: (p: Repository) => void;
   fetchSources: (p1: Repository, p2: string, p3: string) => void;
 
   // Context props
@@ -50,9 +49,8 @@ class Sources extends React.Component<Props, State> {
   }
 
   componentDidMount() {
-    const { fetchBranches, repository, revision, path, fetchSources } = this.props;
+    const { repository, revision, path, fetchSources } = this.props;
 
-    fetchBranches(repository);
     fetchSources(repository, this.decodeRevision(revision), path);
 
     this.redirectToDefaultBranch();
@@ -153,7 +151,6 @@ const mapStateToProps = (state: any, ownProps: Props) => {
   const decodedRevision = revision ? decodeURIComponent(revision) : undefined;
   const loading = isFetchBranchesPending(state, repository);
   const error = getFetchBranchesFailure(state, repository);
-  const branches = getBranches(state, repository);
   const currentFileIsDirectory = decodedRevision
     ? isDirectory(state, repository, decodedRevision, path)
     : isDirectory(state, repository, revision, path);
@@ -165,7 +162,6 @@ const mapStateToProps = (state: any, ownProps: Props) => {
     path,
     loading,
     error,
-    branches,
     currentFileIsDirectory,
     sources
   };
@@ -173,9 +169,6 @@ const mapStateToProps = (state: any, ownProps: Props) => {
 
 const mapDispatchToProps = (dispatch: any) => {
   return {
-    fetchBranches: (repository: Repository) => {
-      dispatch(fetchBranches(repository));
-    },
     fetchSources: (repository: Repository, revision: string, path: string) => {
       dispatch(fetchSources(repository, revision, path));
     }