From be12167f0a3462edba5e45a0bd67d6d7915aff28 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 13 Mar 2019 10:00:47 +0100 Subject: [PATCH] validates namespace if the strategy is custom --- scm-ui/src/repos/components/form/RepositoryForm.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scm-ui/src/repos/components/form/RepositoryForm.js b/scm-ui/src/repos/components/form/RepositoryForm.js index de0bfe0c9a..a1cdf5a863 100644 --- a/scm-ui/src/repos/components/form/RepositoryForm.js +++ b/scm-ui/src/repos/components/form/RepositoryForm.js @@ -28,6 +28,8 @@ type State = { contactValidationError: boolean }; +const CUSTOM_NAMESPACE_STRATEGY = "CustomNamespaceStrategy"; + class RepositoryForm extends React.Component { constructor(props: Props) { super(props); @@ -62,12 +64,14 @@ class RepositoryForm extends React.Component { } isValid = () => { - const repository = this.state.repository; + const { namespaceStrategy } = this.props; + const { repository } = this.state; return !( this.state.namespaceValidationError || this.state.nameValidationError || this.state.contactValidationError || - this.isFalsy(repository.name) + this.isFalsy(repository.name) || + (namespaceStrategy === CUSTOM_NAMESPACE_STRATEGY && this.isFalsy(repository.namespace)) ); }; @@ -143,7 +147,7 @@ class RepositoryForm extends React.Component { validationError: this.state.namespaceValidationError }; - if (namespaceStrategy === "CustomNamespaceStrategy") { + if (namespaceStrategy === CUSTOM_NAMESPACE_STRATEGY) { return ; }