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

improve error handling on repository import if the credentials were wrong or missing

Browse Source
This commit is contained in:
Eduard Heimbuch
2020-11-26 12:57:40 +01:00
parent 0682118879
commit a7c4d41e4e
7 changed files with 111 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scm-ui/ui-webapp/src/repos/components/form/RepositoryForm.tsx
View File

@@ -108,6 +108,7 @@ const RepositoryForm: FC<Props> = ({
const isCreateMode = () => creationMode === "CREATE";
const isEditMode = () => !!repository;
const isModifiable = () => !!repository && !!repository._links.update;
const disabled = (!isModifiable() && isEditMode()) || loading;
const isValid = () => {
return !(
@@ -176,6 +177,7 @@ const RepositoryForm: FC<Props> = ({
onChange={handleImportUrlChange}
value={importUrl}
helpText={t("help.importUrlHelpText")}
disabled={disabled}
/>
</Column>
<Column className="column is-half">
@@ -184,6 +186,7 @@ const RepositoryForm: FC<Props> = ({
onChange={setUsername}
value={username}
helpText={t("help.usernameHelpText")}
disabled={disabled}
/>
</Column>
<Column className="column is-half">
@@ -193,6 +196,7 @@ const RepositoryForm: FC<Props> = ({
value={password}
type="password"
helpText={t("help.passwordHelpText")}
disabled={disabled}
/>
</Column>
</Columns>
@@ -221,6 +225,7 @@ const RepositoryForm: FC<Props> = ({
validationError={nameValidationError}
errorMessage={t("validation.name-invalid")}
helpText={t("help.nameHelpText")}
disabled={disabled}
/>
<SpaceBetween>
<SelectWrapper>
@@ -230,6 +235,7 @@ const RepositoryForm: FC<Props> = ({
value={repo ? repo.type : ""}
options={createSelectOptions(repositoryTypes)}
helpText={t("help.typeHelpText")}
disabled={disabled}
/>
</SelectWrapper>
{!isImportMode() && (
@@ -239,6 +245,7 @@ const RepositoryForm: FC<Props> = ({
checked={initRepository}
onChange={toggleInitCheckbox}
helpText={t("help.initializeRepository")}
disabled={disabled}
/>
{initRepository && (
<ExtensionPoint name="repos.create.initialize" props={extensionProps} renderAll={true} />
@@ -287,16 +294,12 @@ const RepositoryForm: FC<Props> = ({
setImportUrl(url);
};
const disabled = !isModifiable() && isEditMode();
const submitButton = () => {
if (disabled) {
return null;
}
const translationKey = isImportMode() ? "repositoryForm.submitImport" : "repositoryForm.submitCreate";
return <Level
right={<SubmitButton disabled={!isValid()} loading={loading} label={t(translationKey)} />}
/>;
return <Level right={<SubmitButton disabled={!isValid()} loading={loading} label={t(translationKey)} />} />;
};
return (

47
scm-ui/ui-webapp/src/repos/containers/AddRepository.tsx
View File

@@ -150,29 +150,30 @@ class AddRepository extends React.Component<Props> {
error={error}
showContentOnError={true}
>
{importLoading ? (
<>
<Notification type="info">{t("import.pending.infoText")}</Notification>
<Loading />
</>
) : (
<>
{!error && <RepositoryFormSwitcher creationMode={this.isImportPage() ? "IMPORT" : "CREATE"} />}
<RepositoryForm
repositoryTypes={repositoryTypes}
loading={createLoading}
namespaceStrategy={namespaceStrategies.current}
createRepository={(repo, initRepository) => {
createRepo(repoLink, repo, initRepository, (repo: Repository) => this.repoCreated(repo));
}}
importRepository={repo => {
importRepoFromUrl(repoLink, repo, (repo: Repository) => this.repoCreated(repo));
}}
indexResources={indexResources}
creationMode={this.isImportPage() ? "IMPORT" : "CREATE"}
/>
</>
)}
<>
{/*//TODO fix this CSS*/}
{!error && <RepositoryFormSwitcher creationMode={this.isImportPage() ? "IMPORT" : "CREATE"} />}
{importLoading && (
<>
<Notification type="info">{t("import.pending.infoText")}</Notification>
<Loading />
<hr/>
</>
)}
<RepositoryForm
repositoryTypes={repositoryTypes}
loading={createLoading || importLoading}
namespaceStrategy={namespaceStrategies.current}
createRepository={(repo, initRepository) => {
createRepo(repoLink, repo, initRepository, (repo: Repository) => this.repoCreated(repo));
}}
importRepository={repo => {
importRepoFromUrl(repoLink, repo, (repo: Repository) => this.repoCreated(repo));
}}
indexResources={indexResources}
creationMode={this.isImportPage() ? "IMPORT" : "CREATE"}
/>
</>
</Page>
);
}