refactor code section

scm-ui/ui-webapp/src/repos/codeSection/components/CodeActionBar.tsx

@@ -0,0 +1,50 @@
+import React, { FC } from "react";
+import styled from "styled-components";
+import { RouteComponentProps, withRouter } from "react-router-dom";
+import { Level, BranchSelector } from "@scm-manager/ui-components";
+import CodeViewSwitcher from "./CodeViewSwitcher";
+import { useTranslation } from "react-i18next";
+import { Branch } from "@scm-manager/ui-types";
+
+const ActionBar = styled.div.attrs(() => ({}))`
+  background-color: whitesmoke;
+  border: 1px solid #dbdbdb;
+  border-radius: 4px;
+  color: #363636;
+  font-size: 1.25em;
+  font-weight: 300;
+  line-height: 1.25;
+  padding: 0.5em 0.75em;
+  margin-bottom: 1em;
+`;
+
+type Props = RouteComponentProps & {
+  selectedBranch?: string;
+  branches: Branch[];
+  onSelectBranch: () => void;
+  switchViewLink: string;
+};
+
+const CodeActionBar: FC<Props> = ({ selectedBranch, branches, onSelectBranch, switchViewLink, location }) => {
+  const { t } = useTranslation("repos");
+
+  return (
+    <ActionBar>
+      <Level
+        left={
+          branches?.length > 0 && (
+            <BranchSelector
+              label={t("code.branchSelector")}
+              branches={branches}
+              selectedBranch={selectedBranch}
+              onSelectBranch={onSelectBranch}
+            />
+          )
+        }
+        right={<CodeViewSwitcher currentUrl={location.pathname} switchViewLink={switchViewLink} />}
+      />
+    </ActionBar>
+  );
+};
+
+export default withRouter(CodeActionBar);

scm-ui/ui-webapp/src/repos/codeSection/components/CodeViewSwitcher.tsx

@@ -15,40 +15,29 @@ const ButtonAddonsMarginRight = styled(ButtonAddons)`
 `;
 
 type Props = {
-  baseUrl: string;
   currentUrl: string;
-  branches: Branch[];
+  switchViewLink: string;
-  selectedBranch: string;
 };
 
-const CodeViewSwitcher: FC<Props> = ({ baseUrl, currentUrl, branches, selectedBranch }) => {
+const CodeViewSwitcher: FC<Props> = ({ currentUrl, switchViewLink }) => {
   const [t] = useTranslation("repos");
 
-  const createDestinationUrl = (destination: string, branch?: string, suffix?: string) => {
+  const resolveLocation = () => {
-    if (!branches) {
+    if (currentUrl.includes("/code/branch") || currentUrl.includes("/code/changesets")) {
-      return baseUrl + "/" + destination + "/";
+      return "changesets";
     }
-    let splittedUrl = currentUrl.split("/");
+    if (currentUrl.includes("/code/sources")) {
-    splittedUrl[5] = destination;
+      return "sources";
-    splittedUrl.splice(6, splittedUrl.length);
-    if (branch) {
-      splittedUrl[6] = branch;
     }
-    if (suffix) {
+    return "";
-      splittedUrl.push(suffix);
-    }
-    return splittedUrl.join("/");
   };
 
-  const evaluateDestinationBranch = () => {
+  const isSourcesTab = () => {
-    return (
+    return resolveLocation() === "sources";
-      branches &&
+  };
-      encodeURIComponent(
+
-        branches.filter(branch => branch.name === selectedBranch).length === 0
+  const isChangesetsTab = () => {
-          ? branches.filter(branch => branch.defaultBranch === true)[0].name
+    return resolveLocation() === "changesets";
-          : branches.filter(branch => branch.name === selectedBranch)[0].name
-      )
-    );
   };
 
   return (
@@ -56,22 +45,14 @@ const CodeViewSwitcher: FC<Props> = ({ baseUrl, currentUrl, branches, selectedBr
       <SmallButton
         label={t("code.commits")}
         icon="fa fa-exchange-alt"
-        color={
+        color={isChangesetsTab() ? "link is-selected" : undefined}
-          currentUrl.includes("/code/branch") || currentUrl.includes("/code/changesets")
+        link={isSourcesTab() ? switchViewLink : undefined}
-            ? "link is-selected"
-            : undefined
-        }
-        link={
-          branches
-            ? createDestinationUrl("branch", evaluateDestinationBranch(), "changesets/")
-            : createDestinationUrl("changesets")
-        }
       />
       <SmallButton
         label={t("code.sources")}
         icon="fa fa-code"
-        color={currentUrl.includes("/code/sources") ? "link is-selected" : undefined}
+        color={isSourcesTab() ? "link is-selected" : undefined}
-        link={createDestinationUrl("sources", evaluateDestinationBranch())}
+        link={isChangesetsTab() ? switchViewLink: undefined}
       />
     </ButtonAddonsMarginRight>
   );

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

@@ -1,11 +1,9 @@
 import React from "react";
-import styled from "styled-components";
 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, ErrorPage, Level, Loading } from "@scm-manager/ui-components";
+import { ErrorPage, Loading } from "@scm-manager/ui-components";
-import CodeViewSwitcher from "../components/CodeViewSwitcher";
 import { compose } from "redux";
 import { WithTranslation, withTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -31,55 +29,11 @@ type Props = RouteComponentProps &
     fetchBranches: (p: Repository) => void;
   };
 
-const CodeActionBar = styled.div.attrs(() => ({}))`
-  background-color: whitesmoke;
-  border: 1px solid #dbdbdb;
-  border-radius: 4px;
-  color: #363636;
-  font-size: 1.25em;
-  font-weight: 300;
-  line-height: 1.25;
-  padding: 0.5em 0.75em;
-  margin-bottom: 1em;
-`;
-
 class CodeOverview extends React.Component<Props> {
   componentDidMount() {
-    const { repository, branches } = this.props;
+    const { repository } = this.props;
-    new Promise(() => {
     this.props.fetchBranches(repository);
-    }).then(() => {
-      if (this.props.branches?.length > 0) {
-        const defaultBranch = branches.filter((branch: Branch) => branch.defaultBranch === true)[0];
-        this.branchSelected(defaultBranch);
   }
-    });
-  }
-
-  findSelectedBranch = () => {
-    const { selectedBranch, branches } = this.props;
-    return branches?.find((branch: Branch) => branch.name === selectedBranch);
-  };
-
-  branchSelected = (branch?: Branch) => {
-    let splittedUrl = this.props.location.pathname.split("/");
-    if (
-      this.props.location.pathname.includes("/code/sources") ||
-      this.props.location.pathname.includes("/code/branch")
-    ) {
-      if (branch) {
-        splittedUrl[6] = encodeURIComponent(branch.name);
-      }
-      this.props.history.push(splittedUrl.join("/"));
-    }
-    if (this.props.location.pathname.includes("/code/changesets")) {
-      this.props.history.push(
-        `${splittedUrl[0]}/${splittedUrl[1]}/${splittedUrl[2]}/${splittedUrl[3]}/${
-          splittedUrl[4]
-        }/branch/${encodeURIComponent(branch.name)}/${splittedUrl[5]}/`
-      );
-    }
-  };
 
   render() {
     const { repository, baseUrl, branches, selectedBranch, error, loading, t } = this.props;
@@ -97,39 +51,29 @@ class CodeOverview extends React.Component<Props> {
 
     return (
       <div>
-        <CodeActionBar>
-          <Level
-            left={
-              <BranchSelector
-                label={t("code.branchSelector")}
-                branches={branches}
-                selectedBranch={selectedBranch}
-                onSelectBranch={this.branchSelected}
-              />
-            }
-            right={<CodeViewSwitcher baseUrl={url} currentUrl={this.props.location.pathname} branches={branches} selectedBranch={selectedBranch}/>}
-          />
-        </CodeActionBar>
         <Route
           path={`${url}/sources`}
           exact={true}
-          render={() => <Sources repository={repository} baseUrl={`${url}/sources`} branches={branches} />}
+          render={() => <Sources repository={repository} baseUrl={`${url}`} branches={branches} />}
         />
         <Route
           path={`${url}/sources/:revision/:path*`}
-          render={() => <Sources repository={repository} baseUrl={`${url}/sources`} branches={branches} />}
+          render={() => (
+            <Sources repository={repository} baseUrl={`${url}`} branches={branches} selectedBranch={selectedBranch} />
+          )}
         />
         <Route
           path={`${url}/changesets`}
-          render={() => <ChangesetsRoot repository={repository} baseUrl={`${url}/changesets`} />}
+          render={() => <ChangesetsRoot repository={repository} baseUrl={`${url}`} branches={branches} />}
         />
         <Route
           path={`${url}/branch/:branch/changesets/`}
           render={() => (
             <ChangesetsRoot
               repository={repository}
-              baseUrl={`${url}/changesets`}
+              baseUrl={`${url}`}
-              selectedBranch={branches && branches.filter(b => b.name === this.props.selectedBranch)[0]}
+              branches={branches}
+              selectedBranch={selectedBranch}
             />
           )}
         />

scm-ui/ui-webapp/src/repos/containers/ChangesetsRoot.tsx

@@ -1,21 +1,28 @@
 import React from "react";
-import { Route, withRouter } from "react-router-dom";
+import { Route, withRouter, RouteComponentProps } from "react-router-dom";
 import { WithTranslation, withTranslation } from "react-i18next";
-import { Repository } from "@scm-manager/ui-types";
+import { Repository, Branch } from "@scm-manager/ui-types";
 import Changesets from "./Changesets";
 import { compose } from "redux";
+import CodeActionBar from "../codeSection/components/CodeActionBar";
 
-type Props = WithTranslation & {
+type Props = WithTranslation &
+  RouteComponentProps & {
     repository: Repository;
     selectedBranch: string;
     baseUrl: string;
-
+    branches: Branch[];
-  // Context props
+  };
-  history: any; // TODO flow type
-  match: any;
-};
 
 class ChangesetsRoot extends React.Component<Props> {
+  componentDidMount() {
+    const { branches, baseUrl } = this.props;
+    if (branches?.length > 0 && this.isSelectedBranchIsNotABranch()) {
+      const defaultBranch = branches?.filter(b => b.defaultBranch === true)[0];
+      this.props.history.push(`${baseUrl}/branch/${encodeURIComponent(defaultBranch.name)}/changesets/`);
+    }
+  }
+
   stripEndingSlash = (url: string) => {
     if (url.endsWith("/")) {
       return url.substring(0, url.length - 1);
@@ -23,8 +30,29 @@ class ChangesetsRoot extends React.Component<Props> {
     return url;
   };
 
+  isSelectedBranchIsNotABranch = () => {
+    const { branches, selectedBranch } = this.props;
+    return branches?.filter(b => b.name === selectedBranch).length === 0;
+  };
+
+  evaluateSwitchViewLink = () => {
+    const { baseUrl, selectedBranch } = this.props;
+    if (selectedBranch) {
+      return `${baseUrl}/sources/${encodeURIComponent(selectedBranch)}/`;
+    }
+    return `${baseUrl}/sources/`;
+  };
+
+  onSelectBranch = (branch?: Branch) => {
+    const { baseUrl, history } = this.props;
+    if (branch) {
+      let url = `${baseUrl}/branch/${encodeURIComponent(branch.name)}/changesets/`;
+      history.push(url);
+    }
+  };
+
   render() {
-    const { repository, match, selectedBranch } = this.props;
+    const { repository, branches, match, selectedBranch } = this.props;
 
     if (!repository) {
       return null;
@@ -33,12 +61,22 @@ class ChangesetsRoot extends React.Component<Props> {
     const url = this.stripEndingSlash(match.url);
 
     return (
+      <>
+        <CodeActionBar
+          branches={branches}
+          selectedBranch={!this.isSelectedBranchIsNotABranch() ? selectedBranch : undefined}
+          onSelectBranch={this.onSelectBranch}
+          switchViewLink={this.evaluateSwitchViewLink()}
+        />
         <div className="panel">
           <Route
             path={`${url}/:page?`}
-          component={() => <Changesets repository={repository} branch={selectedBranch} />}
+            component={() => (
+              <Changesets repository={repository} branch={branches?.filter(b => b.name === selectedBranch)[0]} />
+            )}
           />
         </div>
+      </>
     );
   }
 }

scm-ui/ui-webapp/src/repos/sources/containers/Sources.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { connect } from "react-redux";
-import { withRouter } from "react-router-dom";
+import { withRouter, RouteComponentProps } from "react-router-dom";
 import { WithTranslation, withTranslation } from "react-i18next";
 import { Branch, Repository } from "@scm-manager/ui-types";
 import { Breadcrumb, ErrorNotification, Loading } from "@scm-manager/ui-components";
@@ -9,8 +9,10 @@ import { getFetchBranchesFailure, isFetchBranchesPending } from "../../branches/
 import { compose } from "redux";
 import Content from "./Content";
 import { fetchSources, getSources, isDirectory } from "../modules/sources";
+import CodeActionBar from "../../codeSection/components/CodeActionBar";
 
-type Props = WithTranslation & {
+type Props = WithTranslation &
+  RouteComponentProps & {
     repository: Repository;
     loading: boolean;
     error: Error;
@@ -20,35 +22,20 @@ type Props = WithTranslation & {
     path: string;
     currentFileIsDirectory: boolean;
     sources: File;
+    selectedBranch: string;
 
     // dispatch props
     fetchSources: (p1: Repository, p2: string, p3: string) => void;
-
-  // Context props
-  history: any;
-  match: any;
-  location: any;
-};
-
-type State = {
-  selectedBranch: any;
-};
-
-class Sources extends React.Component<Props, State> {
-  constructor(props: Props) {
-    super(props);
-
-    this.state = {
-      selectedBranch: null
   };
-  }
 
+class Sources extends React.Component<Props> {
   componentDidMount() {
-    const { repository, revision, path, fetchSources } = this.props;
+    const { repository, branches, selectedBranch, baseUrl, revision, path, fetchSources } = this.props;
-
     fetchSources(repository, this.decodeRevision(revision), path);
-
+    if (branches?.length > 0 && !selectedBranch) {
-    this.redirectToDefaultBranch();
+      const defaultBranch = branches?.filter(b => b.defaultBranch === true)[0];
+      this.props.history.push(`${baseUrl}/sources/${encodeURIComponent(defaultBranch.name)}/`);
+    }
   }
 
   componentDidUpdate(prevProps: Props) {
@@ -62,45 +49,42 @@ class Sources extends React.Component<Props, State> {
     return revision ? decodeURIComponent(revision) : revision;
   };
 
-  redirectToDefaultBranch = () => {
+  onSelectBranch = (branch?: Branch) => {
-    const { branches } = this.props;
-    if (this.shouldRedirectToDefaultBranch()) {
-      const defaultBranches = branches.filter(b => b.defaultBranch);
-
-      if (defaultBranches.length > 0) {
-        this.branchSelected(defaultBranches[0]);
-      }
-    }
-  };
-
-  shouldRedirectToDefaultBranch = () => {
-    const { branches, revision } = this.props;
-    return branches && !revision;
-  };
-
-  branchSelected = (branch?: Branch) => {
     const { baseUrl, history, path } = this.props;
     let url;
     if (branch) {
-      this.setState({
-        selectedBranch: branch
-      });
       if (path) {
-        url = `${baseUrl}/${encodeURIComponent(branch.name)}/${path}`;
+        url = `${baseUrl}/sources/${encodeURIComponent(branch.name)}/${path}`;
+        url = !url.endsWith("/") ? url + "/" : url;
       } else {
-        url = `${baseUrl}/${encodeURIComponent(branch.name)}/`;
+        url = `${baseUrl}/sources/${encodeURIComponent(branch.name)}/`;
       }
     } else {
-      this.setState({
+      return;
-        selectedBranch: null
-      });
-      url = `${baseUrl}/`;
     }
     history.push(url);
   };
 
+  evaluateSwitchViewLink = () => {
+    const { baseUrl, selectedBranch } = this.props;
+    if (selectedBranch) {
+      return `${baseUrl}/branch/${encodeURIComponent(selectedBranch)}/changesets/`;
+    }
+    return `${baseUrl}/changesets/`;
+  };
+
   render() {
-    const { repository, baseUrl, loading, error, revision, path, currentFileIsDirectory } = this.props;
+    const {
+      repository,
+      baseUrl,
+      branches,
+      selectedBranch,
+      loading,
+      error,
+      revision,
+      path,
+      currentFileIsDirectory
+    } = this.props;
 
     if (error) {
       return <ErrorNotification error={error} />;
@@ -112,28 +96,45 @@ class Sources extends React.Component<Props, State> {
 
     if (currentFileIsDirectory) {
       return (
+        <>
+          <CodeActionBar
+            selectedBranch={selectedBranch}
+            branches={branches}
+            onSelectBranch={this.onSelectBranch}
+            switchViewLink={this.evaluateSwitchViewLink()}
+          />
           <div className="panel">
             {this.renderBreadcrumb()}
-          <FileTree repository={repository} revision={revision} path={path} baseUrl={baseUrl} />
+            <FileTree repository={repository} revision={revision} path={path} baseUrl={baseUrl + "/sources"} />
           </div>
+        </>
       );
     } else {
-      return <Content repository={repository} revision={revision} path={path} breadcrumb={this.renderBreadcrumb()} />;
+      return (
+        <>
+          <CodeActionBar
+            selectedBranch={selectedBranch}
+            branches={branches}
+            onSelectBranch={this.onSelectBranch}
+            switchViewLink={this.evaluateSwitchViewLink()}
+          />
+          <Content repository={repository} revision={revision} path={path} breadcrumb={this.renderBreadcrumb()} />
+        </>
+      );
     }
   }
 
   renderBreadcrumb = () => {
-    const { revision, path, baseUrl, branches, sources, repository } = this.props;
+    const { revision, selectedBranch, path, baseUrl, branches, sources, repository } = this.props;
-    const { selectedBranch } = this.state;
 
     return (
       <Breadcrumb
         repository={repository}
         revision={revision}
         path={path}
-        baseUrl={baseUrl}
+        baseUrl={baseUrl + "/sources"}
-        branch={selectedBranch}
+        branch={branches?.filter(b => b.name === selectedBranch)[0]}
-        defaultBranch={branches && branches.filter(b => b.defaultBranch === true)[0]}
+        defaultBranch={branches?.filter(b => b.defaultBranch === true)[0]}
         sources={sources}
       />
     );