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

Add compress checkbox to ImportFromBundleForm

Browse Source
This commit is contained in:
Eduard Heimbuch
2020-12-10 14:46:47 +01:00
parent ed940d5f23
commit e8dd7dc68d
4 changed files with 96 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
scm-ui/ui-webapp/src/repos/components/ImportFromBundleForm.tsx Normal file
View File

@@ -0,0 +1,66 @@
/*
* 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 } from "react";
import { FileUpload, LabelWithHelpIcon, Checkbox } from "@scm-manager/ui-components";
import { File } from "@scm-manager/ui-types";
import { useTranslation } from "react-i18next";
type Props = {
setFile: (file: File) => void;
setValid: (valid: boolean) => void;
compressed: boolean;
setCompressed: (compressed: boolean) => void;
disabled: boolean;
};
const ImportFromBundleForm: FC<Props> = ({ setFile, setValid, compressed, setCompressed, disabled }) => {
const [t] = useTranslation("repos");
return (
<div className="columns">
<div className="column is-half is-vcentered">
<LabelWithHelpIcon label={t("import.bundle.title")} helpText={t("import.bundle.helpText")} />
<FileUpload
handleFile={(file: File) => {
setFile(file);
setValid(!!file);
}}
/>
</div>
<div className="column is-half is-vcentered">
<Checkbox
checked={compressed}
onChange={(value, name) => setCompressed(value)}
label={t("import.compressed.label")}
disabled={disabled}
helpText={t("import.compressed.helpText")}
title={t("import.compressed.label")}
/>
</div>
</div>
);
};
export default ImportFromBundleForm;

23
scm-ui/ui-webapp/src/repos/components/ImportRepositoryFromBundle.tsx
View File

@@ -23,11 +23,12 @@
*/
import React, { FC, FormEvent, useState } from "react";
import NamespaceAndNameFields from "./NamespaceAndNameFields";
import {File, Repository} from "@scm-manager/ui-types";
import { File, Repository } from "@scm-manager/ui-types";
import RepositoryInformationForm from "./RepositoryInformationForm";
import { apiClient, ErrorNotification, FileUpload, Level, SubmitButton } from "@scm-manager/ui-components";
import { apiClient, ErrorNotification, Level, SubmitButton } from "@scm-manager/ui-components";
import { useTranslation } from "react-i18next";
import { useHistory } from "react-router-dom";
import ImportFromBundleForm from "./ImportFromBundleForm";
type Props = {
url: string;
@@ -49,6 +50,7 @@ const ImportRepositoryFromBundle: FC<Props> = ({ url, repositoryType, setImportP
const [loading, setLoading] = useState(false);
const [error, setError] = useState<Error | undefined>();
const [file, setFile] = useState<File | null>(null);
const [compressed, setCompressed] = useState(false);
const history = useHistory();
const [t] = useTranslation("repos");
@@ -65,9 +67,9 @@ const ImportRepositoryFromBundle: FC<Props> = ({ url, repositoryType, setImportP
setError(undefined);
handleImportLoading(true);
apiClient
.postBinary(url, (formdata) => {
formdata.append("bundle", file!, file?.name);
formdata.append("repository", JSON.stringify(repo));
.postBinary(compressed ? url + "?compressed=true" : url, (formData) => {
formData.append("bundle", file, file?.name);
formData.append("repository", JSON.stringify(repo));
})
.then((response) => {
const location = response.headers.get("Location");
@@ -88,11 +90,12 @@ const ImportRepositoryFromBundle: FC<Props> = ({ url, repositoryType, setImportP
return (
<form onSubmit={submit}>
<ErrorNotification error={error} />
<FileUpload
handleFile={(file: File) => {
setFile(file);
setValid({ ...valid, file: !!file });
}}
<ImportFromBundleForm
setFile={setFile}
setValid={(file: boolean) => setValid({ ...valid, file })}
compressed={compressed}
setCompressed={setCompressed}
disabled={loading}
/>
<hr />
<NamespaceAndNameFields