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

UI: bugfixes: footer alignment and bad server responses #5703

Merged
merged 2 commits into from
Mar 30, 2016

Conversation

maxlang
Copy link
Contributor

@maxlang maxlang commented Mar 30, 2016

A bug caused the footer to be misaligned on certain pages.

Before:
screen shot 2016-03-30 at 1 14 59 am

After:
screen shot 2016-03-30 at 1 15 05 am


This change is Reviewable

@cuongdo
Copy link
Contributor

cuongdo commented Mar 30, 2016

I'm not sure we need to slip this in ASAP. Yes, the footer's position in master isn't ideal.

However, this PR still has a bug in the footer positioning. Specifically, with a fresh new cluster, when the "opt in" banner is showing, the footer is hidden just below the bottom edge of the window:

screenshot 2016-03-30 06 01 58

The footer reappears when I close the banner:

screenshot 2016-03-30 06 02 08

@petermattis: any thoughts here?

@maxlang maxlang force-pushed the maxlang/ui-footer-fix branch from e23505d to 527c411 Compare March 30, 2016 13:44
@maxlang
Copy link
Contributor Author

maxlang commented Mar 30, 2016

I'll take another look, but this is a big visual improvement.

@cuongdo
Copy link
Contributor

cuongdo commented Mar 30, 2016

OK, let's get this in the next build, and also get a fix for the case where the banner is visible later.

:lgtm:


Comments from the review on Reviewable.io

@maxlang maxlang force-pushed the maxlang/ui-footer-fix branch from 527c411 to c3da613 Compare March 30, 2016 14:03
@maxlang maxlang changed the title UI: footer alignment fix UI: bugfixes: footer alignment and bad server responses Mar 30, 2016
@maxlang
Copy link
Contributor Author

maxlang commented Mar 30, 2016

Added a fix for bad responses from external requests.

@@ -128,6 +128,7 @@ module Models {
m.request<VersionList>({
url: `${COCKROACHLABS_ADDR}/api/clusters/updates?uuid=${this.clusterID}&version=${nodeStatuses[0].build_info.tag}`,
config: Utils.Http.XHRConfig,
background: true,
Copy link
Contributor

Choose a reason for hiding this comment

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

Do you also need this on the other methods like unregister? It's still hanging on those.

@cuongdo
Copy link
Contributor

cuongdo commented Mar 30, 2016

ui/ts/util/http.ts, line 6 [r3] (raw file):
This causes a JS console error for me:



Comments from the review on Reviewable.io

@cuongdo
Copy link
Contributor

cuongdo commented Mar 30, 2016

ui/ts/util/http.ts, line 6 [r3] (raw file):
Actually, never mind... it seems to be doing what's intended:

Error attempting to contact Cockroach Labs server. SyntaxError: Unexpected token h(…)

Comments from the review on Reviewable.io

@maxlang
Copy link
Contributor Author

maxlang commented Mar 30, 2016

This is expected - it's actually the error we're getting back from the Cockroach Labs server. We have an error parsing it because it's not JSON, but now we just log and continue, whereas before this error was bubbled up.

@maxlang maxlang force-pushed the maxlang/ui-footer-fix branch from 02e341b to bbf72a8 Compare March 30, 2016 14:43
@maxlang maxlang force-pushed the maxlang/ui-footer-fix branch from bbf72a8 to d20fe13 Compare March 30, 2016 14:44
@cuongdo
Copy link
Contributor

cuongdo commented Mar 30, 2016

:lgtm: for commit #2

tested on a hacked up version of reg server that sleeps for 10 seconds on all HTTP requests


Review status: 0 of 5 files reviewed at latest revision, 2 unresolved discussions.


Comments from the review on Reviewable.io

@maxlang maxlang merged commit 9a412ed into cockroachdb:master Mar 30, 2016
@maxlang maxlang deleted the maxlang/ui-footer-fix branch March 30, 2016 15:10
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.

2 participants