Skip to content

Fix for branch name character replacement logic and addition of general fetch from remote option #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 16, 2020
Merged

Fix for branch name character replacement logic and addition of general fetch from remote option #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Components/DashBoard/Repository/RepoComponents/RepoDetailBackdrop/AddBranchComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ export default function AddBranchComponent(props) {
const branchNameVal = event.target.value;
if (
event.target.id === "branchName" &&
branchNameVal.match(/[^a-zA-Z0-9_]/gi)
branchNameVal.match(/[^a-zA-Z0-9_.:^\\/]/gi)
) {
event.target.value = branchNameVal.replace(
/[^a-zA-Z0-9_]/gi,
/[^a-zA-Z0-9_.:^\\/]/gi,
"-"
);
}
Expand Down
23 changes: 21 additions & 2 deletions ...onents/DashBoard/Repository/RepoComponents/RepoDetailBackdrop/FetchPullActionComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@ import {
globalAPIEndpoint,
ROUTE_REPO_DETAILS,
} from "../../../../../util/env_config";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { library } from "@fortawesome/fontawesome-svg-core";
import { fas } from "@fortawesome/free-solid-svg-icons";

import { v4 as uuid } from "uuid";

export default function FetchFromRemoteComponent(props) {
library.add(fas);
const { repoId, actionType } = props;

const [remoteData, setRemoteData] = useState();
Expand Down Expand Up @@ -94,7 +98,7 @@ export default function FetchFromRemoteComponent(props) {
}
}

function actionHandler(remote, branch) {
function actionHandler(remote = "", branch = "") {
setLoading(true);

const getAxiosRequestBody = (remote, branch) => {
Expand Down Expand Up @@ -178,6 +182,21 @@ export default function FetchFromRemoteComponent(props) {
return (
<>
<div className="w-3/4 mx-auto my-auto p-6 rounded shadow bg-white block">
{actionType === "fetch" ? (
<div
className="flex justify-center items-center w-11/12 xl:w-1/2 lg:w-3/4 md:w-3/4 sm:w-3/4 mx-auto my-4 p-1 text-center border-b-2 border-dashed border-gray-400 text-lg font-sans font-medium cursor-pointer text-indigo-400 hover:text-indigo-600 rounded-lg hover:border-gray-600"
onClick={() => {
actionHandler();
}}
>
<div className="text-2xl text-indigo-800 mx-4">
<FontAwesomeIcon
icon={["fas", "exclamation-circle"]}
></FontAwesomeIcon>
</div>
<div>Click here to Fetch globally without branch selection</div>
</div>
) : null}
<div className="m-3 text-2xl font-sans text-ghray-800">
Available remote repos
</div>
Expand Down Expand Up @@ -250,7 +269,7 @@ export default function FetchFromRemoteComponent(props) {

{!loading && result && result.length > 0 ? (
<>
<div className="p-3 rounded shadow bg-indigo-100 text-md font-sans text-gray-700">
<div className="p-3 rounded shadow bg-indigo-100 text-md font-sans text-gray-700 truncate">
{result.map((result) => {
return (
<div
Expand Down