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

Bug 1404147 - Prompt error message when create secret with invalid email #1030

Merged
merged 1 commit into from
Dec 14, 2016

Conversation

jhadvig
Copy link
Member

@jhadvig jhadvig commented Dec 13, 2016

@jwforres PTAL

@@ -234,6 +234,11 @@
required>
</div>
</div>
<div class="has-error" ng-show="secretForm.dockerEmail.$invalid && !secretForm.dockerEmail.$pristine">
<span class="help-block">
Email is invalid.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe

Email must be in the form of <var>user@domain</var>.

@@ -234,6 +234,11 @@
required>
</div>
</div>
<div class="has-error" ng-show="secretForm.dockerEmail.$invalid && !secretForm.dockerEmail.$pristine">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd check specifically for secretForm.dockerEmail.$error.email and have separate messages for invalid email values and missing required values.

@jhadvig
Copy link
Member Author

jhadvig commented Dec 13, 2016

@spadgett I've updated the PR based on your commets + added additional error messages for secret name, password & token, registry server address, registry user name, registry pw, registry email

PTAL

@@ -14,7 +14,7 @@
<div ng-if="newSecret.type">
<div class="form-group">
<label for="secretName" class="required">Secret Name</label>
<span ng-class="{'has-error': nameTaken || (secretForm.secretName.$error.pattern && secretForm.secretName.$touched)}">
<span ng-class="{'has-error': nameTaken || ((secretForm.secretName.$error.required || secretForm.secretName.$error.pattern) && secretForm.secretName.$touched)}">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<span ng-class="{'has-error': nameTaken || (secretForm.secretName.$invalid && secretForm.secretName.$touched)}">

@@ -204,8 +214,13 @@
required>
</div>
</div>
<div ng-show="secretForm.dockerUsername.$error.required && secretForm.dockerUsername.$touched" class="has-error">
<div class="help-block">
Email is required.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Username is required."

@@ -234,6 +253,14 @@
required>
</div>
</div>
<div class="has-error" ng-show="secretForm.dockerEmail.$invalid">
<div ng-show="secretForm.dockerEmail.$error.email" class="help-block">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<div ng-show="secretForm.dockerEmail.$error.email && secretForm.dockerEmail.$touched" class="help-block">

That way the error doesn't flash as I type.

@jhadvig
Copy link
Member Author

jhadvig commented Dec 13, 2016

@spadgett thanks so much ! Commets addressed

@spadgett
Copy link
Member

[merge]

1 similar comment
@spadgett
Copy link
Member

[merge]

@openshift-bot
Copy link

Evaluated for origin web console merge up to d5aaf8c

@openshift-bot
Copy link

openshift-bot commented Dec 14, 2016

Origin Web Console Merge Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_web_console/855/) (Base Commit: 2446d7f)

@openshift-bot openshift-bot merged commit cfc61cd into openshift:master Dec 14, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants