From c79af95dcaca4bfbcd1d3e0b5394e75e94da073a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 18 Sep 2024 23:20:54 +0000 Subject: [PATCH 1/3] Fit and Finish UX Fixes Pt 2. (#270) * add default pill to encryption method Signed-off-by: Joanne Wang * make table filters separate Signed-off-by: Joanne Wang * run yarn test:jest-u Signed-off-by: Joanne Wang --------- Signed-off-by: Joanne Wang (cherry picked from commit 13d80a5e09213129f34d4b0495064e5ee9faac27) Signed-off-by: github-actions[bot] --- .../__snapshots__/ChannelControls.test.tsx.snap | 8 ++++++++ .../__tests__/__snapshots__/Channels.test.tsx.snap | 8 ++++++++ public/pages/Channels/components/ChannelControls.tsx | 4 ++++ .../__tests__/__snapshots__/SendersTable.test.tsx.snap | 10 ++++++++-- .../__snapshots__/SendersTableControls.test.tsx.snap | 10 ++++++++-- .../Emails/components/tables/SendersTableControls.tsx | 3 +++ .../Main/__tests__/__snapshots__/Main.test.tsx.snap | 8 ++++++++ 7 files changed, 47 insertions(+), 4 deletions(-) diff --git a/public/pages/Channels/__tests__/__snapshots__/ChannelControls.test.tsx.snap b/public/pages/Channels/__tests__/__snapshots__/ChannelControls.test.tsx.snap index 4af9ef5d..dcd33374 100644 --- a/public/pages/Channels/__tests__/__snapshots__/ChannelControls.test.tsx.snap +++ b/public/pages/Channels/__tests__/__snapshots__/ChannelControls.test.tsx.snap @@ -91,6 +91,14 @@ exports[` spec renders the component 1`] = ` + + +
+
diff --git a/public/pages/Channels/__tests__/__snapshots__/Channels.test.tsx.snap b/public/pages/Channels/__tests__/__snapshots__/Channels.test.tsx.snap index 75b32f3c..9bebd4d1 100644 --- a/public/pages/Channels/__tests__/__snapshots__/Channels.test.tsx.snap +++ b/public/pages/Channels/__tests__/__snapshots__/Channels.test.tsx.snap @@ -195,6 +195,14 @@ exports[` spec renders the empty component 1`] = `
+
+ +
+
diff --git a/public/pages/Channels/components/ChannelControls.tsx b/public/pages/Channels/components/ChannelControls.tsx index 2de239f2..9c5f37e6 100644 --- a/public/pages/Channels/components/ChannelControls.tsx +++ b/public/pages/Channels/components/ChannelControls.tsx @@ -136,6 +136,10 @@ export const ChannelControls = (props: ChannelControlsProps) => { ); })} + + + + spec renders empty state 1`] = ` class="euiPopover__anchor" > diff --git a/public/pages/Emails/__tests__/__snapshots__/SendersTableControls.test.tsx.snap b/public/pages/Emails/__tests__/__snapshots__/SendersTableControls.test.tsx.snap index ce5ff41c..dfb6f8df 100644 --- a/public/pages/Emails/__tests__/__snapshots__/SendersTableControls.test.tsx.snap +++ b/public/pages/Emails/__tests__/__snapshots__/SendersTableControls.test.tsx.snap @@ -57,7 +57,7 @@ exports[` spec renders the component 1`] = ` class="euiPopover__anchor" > diff --git a/public/pages/Emails/components/tables/SendersTableControls.tsx b/public/pages/Emails/components/tables/SendersTableControls.tsx index e6cea6f1..8b7c19a5 100644 --- a/public/pages/Emails/components/tables/SendersTableControls.tsx +++ b/public/pages/Emails/components/tables/SendersTableControls.tsx @@ -78,6 +78,9 @@ export const SendersTableControls = (props: SendersTableControlsProps) => { item.checked === 'on').length + } iconType="arrowDown" grow={false} onClick={() => diff --git a/public/pages/Main/__tests__/__snapshots__/Main.test.tsx.snap b/public/pages/Main/__tests__/__snapshots__/Main.test.tsx.snap index 65eef144..9efd0ad0 100644 --- a/public/pages/Main/__tests__/__snapshots__/Main.test.tsx.snap +++ b/public/pages/Main/__tests__/__snapshots__/Main.test.tsx.snap @@ -300,6 +300,14 @@ exports[`
spec renders the component 1`] = `
+
+ +
+
From e35b0ea8ce86b91ec8805897e4125135ef283e91 Mon Sep 17 00:00:00 2001 From: AWSHurneyt Date: Wed, 18 Sep 2024 16:27:05 -0700 Subject: [PATCH 2/3] Update dashboards-notifications-test-and-build-workflow.yml Signed-off-by: AWSHurneyt --- .../dashboards-notifications-test-and-build-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dashboards-notifications-test-and-build-workflow.yml b/.github/workflows/dashboards-notifications-test-and-build-workflow.yml index 681d273f..c8c9f74f 100644 --- a/.github/workflows/dashboards-notifications-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-notifications-test-and-build-workflow.yml @@ -9,8 +9,8 @@ on: [pull_request, push] env: PLUGIN_NAME: notifications-dashboards - OPENSEARCH_DASHBOARDS_VERSION: '2.x' - NOTIFICATIONS_PLUGIN_VERSION: '2.x' + OPENSEARCH_DASHBOARDS_VERSION: '2.17.0' + NOTIFICATIONS_PLUGIN_VERSION: '2.17.0.0' jobs: tests: From c56d070004c511f8b3f59cedf1d4a368cea682f2 Mon Sep 17 00:00:00 2001 From: AWSHurneyt Date: Wed, 18 Sep 2024 16:27:25 -0700 Subject: [PATCH 3/3] Update dashboards-notifications-test-and-build-workflow-prod-docker-linux.yml Signed-off-by: AWSHurneyt --- ...otifications-test-and-build-workflow-prod-docker-linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dashboards-notifications-test-and-build-workflow-prod-docker-linux.yml b/.github/workflows/dashboards-notifications-test-and-build-workflow-prod-docker-linux.yml index 9bc6ffbd..b474b001 100644 --- a/.github/workflows/dashboards-notifications-test-and-build-workflow-prod-docker-linux.yml +++ b/.github/workflows/dashboards-notifications-test-and-build-workflow-prod-docker-linux.yml @@ -9,8 +9,8 @@ on: [pull_request, push] env: PLUGIN_NAME: notifications-dashboards - OPENSEARCH_DASHBOARDS_VERSION: '2.x' - NOTIFICATIONS_PLUGIN_VERSION: '2.x' + OPENSEARCH_DASHBOARDS_VERSION: '2.17.0' + NOTIFICATIONS_PLUGIN_VERSION: '2.17.0.0' jobs: Get-CI-Image-Tag: