Skip to content
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.

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

Fix/clientside validation in repo creation 833 #879

Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
1 change: 1 addition & 0 deletions docs/assets/js/swagger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ definitions:
properties:
id:
type: string
pattern: '^[a-z0-9][a-z0-9-]{2,62}$'
storage_namespace:
type: string
description: "Filesystem URI to store the underlying data in (e.g. 's3://my-bucket/some/path/')"
Expand Down
1 change: 1 addition & 0 deletions swagger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ definitions:
properties:
name:
type: string
pattern: '^[a-z0-9][a-z0-9-]{2,62}$'
storage_namespace:
type: string
description: "Filesystem URI to store the underlying data in (e.g. 's3://my-bucket/some/path/')"
Expand Down
50 changes: 39 additions & 11 deletions webui/src/components/RepositoryCreateForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,33 @@ export const RepositoryCreateForm = connect(
};
})(({ error, onSubmit, onCancel, create, sm = 6, config }) => {
const fieldNameOffset = 3;
const repoValidityRegex = /^[a-z0-9][a-z0-9-]{2,62}$/;
const storageNamespaceValidityRegex = /^(s3|gs|mem|local|transient):\/.*$/;

const [formValid, setFormValid] = useState(false);
const [repoValid, setRepoValid] = useState(true);
itaiad200 marked this conversation as resolved.
Show resolved Hide resolved
const [storageNamespaceValid, setStorageNamespaceValid] = useState(true);
itaiad200 marked this conversation as resolved.
Show resolved Hide resolved
const [defaultBranchValid, setDefaultBranchValid] = useState(true);
const storageNamespaceField = useRef(null);
const defaultBranchField = useRef(null);
const repoIdField = useRef(null);

const checkValidity = () => {
if (repoIdField.current.value.length === 0 ||
storageNamespaceField.current.value.length === 0 ||
defaultBranchField.current.value.length === 0) {
setFormValid(false);
return;
}
setFormValid(true);
const checkRepoValidity = () => {
const isRepoValid = repoValidityRegex.test(repoIdField.current.value)
setRepoValid(isRepoValid);
setFormValid(isRepoValid);
Sufiyan1997 marked this conversation as resolved.
Show resolved Hide resolved
};

const checkStorageNamespaceValidity = () => {
const isStorageNamespaceValid = storageNamespaceValidityRegex.test(storageNamespaceField.current.value)
setStorageNamespaceValid(isStorageNamespaceValid);
setFormValid(isStorageNamespaceValid);
};

const checkDefaultBranchValidity = () => {
const isBranchValid = defaultBranchField.current.value.length;
setDefaultBranchValid(isBranchValid);
setFormValid(isBranchValid);
};

let blockstoreType = config.payload == null ? DEFAULT_BLOCKSTORE_TYPE : config.payload['blockstore.type']
Expand All @@ -51,20 +64,35 @@ export const RepositoryCreateForm = connect(
<Form.Group as={Row} controlId="id">
<Form.Label column sm={fieldNameOffset}>Repository ID</Form.Label>
<Col sm={sm}>
<Form.Control type="text" autoFocus ref={repoIdField} onChange={checkValidity}/>
<Form.Control type="text" autoFocus ref={repoIdField} onChange={checkRepoValidity}/>
{!repoValid &&
<Form.Text className="text-danger">
Min 2 characters. Only Alpahnumeric characters and '-' allowed.
Sufiyan1997 marked this conversation as resolved.
Show resolved Hide resolved
</Form.Text>
}
</Col>
</Form.Group>

<Form.Group as={Row}>
<Form.Label column sm={fieldNameOffset}>Storage Namespace</Form.Label>
<Col sm={sm}>
<Form.Control type="text" ref={storageNamespaceField} placeholder={`e.g. ${blockstoreType}://example-bucket/`} onChange={checkValidity}/>
<Form.Control type="text" ref={storageNamespaceField} placeholder={`e.g. ${blockstoreType}://example-bucket/`} onChange={checkStorageNamespaceValidity}/>
{!storageNamespaceValid &&
<Form.Text className="text-danger">
Invalid Storage Namespace.
</Form.Text>
}
</Col>
</Form.Group>
<Form.Group as={Row} controlId="defaultBranch">
<Form.Label column sm={fieldNameOffset}>Default Branch</Form.Label>
<Col sm={sm}>
<Form.Control type="text" ref={defaultBranchField} placeholder="defaultBranch" defaultValue={"master"} onChange={checkValidity}/>
<Form.Control type="text" ref={defaultBranchField} placeholder="defaultBranch" defaultValue={"master"} onChange={checkDefaultBranchValidity}/>
{!defaultBranchValid &&
<Form.Text className="text-danger">
Invalid Branch.
</Form.Text>
}
</Col>
</Form.Group>

Expand Down