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

merge

Browse Source
This commit is contained in:
Florian Scholdei
2019-02-01 13:30:43 +01:00
parent 14b203e2d3 a4112a3350
commit 704ef72e03
152 changed files with 6161 additions and 1658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scm-ui/src/repos/containers/RepositoryRoot.js
View File

@@ -33,8 +33,13 @@ import ChangesetView from "./ChangesetView";
import PermissionsNavLink from "../components/PermissionsNavLink";
import Sources from "../sources/containers/Sources";
import RepositoryNavLink from "../components/RepositoryNavLink";
<<<<<<< working copy
import { getRepositoriesLink } from "../../modules/indexResource";
import { ExtensionPoint } from "@scm-manager/ui-extensions";
=======
import {getLinks, getRepositoriesLink} from "../../modules/indexResource";
import {ExtensionPoint} from "@scm-manager/ui-extensions";
>>>>>>> merge rev
type Props = {
namespace: string,
@@ -43,6 +48,7 @@ type Props = {
loading: boolean,
error: Error,
repoLink: string,
indexLinks: Object,
// dispatch functions
fetchRepoByName: (link: string, namespace: string, name: string) => void,
@@ -78,7 +84,7 @@ class RepositoryRoot extends React.Component<Props> {
};
render() {
const { loading, error, repository, t } = this.props;
const { loading, error, indexLinks, repository, t } = this.props;
if (error) {
return (
@@ -98,7 +104,8 @@ class RepositoryRoot extends React.Component<Props> {
const extensionProps = {
repository,
url
url,
indexLinks
};
return (
@@ -232,13 +239,15 @@ const mapStateToProps = (state, ownProps) => {
const loading = isFetchRepoPending(state, namespace, name);
const error = getFetchRepoFailure(state, namespace, name);
const repoLink = getRepositoriesLink(state);
const indexLinks = getLinks(state);
return {
namespace,
name,
repository,
loading,
error,
repoLink
repoLink,
indexLinks
};
};