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

Use library query-string to parse query parameters

Browse Source
This commit is contained in:
René Pfeuffer
2019-04-04 11:43:30 +02:00
parent dfa0ceda55
commit 483637067d
3 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
scm-ui/src/repos/branches/containers/CreateBranch.js
View File

@@ -1,6 +1,10 @@
//@flow
import React from "react";
import { ErrorNotification, Loading, Subtitle } from "@scm-manager/ui-components";
import {
ErrorNotification,
Loading,
Subtitle
} from "@scm-manager/ui-components";
import { translate } from "react-i18next";
import BranchForm from "../components/BranchForm";
import type { Repository, Branch } from "@scm-manager/ui-types";
@@ -10,11 +14,14 @@ import {
createBranch,
createBranchReset,
isCreateBranchPending,
getCreateBranchFailure, isFetchBranchesPending, getFetchBranchesFailure
getCreateBranchFailure,
isFetchBranchesPending,
getFetchBranchesFailure
} from "../modules/branches";
import type { History } from "history";
import { connect } from "react-redux";
import {withRouter} from "react-router-dom";
import { withRouter } from "react-router-dom";
import queryString from "query-string";
type Props = {
loading?: boolean,
@@ -49,10 +56,9 @@ class CreateBranch extends React.Component<Props> {
this.props.createBranch(branch, () => this.branchCreated(branch));
};
matchesTransmittedName = (search: string) => {
const regex = new RegExp("\\?name=.+");
const match = search.match(regex);
return match ? match[0].substring(6, 0): null;
matchesTransmittedName = (url: string) => {
const params = queryString.parse(url);
return params.name;
};
render() {
@@ -62,8 +68,8 @@ class CreateBranch extends React.Component<Props> {
return <ErrorNotification error={error} />;
}
if(!branches) {
return <Loading/>;
if (!branches) {
return <Loading />;
}
return (
@@ -101,8 +107,10 @@ const mapDispatchToProps = dispatch => {
const mapStateToProps = (state, ownProps) => {
const { repository } = ownProps;
const loading = isFetchBranchesPending(state, repository) || isCreateBranchPending(state);
const error = getFetchBranchesFailure(state, repository) || getCreateBranchFailure(state);
const loading =
isFetchBranchesPending(state, repository) || isCreateBranchPending(state);
const error =
getFetchBranchesFailure(state, repository) || getCreateBranchFailure(state);
const branches = getBranches(state, repository);
return {
repository,
@@ -112,7 +120,9 @@ const mapStateToProps = (state, ownProps) => {
};
};
export default withRouter(connect(
mapStateToProps,
mapDispatchToProps
)(translate("repos")(CreateBranch)));
export default withRouter(
connect(
mapStateToProps,
mapDispatchToProps
)(translate("repos")(CreateBranch))
);