scm-ui: new repository layout

scm-ui/ui-webapp/src/repos/branches/containers/BranchRoot.js

@@ -0,0 +1,120 @@
+//@flow
+import React from "react";
+import BranchView from "../components/BranchView";
+import { connect } from "react-redux";
+import { Redirect, Route, Switch, withRouter } from "react-router-dom";
+import type { Repository, Branch } from "@scm-manager/ui-types";
+import {
+  fetchBranch,
+  getBranch,
+  getFetchBranchFailure,
+  isFetchBranchPending
+} from "../modules/branches";
+import { ErrorNotification, Loading } from "@scm-manager/ui-components";
+import type { History } from "history";
+import { NotFoundError } from "@scm-manager/ui-components";
+import queryString from "query-string";
+
+type Props = {
+  repository: Repository,
+  branchName: string,
+  branch: Branch,
+  loading: boolean,
+  error?: Error,
+
+  // context props
+  history: History,
+  match: any,
+  location: any,
+
+  // dispatch functions
+  fetchBranch: (repository: Repository, branchName: string) => void
+};
+
+class BranchRoot extends React.Component<Props> {
+  componentDidMount() {
+    const { fetchBranch, repository, branchName } = this.props;
+
+    fetchBranch(repository, branchName);
+  }
+
+  stripEndingSlash = (url: string) => {
+    if (url.endsWith("/")) {
+      return url.substring(0, url.length - 1);
+    }
+    return url;
+  };
+
+  matchedUrl = () => {
+    return this.stripEndingSlash(this.props.match.url);
+  };
+
+  render() {
+    const { repository, branch, loading, error, match, location } = this.props;
+
+    const url = this.matchedUrl();
+
+    if (error) {
+      if (
+        error instanceof NotFoundError &&
+        queryString.parse(location.search).create === "true"
+      ) {
+        return (
+          <Redirect
+            to={`/repo/${repository.namespace}/${
+              repository.name
+            }/branches/create?name=${match.params.branch}`}
+          />
+        );
+      }
+
+      return <ErrorNotification error={error} />;
+    }
+
+    if (loading || !branch) {
+      return <Loading />;
+    }
+
+    return (
+      <Switch>
+        <Redirect exact from={url} to={`${url}/info`} />
+        <Route
+          path={`${url}/info`}
+          component={() => (
+            <BranchView repository={repository} branch={branch} />
+          )}
+        />
+      </Switch>
+    );
+  }
+}
+
+const mapStateToProps = (state, ownProps) => {
+  const { repository } = ownProps;
+  const branchName = decodeURIComponent(ownProps.match.params.branch);
+  const branch = getBranch(state, repository, branchName);
+  const loading = isFetchBranchPending(state, repository, branchName);
+  const error = getFetchBranchFailure(state, repository, branchName);
+  return {
+    repository,
+    branchName,
+    branch,
+    loading,
+    error
+  };
+};
+
+const mapDispatchToProps = dispatch => {
+  return {
+    fetchBranch: (repository: Repository, branchName: string) => {
+      dispatch(fetchBranch(repository, branchName));
+    }
+  };
+};
+
+export default withRouter(
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  )(BranchRoot)
+);

scm-ui/ui-webapp/src/repos/branches/containers/BranchesOverview.js

@@ -0,0 +1,122 @@
+// @flow
+import React from "react";
+import {
+  fetchBranches,
+  getBranches,
+  getFetchBranchesFailure,
+  isFetchBranchesPending,
+  isPermittedToCreateBranches
+} from "../modules/branches";
+import { orderBranches } from "../util/orderBranches";
+import { connect } from "react-redux";
+import type { Branch, Repository } from "@scm-manager/ui-types";
+import { compose } from "redux";
+import { translate } from "react-i18next";
+import { withRouter } from "react-router-dom";
+import {
+  CreateButton,
+  ErrorNotification,
+  Loading,
+  Notification,
+  Subtitle
+} from "@scm-manager/ui-components";
+import BranchTable from "../components/BranchTable";
+
+type Props = {
+  repository: Repository,
+  baseUrl: string,
+  loading: boolean,
+  error: Error,
+  branches: Branch[],
+
+  // dispatch props
+  showCreateButton: boolean,
+  fetchBranches: Repository => void,
+
+  // Context props
+  history: any,
+  match: any,
+  t: string => string
+};
+
+class BranchesOverview extends React.Component<Props> {
+  componentDidMount() {
+    const { fetchBranches, repository } = this.props;
+    fetchBranches(repository);
+  }
+
+  render() {
+    const { loading, error, branches, t } = this.props;
+
+    if (error) {
+      return <ErrorNotification error={error} />;
+    }
+
+    if (!branches || loading) {
+      return <Loading />;
+    }
+
+    return (
+      <>
+        <Subtitle subtitle={t("branches.overview.title")} />
+        {this.renderBranchesTable()}
+        {this.renderCreateButton()}
+      </>
+    );
+  }
+
+  renderBranchesTable() {
+    const { baseUrl, branches, t } = this.props;
+    if (branches && branches.length > 0) {
+      orderBranches(branches);
+      return <BranchTable baseUrl={baseUrl} branches={branches} />;
+    }
+    return <Notification type="info">{t("branches.overview.noBranches")}</Notification>;
+  }
+
+  renderCreateButton() {
+    const { showCreateButton, t } = this.props;
+    if (showCreateButton) {
+      return (
+        <CreateButton
+          label={t("branches.overview.createButton")}
+          link="./create"
+        />
+      );
+    }
+    return null;
+  }
+}
+
+const mapStateToProps = (state, ownProps) => {
+  const { repository } = ownProps;
+  const loading = isFetchBranchesPending(state, repository);
+  const error = getFetchBranchesFailure(state, repository);
+  const branches = getBranches(state, repository);
+  const showCreateButton = isPermittedToCreateBranches(state, repository);
+
+  return {
+    repository,
+    loading,
+    error,
+    branches,
+    showCreateButton
+  };
+};
+
+const mapDispatchToProps = dispatch => {
+  return {
+    fetchBranches: (repository: Repository) => {
+      dispatch(fetchBranches(repository));
+    }
+  };
+};
+
+export default compose(
+  translate("repos"),
+  withRouter,
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  )
+)(BranchesOverview);

scm-ui/ui-webapp/src/repos/branches/containers/CreateBranch.js

@@ -0,0 +1,150 @@
+//@flow
+import React from "react";
+import {
+  ErrorNotification,
+  Loading,
+  Subtitle
+} from "@scm-manager/ui-components";
+import { translate } from "react-i18next";
+import BranchForm from "../components/BranchForm";
+import type { Repository, Branch, BranchRequest } from "@scm-manager/ui-types";
+import {
+  fetchBranches,
+  getBranches,
+  getBranchCreateLink,
+  createBranch,
+  createBranchReset,
+  isCreateBranchPending,
+  getCreateBranchFailure,
+  isFetchBranchesPending,
+  getFetchBranchesFailure
+} from "../modules/branches";
+import type { History } from "history";
+import { connect } from "react-redux";
+import { withRouter } from "react-router-dom";
+import queryString from "query-string";
+
+type Props = {
+  loading?: boolean,
+  error?: Error,
+  repository: Repository,
+  branches: Branch[],
+  createBranchesLink: string,
+  isPermittedToCreateBranches: boolean,
+
+  // dispatcher functions
+  fetchBranches: Repository => void,
+  createBranch: (
+    createLink: string,
+    repository: Repository,
+    branch: BranchRequest,
+    callback?: (Branch) => void
+  ) => void,
+  resetForm: Repository => void,
+
+  // context objects
+  t: string => string,
+  history: History,
+  location: any
+};
+
+class CreateBranch extends React.Component<Props> {
+  componentDidMount() {
+    const { fetchBranches, repository } = this.props;
+    fetchBranches(repository);
+    this.props.resetForm(repository);
+  }
+
+  branchCreated = (branch: Branch) => {
+    const { history, repository } = this.props;
+    history.push(
+      `/repo/${repository.namespace}/${
+        repository.name
+      }/branch/${encodeURIComponent(branch.name)}/info`
+    );
+  };
+
+  createBranch = (branch: BranchRequest) => {
+    this.props.createBranch(
+      this.props.createBranchesLink,
+      this.props.repository,
+      branch,
+      newBranch => this.branchCreated(newBranch)
+    );
+  };
+
+  transmittedName = (url: string) => {
+    const params = queryString.parse(url);
+    return params.name;
+  };
+
+  render() {
+    const { t, loading, error, repository, branches, createBranchesLink, location } = this.props;
+
+    if (error) {
+      return <ErrorNotification error={error} />;
+    }
+
+    if (loading || !branches) {
+      return <Loading />;
+    }
+
+    return (
+      <>
+        <Subtitle subtitle={t("branches.create.title")} />
+        <BranchForm
+          submitForm={branchRequest => this.createBranch(branchRequest)}
+          loading={loading}
+          repository={repository}
+          branches={branches}
+          transmittedName={this.transmittedName(location.search)}
+          disabled={!createBranchesLink}
+        />
+      </>
+    );
+  }
+}
+
+const mapDispatchToProps = dispatch => {
+  return {
+    fetchBranches: (repository: Repository) => {
+      dispatch(fetchBranches(repository));
+    },
+    createBranch: (
+      createLink: string,
+      repository: Repository,
+      branchRequest: BranchRequest,
+      callback?: (newBranch: Branch) => void
+    ) => {
+      dispatch(createBranch(createLink, repository, branchRequest, callback));
+    },
+    resetForm: (repository: Repository) => {
+      dispatch(createBranchReset(repository));
+    }
+  };
+};
+
+const mapStateToProps = (state, ownProps) => {
+  const { repository } = ownProps;
+  const loading =
+    isFetchBranchesPending(state, repository) ||
+    isCreateBranchPending(state, repository);
+  const error =
+    getFetchBranchesFailure(state, repository) || getCreateBranchFailure(state);
+  const branches = getBranches(state, repository);
+  const createBranchesLink = getBranchCreateLink(state, repository);
+  return {
+    repository,
+    loading,
+    error,
+    branches,
+    createBranchesLink
+  };
+};
+
+export default withRouter(
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  )(translate("repos")(CreateBranch))
+);