Skip to content

Commit

Permalink
[Backport 2.17] Fit and Finish UX Fixes Pt 2. (#275)
Browse files Browse the repository at this point in the history
* Fit and Finish UX Fixes Pt 2. (#270)

* add default pill to encryption method

Signed-off-by: Joanne Wang <[email protected]>

* make table filters separate

Signed-off-by: Joanne Wang <[email protected]>

* run yarn test:jest-u

Signed-off-by: Joanne Wang <[email protected]>

---------

Signed-off-by: Joanne Wang <[email protected]>
(cherry picked from commit 13d80a5)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Update dashboards-notifications-test-and-build-workflow.yml

Signed-off-by: AWSHurneyt <[email protected]>

* Update dashboards-notifications-test-and-build-workflow-prod-docker-linux.yml

Signed-off-by: AWSHurneyt <[email protected]>

---------

Signed-off-by: Joanne Wang <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: AWSHurneyt <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: AWSHurneyt <[email protected]>
  • Loading branch information
3 people authored Sep 20, 2024
1 parent d41ecc6 commit 5ac0919
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,14 @@ exports[`<ChannelControls /> spec renders the component 1`] = `
</button>
</div>
</div>
</div>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
>
<div
class="euiFilterGroup"
>
<div
class="euiPopover euiPopover--anchorDownCenter"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,14 @@ exports[`<Channels/> spec renders the empty component 1`] = `
</button>
</div>
</div>
</div>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
>
<div
class="euiFilterGroup"
>
<div
class="euiPopover euiPopover--anchorDownCenter"
>
Expand Down
4 changes: 4 additions & 0 deletions public/pages/Channels/components/ChannelControls.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ export const ChannelControls = (props: ChannelControlsProps) => {
);
})}
</EuiPopover>
</EuiFilterGroup>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiFilterGroup>
<EuiPopover
button={
<EuiSmallFilterButton
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ exports[`<SendersTable /> spec renders empty state 1`] = `
class="euiPopover__anchor"
>
<button
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiFilterButton euiFilterButton--hasIcon euiFilterButton--noGrow"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiFilterButton euiFilterButton-hasNotification euiFilterButton--hasIcon euiFilterButton--noGrow"
type="button"
>
<span
Expand All @@ -181,7 +181,7 @@ exports[`<SendersTable /> spec renders empty state 1`] = `
/>
</svg>
<span
class="euiButtonEmpty__text"
class="euiButtonEmpty__text euiFilterButton__text-hasNotification"
>
<span
class="euiFilterButton__textShift"
Expand All @@ -190,6 +190,12 @@ exports[`<SendersTable /> spec renders empty state 1`] = `
>
Encryption method
</span>
<span
aria-label="0 available filters"
class="euiNotificationBadge euiNotificationBadge--medium euiNotificationBadge--subdued euiFilterButton__notification"
>
0
</span>
</span>
</span>
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ exports[`<SendersTableControls /> spec renders the component 1`] = `
class="euiPopover__anchor"
>
<button
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiFilterButton euiFilterButton--hasIcon euiFilterButton--noGrow"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiFilterButton euiFilterButton-hasNotification euiFilterButton--hasIcon euiFilterButton--noGrow"
type="button"
>
<span
Expand All @@ -78,7 +78,7 @@ exports[`<SendersTableControls /> spec renders the component 1`] = `
/>
</svg>
<span
class="euiButtonEmpty__text"
class="euiButtonEmpty__text euiFilterButton__text-hasNotification"
>
<span
class="euiFilterButton__textShift"
Expand All @@ -87,6 +87,12 @@ exports[`<SendersTableControls /> spec renders the component 1`] = `
>
Encryption method
</span>
<span
aria-label="0 available filters"
class="euiNotificationBadge euiNotificationBadge--medium euiNotificationBadge--subdued euiFilterButton__notification"
>
0
</span>
</span>
</span>
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ export const SendersTableControls = (props: SendersTableControlsProps) => {
<EuiPopover
button={
<EuiSmallFilterButton
numFilters={
encryptionItems.filter((item) => item.checked === 'on').length
}
iconType="arrowDown"
grow={false}
onClick={() =>
Expand Down
8 changes: 8 additions & 0 deletions public/pages/Main/__tests__/__snapshots__/Main.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,14 @@ exports[`<Main /> spec renders the component 1`] = `
</button>
</div>
</div>
</div>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
>
<div
class="euiFilterGroup"
>
<div
class="euiPopover euiPopover--anchorDownCenter"
>
Expand Down

0 comments on commit 5ac0919

Please sign in to comment.