Skip to content

ui: Remove "reset time" n Statements and Transactions Pages#76691

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
jocrl:clean-up-time-buttons
Feb 17, 2022
Merged

ui: Remove "reset time" n Statements and Transactions Pages#76691
craig[bot] merged 1 commit intocockroachdb:masterfrom
jocrl:clean-up-time-buttons

Conversation

@jocrl
Copy link
Copy Markdown
Contributor

@jocrl jocrl commented Feb 16, 2022

Addresses #70997

This commit removes the "reset time" link on Statements and Transactions Pages.

Release note (ui): The "Now" button had been added in this commit
jocrl@82f2673
to the Statements and Transactions Pages. This commit removes the "reset time"
link which the "Now" button replaces.

Before, Statements Page:
image

After, Statements Page:
image

Before, Transactions Page:
image

After, Transactions Page:
image

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@jocrl
Copy link
Copy Markdown
Contributor Author

jocrl commented Feb 16, 2022

@Annebirzin, does this look good?

#70997 mentions:

Move 'Clear SQL stats' button next to time picker controls, and use underline tooltip treatment

The "underline tooltip treatment" seemed to be satisfied without any changes, just checking that it looks right?

@Annebirzin
Copy link
Copy Markdown

@jocrl yep, looks good thanks!

Not sure if this would be a separate issue, but can we tighten up the spacing between the Search/Filter and the space between the Filter/Time picker? The spacing in the designs for all of those controls is a bit tighter (screenshot of designs below)

Screen Shot 2022-02-16 at 12 32 27 PM

@jocrl
Copy link
Copy Markdown
Contributor Author

jocrl commented Feb 16, 2022

Hmm, could you break the spacing out into a separate issue? The code currently conflates the widths of these spacings, so it would take more to untangle them.
image

@jocrl jocrl marked this pull request as ready for review February 16, 2022 19:15
@jocrl jocrl requested a review from a team February 16, 2022 19:15
@jocrl jocrl added A-sql-console-general SQL Observability issues on the DB console spanning multiple areas. Includes Cockroach Cloud Console T-sql-observability labels Feb 16, 2022
Copy link
Copy Markdown

@matthewtodd matthewtodd left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 3 files at r1.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @jocrl and @matthewtodd)


pkg/ui/workspaces/cluster-ui/src/sqlActivity/clearStats.tsx, line 53 at r1 (raw file):

        onClick={props.resetSQLStats}
      >
        Clear SQL stats

Interestingly, I recently made the opposite change in #73922, in response to #73444. It's a small change and not much to worry about, but @kevin-v-ngo and @Annebirzin, could you confirm which word you'd like to see here? (See also the Figma discussion that led to #73444.)

Copy link
Copy Markdown

@matthewtodd matthewtodd left a comment

Choose a reason for hiding this comment

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

Code :lgtm:, one question on wording.

Reviewed 2 of 3 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @jocrl)

@kevin-v-ngo
Copy link
Copy Markdown

Good callout Matthew! We wanted reset to align with the reset function via SQL (it should be reset SQL stats). Not sure if anything changed but could've been a small detail we missed. Can you confirm @Annebirzin

@Annebirzin
Copy link
Copy Markdown

Ah yes we want to stick with the 'Reset' language, sorry for any confusion.

@jocrl also I'll create a separate ticket for the spacing issue. Thanks!

Addresses cockroachdb#70997

This commit removes the "reset time" link  on Statements and Transactions Pages.

Release note (ui): The "Now" button had been added in this commit
82f2673
to the Statements and Transactions Pages. This commit removes the "reset time"
link which the "Now" button replaces.
@jocrl jocrl force-pushed the clean-up-time-buttons branch from 1469c25 to 78c68e7 Compare February 16, 2022 21:43
@jocrl jocrl changed the title ui: Remove "reset time" and rename to "Clear SQL stats" in Statements and Transactions Pages ui: Remove "reset time" n Statements and Transactions Pages Feb 16, 2022
@jocrl
Copy link
Copy Markdown
Contributor Author

jocrl commented Feb 17, 2022

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Feb 17, 2022

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Feb 17, 2022

Build succeeded:

@craig craig bot merged commit a6ef4b0 into cockroachdb:master Feb 17, 2022
jocrl added a commit to jocrl/cockroach that referenced this pull request Mar 7, 2022
This commit fixes the stray parenthesis at the end of the duration time for a
succeeded job. The parenthesis had been introduced in
cockroachdb#76691 and the 21.2 backport
cockroachdb#73624.

Release note (ui): Remove stray parenthesis at the end of the duration time for
a succeeded job. It had been accidentally introduced to unreleased master and a
21.2 backport.

Release justification: Category 2, UI bug fix
jocrl added a commit to jocrl/cockroach that referenced this pull request Mar 7, 2022
Addresses  cockroachdb#77440.

This commit fixes the stray parenthesis at the end of the duration time for a
succeeded job. The parenthesis had been introduced in
cockroachdb#76691 and the 21.2 backport
cockroachdb#73624.

Release note (ui): Remove stray parenthesis at the end of the duration time for
a succeeded job. It had been accidentally introduced to unreleased master and a
21.2 backport.

Release justification: Category 2, UI bug fix
craig bot pushed a commit that referenced this pull request Mar 7, 2022
77208: sql: update test that was fooling itself r=ajwerner a=ajwerner

I have no clue what is going on in #76843 but this test was fooling itself
regarding the existence of separate connections.

Release justification: non-production code changes

Release note: None

77220: sql/contention/txnidcache: reuse blocks in list, account for space r=maryliag,ajwerner a=ajwerner

This change does two things to the txnidcache:
1) It accounts for the space used by the fifo eviction list. Previously
   we'd use more than double the intended space. We should probably also
   subtrace out the size of the buffers we're currently filling and the
   channel we use to communicate them, but I'll leave that for later.
2) It stops trying to compact the blocks. Compacting the blocks ends up
   being a good deal of overhead because we have to copy across every
   single message. Instead we can just append the block directly to the
   list. This does have the hazard of wasting a lot of space when the
   blocks are sparse. However, if the blocks are sparse, we know that the
   throughput is low, so it's fine.

Resolves #76738

Release justification: bug fixes and low-risk updates to new functionality

Release note: None

77363: sql/delegate: avoid extra string->int parsing r=otan a=rafiss

Release justification: low risk improvement
Release note: None

77438: ui: Remove stray parenthesis in Jobs page r=jocrl a=jocrl

Addresses #77440.

This commit fixes the stray parenthesis at the end of the duration time for a
succeeded job. The parenthesis had been introduced in
#76691 and the 21.2 backport
#73624.

Before:
![image](https://user-images.githubusercontent.com/91907326/157065776-456c8f7d-1958-4192-b38d-dcb40432cf9d.png)

After:
![image](https://user-images.githubusercontent.com/91907326/157065785-e3f2db6a-67d1-4ae3-87cb-df71dccf0e5f.png)


Release note (ui): Remove stray parenthesis at the end of the duration time for
a succeeded job. It had been accidentally introduced to unreleased master and a
21.2 backport.

Release justification: Category 2, UI bug fix

Co-authored-by: Andrew Werner <awerner32@gmail.com>
Co-authored-by: Rafi Shamim <rafi@cockroachlabs.com>
Co-authored-by: Josephine Lee <josephine@cockroachlabs.com>
jocrl added a commit to jocrl/cockroach that referenced this pull request Mar 7, 2022
Addresses  cockroachdb#77440.

This commit fixes the stray parenthesis at the end of the duration time for a
succeeded job. The parenthesis had been introduced in
cockroachdb#76691 and the 21.2 backport
cockroachdb#73624.

Release note (ui): Remove stray parenthesis at the end of the duration time for
a succeeded job. It had been accidentally introduced to unreleased master and a
21.2 backport.

Release justification: Category 2, UI bug fix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-sql-console-general SQL Observability issues on the DB console spanning multiple areas. Includes Cockroach Cloud Console

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants