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

Moved getBranchFromMatch to ui-components

Browse Source
This commit is contained in:
Philipp Czora
2018-10-17 17:11:21 +02:00
parent 5871bf052f
commit 8ff19a3d2f
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scm-ui-components/packages/ui-components/src/index.js
View File

@@ -19,6 +19,7 @@ export { default as LinkPaginator } from "./LinkPaginator.js";
export { default as ProtectedRoute } from "./ProtectedRoute.js"; export { default as ProtectedRoute } from "./ProtectedRoute.js";
export { default as Help } from "./Help.js"; export { default as Help } from "./Help.js";
export { default as LabelWithHelpIcon } from "./LabelWithHelpIcon.js"; export { default as LabelWithHelpIcon } from "./LabelWithHelpIcon.js";
export { getPageFromMatch } from "./urls";
export { apiClient, NOT_FOUND_ERROR, UNAUTHORIZED_ERROR } from "./apiclient.js"; export { apiClient, NOT_FOUND_ERROR, UNAUTHORIZED_ERROR } from "./apiclient.js";

8
scm-ui-components/packages/ui-components/src/urls.js
View File

@@ -4,3 +4,11 @@ export const contextPath = window.ctxPath || "";
export function withContextPath(path: string) { export function withContextPath(path: string) {
return contextPath + path; return contextPath + path;
} }
export function getPageFromMatch(match: any) {
let page = parseInt(match.params.page, 10);
if (isNaN(page) || !page) {
page = 1;
}
return page;
}

2
scm-ui/src/repos/containers/Changesets.test.js → scm-ui-components/packages/ui-components/src/urls.test.js
View File

@@ -1,5 +1,5 @@
// @flow // @flow
import { getPageFromMatch } from "./Changesets"; import { getPageFromMatch } from "./urls";
describe("tests for getPageFromMatch", () => { describe("tests for getPageFromMatch", () => {
function createMatch(page: string) { function createMatch(page: string) {

4
scm-ui/src/containers/Main.js
View File

@@ -1,14 +1,14 @@
//@flow //@flow
import React from "react"; import React from "react";
import {Redirect, Route, Switch, withRouter} from "react-router-dom"; import { Redirect, Route, Switch, withRouter } from "react-router-dom";
import Overview from "../repos/containers/Overview"; import Overview from "../repos/containers/Overview";
import Users from "../users/containers/Users"; import Users from "../users/containers/Users";
import Login from "../containers/Login"; import Login from "../containers/Login";
import Logout from "../containers/Logout"; import Logout from "../containers/Logout";
import {ProtectedRoute} from "@scm-manager/ui-components"; import { ProtectedRoute } from "@scm-manager/ui-components";
import AddUser from "../users/containers/AddUser"; import AddUser from "../users/containers/AddUser";
import SingleUser from "../users/containers/SingleUser"; import SingleUser from "../users/containers/SingleUser";
import RepositoryRoot from "../repos/containers/RepositoryRoot"; import RepositoryRoot from "../repos/containers/RepositoryRoot";

11
scm-ui/src/repos/containers/Changesets.js
View File

@@ -21,7 +21,8 @@ import ChangesetList from "../components/changesets/ChangesetList";
import { import {
ErrorNotification, ErrorNotification,
LinkPaginator, LinkPaginator,
Loading Loading,
getPageFromMatch
} from "@scm-manager/ui-components"; } from "@scm-manager/ui-components";
import { compose } from "redux"; import { compose } from "redux";
@@ -94,14 +95,6 @@ const mapDispatchToProps = dispatch => {
}; };
}; };
export function getPageFromMatch(match: any) {
let page = parseInt(match.params.page, 10);
if (isNaN(page) || !page) {
page = 1;
}
return page;
}
const mapStateToProps = (state: any, ownProps: Props) => { const mapStateToProps = (state: any, ownProps: Props) => {
const { repository, branch, match } = ownProps; const { repository, branch, match } = ownProps;
const changesets = getChangesets(state, repository, branch); const changesets = getChangesets(state, repository, branch);