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.

Sign up for GitHub

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

Jump to bottom

Sidebranch: Performance Secondary Dashboard #8956

Merged
merged 14 commits into from
May 13, 2020
Merged

Sidebranch: Performance Secondary Dashboard #8956

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
700e1c5
setup rep dashboard to dynamically take in the component to render an…
Monkeychip May 8, 2020
c3601f3
conditional pass in the correct props to the Dashboard.card component…
Monkeychip May 11, 2020
ade8219
update replication dashboard test
Monkeychip May 11, 2020
2f67d2f
Merge branch 'ui/replication-status-discoverability' into ui/performa…
Monkeychip May 11, 2020
b87e35c
add performance secondary test and clean up replication-secondary-car…
Monkeychip May 11, 2020
3373df1
fix message
Monkeychip May 11, 2020
6f8c190
replace cluster-id with secondaryId
Monkeychip May 11, 2020
7d2e349
remove reindexing test as its a duplicate of the branch noelle is wor…
Monkeychip May 12, 2020
efa65b7
cleanup
Monkeychip May 12, 2020
d5fdefb
address pr comments
Monkeychip May 13, 2020
e263dbe
Merge branch 'ui/replication-status-discoverability' into ui/performa…
Monkeychip May 13, 2020
5e96c94
small test fixes
Monkeychip May 13, 2020
3443e97
add secondaryId to header test
Monkeychip May 13, 2020
ee5a03b
fix tests description
Monkeychip May 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 14 additions & 3 deletions ui/app/styles/components/replication-dashboard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,20 @@

.selectable-card-container {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(400px, 1fr));
grid-template-rows: 1fr;
grid-gap: 2rem;

&.primary {
Monkeychip marked this conversation as resolved.
Show resolved Hide resolved
margin: 2rem 0 2rem 0;
grid-template-columns: 1fr 2fr;

@include until($mobile) {
grid-template-columns: 1fr;
}
}

&.secondary {
grid-template-columns: repeat(auto-fit, minmax(400px, 1fr));
grid-gap: 2rem;
}

.card-container {
display: grid;
Expand Down
9 changes: 0 additions & 9 deletions ui/app/styles/components/replication-summary.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
.replication {
.selectable-card-container {
margin: 2rem 0 2rem 0;
grid-template-columns: 1fr 2fr;

@include until($mobile) {
grid-template-columns: 1fr;
}
}

.toolbar {
border-top: 0px;
}
Expand Down
0 ui/app/helpers/format-number.js → ui/lib/core/addon/helpers/format-number.js
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions ui/lib/core/addon/templates/components/replication-dashboard.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
@message="This can cause a delay depending on the size of the data store. You can use Vault during this time."
data-test-isReindexing/>
{{/if}}

<div class="selectable-card-container has-top-margin-xl">
<div class="selectable-card-container {{if isSecondary 'secondary' 'primary'}} has-top-margin-xl">
{{yield (hash
card=(component componentToRender replicationDetails=replicationDetails)
)}}
Expand Down
1 change: 1 addition & 0 deletions ui/lib/core/app/helpers/format-number.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default, formatNumber } from 'core/helpers/format-number';
Monkeychip marked this conversation as resolved.
Show resolved Hide resolved
5 changes: 4 additions & 1 deletion ui/lib/replication/addon/templates/components/replication-summary.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,10 @@
<p>{{cluster.replicationModeStatus.cluster_id}}</p>
<div class="replication">
<ReplicationPage @model={{cluster}} as |Page|>
<Page.dashboard @data={{cluster}} @componentToRender='replication-primary-card' as |Dashboard|>
<Page.dashboard
@data={{cluster}}
@componentToRender={{if (eq replicationAttrs.mode 'secondary') 'replication-secondary-card' 'replication-primary-card' }}
as |Dashboard|>
<Dashboard.card
@title='State'
@description='Updated every ten seconds.'
Expand Down