From ed940d5f23367f0e4f636d556ad72a928cb52756 Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Thu, 10 Dec 2020 13:58:47 +0100 Subject: [PATCH] Create form for import from bundle --- scm-ui/ui-webapp/public/locales/de/repos.json | 4 + scm-ui/ui-webapp/public/locales/en/repos.json | 4 + .../components/ImportRepositoryFromBundle.tsx | 117 ++++++++++++++++++ .../src/repos/containers/ImportRepository.tsx | 19 ++- 4 files changed, 140 insertions(+), 4 deletions(-) create mode 100644 scm-ui/ui-webapp/src/repos/components/ImportRepositoryFromBundle.tsx diff --git a/scm-ui/ui-webapp/public/locales/de/repos.json b/scm-ui/ui-webapp/public/locales/de/repos.json index 50631133a4..da37603fdd 100644 --- a/scm-ui/ui-webapp/public/locales/de/repos.json +++ b/scm-ui/ui-webapp/public/locales/de/repos.json @@ -75,6 +75,10 @@ "url": { "label": "Import via URL", "helpText": "Das Repository wird über eine URL importiert." + }, + "bundle": { + "label": "Import aus Dump", + "helpText": "Das Repository wird aus einen Datei Dump importiert." } } }, diff --git a/scm-ui/ui-webapp/public/locales/en/repos.json b/scm-ui/ui-webapp/public/locales/en/repos.json index b44214b8e9..a795532bf2 100644 --- a/scm-ui/ui-webapp/public/locales/en/repos.json +++ b/scm-ui/ui-webapp/public/locales/en/repos.json @@ -76,6 +76,10 @@ "url": { "label": "Import via URL", "helpText": "The Repository will be imported via the provided URL." + }, + "bundle": { + "label": "Import from dump", + "helpText": "The repository will be imported from a dump file." } } }, diff --git a/scm-ui/ui-webapp/src/repos/components/ImportRepositoryFromBundle.tsx b/scm-ui/ui-webapp/src/repos/components/ImportRepositoryFromBundle.tsx new file mode 100644 index 0000000000..203ca9b243 --- /dev/null +++ b/scm-ui/ui-webapp/src/repos/components/ImportRepositoryFromBundle.tsx @@ -0,0 +1,117 @@ +/* + * MIT License + * + * Copyright (c) 2020-present Cloudogu GmbH and Contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +import React, { FC, FormEvent, useState } from "react"; +import NamespaceAndNameFields from "./NamespaceAndNameFields"; +import {File, Repository} from "@scm-manager/ui-types"; +import RepositoryInformationForm from "./RepositoryInformationForm"; +import { apiClient, ErrorNotification, FileUpload, Level, SubmitButton } from "@scm-manager/ui-components"; +import { useTranslation } from "react-i18next"; +import { useHistory } from "react-router-dom"; + +type Props = { + url: string; + repositoryType: string; + setImportPending: (pending: boolean) => void; +}; + +const ImportRepositoryFromBundle: FC = ({ url, repositoryType, setImportPending }) => { + const [repo, setRepo] = useState({ + name: "", + namespace: "", + type: repositoryType, + contact: "", + description: "", + _links: {}, + }); + + const [valid, setValid] = useState({ namespaceAndName: false, contact: true, file: false }); + const [loading, setLoading] = useState(false); + const [error, setError] = useState(); + const [file, setFile] = useState(null); + const history = useHistory(); + const [t] = useTranslation("repos"); + + const handleImportLoading = (loading: boolean) => { + setImportPending(loading); + setLoading(loading); + }; + + const isValid = () => Object.values(valid).every((v) => v); + + const submit = (event: FormEvent) => { + event.preventDefault(); + const currentPath = history.location.pathname; + setError(undefined); + handleImportLoading(true); + apiClient + .postBinary(url, (formdata) => { + formdata.append("bundle", file!, file?.name); + formdata.append("repository", JSON.stringify(repo)); + }) + .then((response) => { + const location = response.headers.get("Location"); + return apiClient.get(location!); + }) + .then((response) => response.json()) + .then((repo) => { + if (history.location.pathname === currentPath) { + history.push(`/repo/${repo.namespace}/${repo.name}/code/sources`); + } + }) + .catch((error) => { + setError(error); + handleImportLoading(false); + }); + }; + + return ( +
+ + { + setFile(file); + setValid({ ...valid, file: !!file }); + }} + /> +
+ >} + setValid={(namespaceAndName: boolean) => setValid({ ...valid, namespaceAndName })} + disabled={loading} + /> + >} + disabled={loading} + setValid={(contact: boolean) => setValid({ ...valid, contact })} + /> + } + /> + + ); +}; + +export default ImportRepositoryFromBundle; diff --git a/scm-ui/ui-webapp/src/repos/containers/ImportRepository.tsx b/scm-ui/ui-webapp/src/repos/containers/ImportRepository.tsx index b77ed1925b..730f207ec3 100644 --- a/scm-ui/ui-webapp/src/repos/containers/ImportRepository.tsx +++ b/scm-ui/ui-webapp/src/repos/containers/ImportRepository.tsx @@ -35,10 +35,11 @@ import { fetchRepositoryTypesIfNeeded, getFetchRepositoryTypesFailure, getRepositoryTypes, - isFetchRepositoryTypesPending + isFetchRepositoryTypesPending, } from "../modules/repositoryTypes"; import { connect } from "react-redux"; import { fetchNamespaceStrategiesIfNeeded } from "../../admin/modules/namespaceStrategies"; +import ImportRepositoryFromBundle from "../components/ImportRepositoryFromBundle"; type Props = { repositoryTypes: RepositoryType[]; @@ -67,7 +68,7 @@ const ImportRepository: FC = ({ pageLoading, error, fetchRepositoryTypesIfNeeded, - fetchNamespaceStrategiesIfNeeded + fetchNamespaceStrategiesIfNeeded, }) => { const [importPending, setImportPending] = useState(false); const [repositoryType, setRepositoryType] = useState(); @@ -95,6 +96,16 @@ const ImportRepository: FC = ({ ); } + if (importType === "bundle") { + return ( + link.name === "bundle") as Link).href} + repositoryType={repositoryType!.name} + setImportPending={setImportPending} + /> + ); + } + throw new Error("Unknown import type"); }; @@ -139,7 +150,7 @@ const mapStateToProps = (state: any) => { return { repositoryTypes, pageLoading, - error + error, }; }; @@ -150,7 +161,7 @@ const mapDispatchToProps = (dispatch: any) => { }, fetchNamespaceStrategiesIfNeeded: () => { dispatch(fetchNamespaceStrategiesIfNeeded()); - } + }, }; };