From 54f87b1bcc4c4880a480a004ae7310eeddf7aae5 Mon Sep 17 00:00:00 2001 From: Joanne Wang Date: Mon, 16 Sep 2024 15:54:23 -0700 Subject: [PATCH 01/15] fill send test message button Signed-off-by: Joanne Wang --- public/pages/Channels/components/details/ChannelDetails.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/pages/Channels/components/details/ChannelDetails.tsx b/public/pages/Channels/components/details/ChannelDetails.tsx index 233f50f1..a2ef848d 100644 --- a/public/pages/Channels/components/details/ChannelDetails.tsx +++ b/public/pages/Channels/components/details/ChannelDetails.tsx @@ -196,6 +196,7 @@ export function ChannelDetails(props: ChannelDetailsProps) { isDisabled: !channel?.is_enabled, run: sendTestMessage, label: 'Send test message', + fill: true, } as TopNavControlButtonData, ]; @@ -247,7 +248,6 @@ export function ChannelDetails(props: ChannelDetailsProps) { bodyStyles={{ padding: 'initial' }} title="Name and description" titleSize="s" - panelStyles={{ maxWidth: 1300 }} > @@ -258,7 +258,6 @@ export function ChannelDetails(props: ChannelDetailsProps) { bodyStyles={{ padding: 'initial' }} title="Configurations" titleSize="s" - panelStyles={{ maxWidth: 1300 }} > From 1a550e276673f455d02703cc8a932e27fc1a8732 Mon Sep 17 00:00:00 2001 From: Joanne Wang Date: Mon, 16 Sep 2024 16:24:53 -0700 Subject: [PATCH 02/15] extend content to full width of page Signed-off-by: Joanne Wang --- public/pages/Emails/CreateRecipientGroup.tsx | 3 +-- public/pages/Emails/CreateSESSender.tsx | 3 +-- public/pages/Emails/CreateSender.tsx | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/public/pages/Emails/CreateRecipientGroup.tsx b/public/pages/Emails/CreateRecipientGroup.tsx index ee325fc0..6176cee3 100644 --- a/public/pages/Emails/CreateRecipientGroup.tsx +++ b/public/pages/Emails/CreateRecipientGroup.tsx @@ -121,7 +121,6 @@ export function CreateRecipientGroup(props: CreateRecipientGroupProps) { bodyStyles={{ padding: 'initial' }} title="Configure recipient group" titleSize="s" - panelStyles={{ maxWidth: 1000 }} > - + Cancel diff --git a/public/pages/Emails/CreateSESSender.tsx b/public/pages/Emails/CreateSESSender.tsx index 8b9f84ad..95910ad2 100644 --- a/public/pages/Emails/CreateSESSender.tsx +++ b/public/pages/Emails/CreateSESSender.tsx @@ -112,7 +112,6 @@ export function CreateSESSender(props: CreateSESSenderProps) { bodyStyles={{ padding: 'initial' }} title="Configure sender" titleSize="s" - panelStyles={{ maxWidth: 1000 }} > - + Cancel diff --git a/public/pages/Emails/CreateSender.tsx b/public/pages/Emails/CreateSender.tsx index 31c5b282..fb8185e3 100644 --- a/public/pages/Emails/CreateSender.tsx +++ b/public/pages/Emails/CreateSender.tsx @@ -109,7 +109,6 @@ export function CreateSender(props: CreateSenderProps) { bodyStyles={{ padding: 'initial' }} title="Configure sender" titleSize="s" - panelStyles={{ maxWidth: 1000 }} > - + Cancel From 9d0a5fae04d94d391f87196b088116d009624d82 Mon Sep 17 00:00:00 2001 From: Joanne Wang Date: Mon, 16 Sep 2024 16:46:21 -0700 Subject: [PATCH 03/15] fix spacing across buttons (8px) Signed-off-by: Joanne Wang --- public/pages/Channels/components/details/ChannelDetails.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/pages/Channels/components/details/ChannelDetails.tsx b/public/pages/Channels/components/details/ChannelDetails.tsx index a2ef848d..ed51ce47 100644 --- a/public/pages/Channels/components/details/ChannelDetails.tsx +++ b/public/pages/Channels/components/details/ChannelDetails.tsx @@ -143,8 +143,7 @@ export function ChannelDetails(props: ChannelDetailsProps) { }, ]; - const actionsAndMuteComponent = - + const actionsAndMuteComponent = {channel && ( Date: Mon, 16 Sep 2024 17:13:49 -0700 Subject: [PATCH 04/15] add vertical spacing Signed-off-by: Joanne Wang --- .../Emails/components/forms/CreateRecipientGroupForm.tsx | 4 ++-- public/pages/Emails/components/forms/CreateSESSenderForm.tsx | 4 ++-- public/pages/Emails/components/forms/CreateSenderForm.tsx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/pages/Emails/components/forms/CreateRecipientGroupForm.tsx b/public/pages/Emails/components/forms/CreateRecipientGroupForm.tsx index 71eada79..1c03cbb1 100644 --- a/public/pages/Emails/components/forms/CreateRecipientGroupForm.tsx +++ b/public/pages/Emails/components/forms/CreateRecipientGroupForm.tsx @@ -60,7 +60,7 @@ export function CreateRecipientGroupForm(props: CreateRecipientGroupFormProps) { /> - + @@ -84,7 +84,7 @@ export function CreateRecipientGroupForm(props: CreateRecipientGroupFormProps) { - + - + - + - + - + Date: Mon, 16 Sep 2024 17:24:46 -0700 Subject: [PATCH 05/15] fix header and content 16px Signed-off-by: Joanne Wang --- public/pages/Channels/components/details/ChannelDetails.tsx | 1 - public/pages/CreateChannel/CreateChannel.tsx | 1 - public/pages/Emails/CreateRecipientGroup.tsx | 1 - public/pages/Emails/CreateSESSender.tsx | 1 - public/pages/Emails/CreateSender.tsx | 1 - public/pages/Emails/EmailGroups.tsx | 1 - public/pages/Emails/EmailSenders.tsx | 1 - 7 files changed, 7 deletions(-) diff --git a/public/pages/Channels/components/details/ChannelDetails.tsx b/public/pages/Channels/components/details/ChannelDetails.tsx index ed51ce47..22f3e326 100644 --- a/public/pages/Channels/components/details/ChannelDetails.tsx +++ b/public/pages/Channels/components/details/ChannelDetails.tsx @@ -242,7 +242,6 @@ export function ChannelDetails(props: ChannelDetailsProps) { )} - )} - )} - )} - )} - )} - diff --git a/public/pages/Emails/EmailSenders.tsx b/public/pages/Emails/EmailSenders.tsx index 05e7beb9..ede7ac66 100644 --- a/public/pages/Emails/EmailSenders.tsx +++ b/public/pages/Emails/EmailSenders.tsx @@ -43,7 +43,6 @@ export function EmailSenders(props: EmailSendersProps) { )} {mainStateContext.availableConfigTypes.includes('smtp_account') && ( <> - From 2882ea3be47950cbe3f5f9d18f5ed546f809ce5e Mon Sep 17 00:00:00 2001 From: Joanne Wang Date: Mon, 16 Sep 2024 17:40:39 -0700 Subject: [PATCH 06/15] remove extra 10px padding Signed-off-by: Joanne Wang --- public/components/ContentPanel/ContentPanel.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/components/ContentPanel/ContentPanel.tsx b/public/components/ContentPanel/ContentPanel.tsx index 2f6acc7c..947c94d5 100644 --- a/public/components/ContentPanel/ContentPanel.tsx +++ b/public/components/ContentPanel/ContentPanel.tsx @@ -70,7 +70,7 @@ const ContentPanel: React.SFC = ({ -
{children}
+
{children}
); From 8235c7a82214b578a90f80433e0f7f1a4dfc56d9 Mon Sep 17 00:00:00 2001 From: Joanne Wang Date: Mon, 16 Sep 2024 17:49:20 -0700 Subject: [PATCH 07/15] align active indicator Signed-off-by: Joanne Wang --- public/pages/Channels/components/details/ChannelDetails.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/pages/Channels/components/details/ChannelDetails.tsx b/public/pages/Channels/components/details/ChannelDetails.tsx index 22f3e326..ed7bd8cc 100644 --- a/public/pages/Channels/components/details/ChannelDetails.tsx +++ b/public/pages/Channels/components/details/ChannelDetails.tsx @@ -199,7 +199,7 @@ export function ChannelDetails(props: ChannelDetailsProps) { } as TopNavControlButtonData, ]; - const badgeComponent = + const badgeComponent = {channel?.is_enabled === undefined ? null : channel.is_enabled ? ( Active ) : ( From c74fdd97bbcd88b5dad8fa9f74d916e869eefd09 Mon Sep 17 00:00:00 2001 From: Joanne Wang Date: Mon, 16 Sep 2024 17:54:16 -0700 Subject: [PATCH 08/15] wrap h2 in Eui Title with size s prop Signed-off-by: Joanne Wang --- public/components/ContentPanel/ContentPanel.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/components/ContentPanel/ContentPanel.tsx b/public/components/ContentPanel/ContentPanel.tsx index 947c94d5..4a4b11fc 100644 --- a/public/components/ContentPanel/ContentPanel.tsx +++ b/public/components/ContentPanel/ContentPanel.tsx @@ -8,7 +8,7 @@ import { EuiFlexItem, EuiHorizontalRule, EuiPanel, - EuiText, + EuiTitle, } from '@elastic/eui'; import React from 'react'; @@ -40,7 +40,7 @@ const ContentPanel: React.SFC = ({ alignItems="center" > - +

{title} {total !== undefined ? ( @@ -49,7 +49,7 @@ const ContentPanel: React.SFC = ({ >{` (${total})`} ) : null}

- + {actions ? ( From de2e6ea1733be633504f14f1c34f2dafb233588f Mon Sep 17 00:00:00 2001 From: Joanne Wang Date: Mon, 16 Sep 2024 18:50:28 -0700 Subject: [PATCH 09/15] fix padding for elements from search bar 8px Signed-off-by: Joanne Wang --- public/pages/Channels/Channels.tsx | 2 +- public/pages/Channels/components/ChannelControls.tsx | 2 +- public/pages/Emails/components/tables/RecipientGroupsTable.tsx | 3 +-- public/pages/Emails/components/tables/SESSendersTable.tsx | 3 +-- public/pages/Emails/components/tables/SendersTable.tsx | 3 +-- public/pages/Emails/components/tables/SendersTableControls.tsx | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/public/pages/Channels/Channels.tsx b/public/pages/Channels/Channels.tsx index 6e28b2fd..f143ae72 100644 --- a/public/pages/Channels/Channels.tsx +++ b/public/pages/Channels/Channels.tsx @@ -281,7 +281,7 @@ export class Channels extends MDSEnabledComponent
{channelControlsComponent} -
+
{channelActionsComponent}
diff --git a/public/pages/Channels/components/ChannelControls.tsx b/public/pages/Channels/components/ChannelControls.tsx index 8024a88f..2de239f2 100644 --- a/public/pages/Channels/components/ChannelControls.tsx +++ b/public/pages/Channels/components/ChannelControls.tsx @@ -96,7 +96,7 @@ export const ChannelControls = (props: ChannelControlsProps) => { } return ( - + - + {searchComponent} @@ -321,7 +321,6 @@ export class RecipientGroupsTable extends Component< iconType="arrowDown" iconSide="right" onClick={this.togglePopover} - style={{ marginLeft: '10px' }} // Ensure spacing is correct > Actions diff --git a/public/pages/Emails/components/tables/SESSendersTable.tsx b/public/pages/Emails/components/tables/SESSendersTable.tsx index 2b5059b7..b7f31c30 100644 --- a/public/pages/Emails/components/tables/SESSendersTable.tsx +++ b/public/pages/Emails/components/tables/SESSendersTable.tsx @@ -263,7 +263,7 @@ export class SESSendersTable extends Component< titleSize="s" total={this.state.total} > - + {searchComponent} @@ -275,7 +275,6 @@ export class SESSendersTable extends Component< iconType="arrowDown" iconSide="right" onClick={this.togglePopover} - style={{ marginLeft: '10px' }} // Ensure spacing is correct > Actions diff --git a/public/pages/Emails/components/tables/SendersTable.tsx b/public/pages/Emails/components/tables/SendersTable.tsx index dba914f5..2bad7cfd 100644 --- a/public/pages/Emails/components/tables/SendersTable.tsx +++ b/public/pages/Emails/components/tables/SendersTable.tsx @@ -287,7 +287,7 @@ export class SendersTable extends Component< titleSize="s" total={this.state.total} > - + {senderControlComponent} @@ -299,7 +299,6 @@ export class SendersTable extends Component< iconType="arrowDown" iconSide="right" onClick={this.togglePopover} - style={{ marginLeft: '10px' }} // Ensure spacing is correct > Actions diff --git a/public/pages/Emails/components/tables/SendersTableControls.tsx b/public/pages/Emails/components/tables/SendersTableControls.tsx index 5bb879d9..e6cea6f1 100644 --- a/public/pages/Emails/components/tables/SendersTableControls.tsx +++ b/public/pages/Emails/components/tables/SendersTableControls.tsx @@ -63,7 +63,7 @@ export const SendersTableControls = (props: SendersTableControlsProps) => { } return ( - + Date: Mon, 16 Sep 2024 19:07:40 -0700 Subject: [PATCH 10/15] remove bottom border in empty state Signed-off-by: Joanne Wang --- public/pages/Channels/Channels.tsx | 2 +- .../pages/Emails/components/tables/RecipientGroupsTable.tsx | 6 +++++- public/pages/Emails/components/tables/SESSendersTable.tsx | 3 +++ public/pages/Emails/components/tables/SendersTable.tsx | 3 +++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/public/pages/Channels/Channels.tsx b/public/pages/Channels/Channels.tsx index f143ae72..77441eec 100644 --- a/public/pages/Channels/Channels.tsx +++ b/public/pages/Channels/Channels.tsx @@ -277,7 +277,7 @@ export class Channels extends MDSEnabledComponent appRightControls={headerControls} appLeftControls={[{ renderComponent: totalChannels }]} /> - +
{channelControlsComponent} diff --git a/public/pages/Emails/components/tables/RecipientGroupsTable.tsx b/public/pages/Emails/components/tables/RecipientGroupsTable.tsx index 1e3db22c..eb3f2504 100644 --- a/public/pages/Emails/components/tables/RecipientGroupsTable.tsx +++ b/public/pages/Emails/components/tables/RecipientGroupsTable.tsx @@ -308,7 +308,11 @@ export class RecipientGroupsTable extends Component< appRightControls={headerControls} appLeftControls={[{ renderComponent: totalEmailGroups }]} /> - + {searchComponent} diff --git a/public/pages/Emails/components/tables/SESSendersTable.tsx b/public/pages/Emails/components/tables/SESSendersTable.tsx index b7f31c30..dc55ca9e 100644 --- a/public/pages/Emails/components/tables/SESSendersTable.tsx +++ b/public/pages/Emails/components/tables/SESSendersTable.tsx @@ -245,6 +245,9 @@ export class SESSendersTable extends Component< <> {getUseUpdatedUx() ? ( {getUseUpdatedUx() ? ( Date: Mon, 16 Sep 2024 20:08:39 -0700 Subject: [PATCH 11/15] wip Signed-off-by: Joanne Wang --- public/pages/Channels/components/details/ChannelDetails.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/public/pages/Channels/components/details/ChannelDetails.tsx b/public/pages/Channels/components/details/ChannelDetails.tsx index ed7bd8cc..153730f5 100644 --- a/public/pages/Channels/components/details/ChannelDetails.tsx +++ b/public/pages/Channels/components/details/ChannelDetails.tsx @@ -143,7 +143,7 @@ export function ChannelDetails(props: ChannelDetailsProps) { }, ]; - const actionsAndMuteComponent = + const actionsAndMuteComponent = {channel && ( - +

{channel?.name ?? '-'}

From fd68c7894b41fd2da48ad3416e086775c157d02a Mon Sep 17 00:00:00 2001 From: Joanne Wang Date: Mon, 16 Sep 2024 20:20:27 -0700 Subject: [PATCH 12/15] fix original view monitors page Signed-off-by: Joanne Wang --- public/pages/Channels/components/details/ChannelDetails.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/pages/Channels/components/details/ChannelDetails.tsx b/public/pages/Channels/components/details/ChannelDetails.tsx index 153730f5..3c7fb1af 100644 --- a/public/pages/Channels/components/details/ChannelDetails.tsx +++ b/public/pages/Channels/components/details/ChannelDetails.tsx @@ -144,6 +144,7 @@ export function ChannelDetails(props: ChannelDetailsProps) { ]; const actionsAndMuteComponent = + {channel && ( From db8bf97816d63b91df46291425d87d64c7beeece Mon Sep 17 00:00:00 2001 From: Joanne Wang Date: Mon, 16 Sep 2024 20:34:53 -0700 Subject: [PATCH 13/15] fix original spacing Signed-off-by: Joanne Wang --- .../Channels/components/details/ChannelDetails.tsx | 3 +++ public/pages/CreateChannel/CreateChannel.tsx | 11 +++++++---- public/pages/Emails/CreateRecipientGroup.tsx | 9 ++++++--- public/pages/Emails/CreateSESSender.tsx | 9 ++++++--- public/pages/Emails/CreateSender.tsx | 9 ++++++--- public/pages/Emails/EmailGroups.tsx | 9 ++++++--- public/pages/Emails/EmailSenders.tsx | 9 ++++++--- 7 files changed, 40 insertions(+), 19 deletions(-) diff --git a/public/pages/Channels/components/details/ChannelDetails.tsx b/public/pages/Channels/components/details/ChannelDetails.tsx index 3c7fb1af..90549b89 100644 --- a/public/pages/Channels/components/details/ChannelDetails.tsx +++ b/public/pages/Channels/components/details/ChannelDetails.tsx @@ -33,6 +33,7 @@ import { ChannelDetailsActions } from './ChannelDetailsActions'; import { ChannelSettingsDetails } from './ChannelSettingsDetails'; import PageHeader from "../../../../components/PageHeader/PageHeader"; import { TopNavControlButtonData } from '../../../../../../../src/plugins/navigation/public'; +import { getUseUpdatedUx } from '../../../../services/utils/constants'; interface ChannelDetailsProps extends RouteComponentProps<{ id: string @@ -243,6 +244,8 @@ export function ChannelDetails(props: ChannelDetailsProps) { )} + {!getUseUpdatedUx() && } + - {!getUseUpdatedUx() && ( - -

{`${props.edit ? 'Edit' : 'Create'} channel`}

- + {!getUseUpdatedUx() && ( + <> + +

{`${props.edit ? 'Edit' : 'Create'} channel`}

+ + + )} {!getUseUpdatedUx() && ( - -

{`${props.edit ? 'Edit' : 'Create'} recipient group`}

- + <> + +

{`${props.edit ? 'Edit' : 'Create'} recipient group`}

+ + + )} {!getUseUpdatedUx() && ( - -

{`${props.edit ? 'Edit' : 'Create'} SES sender`}

- + <> + +

{`${props.edit ? 'Edit' : 'Create'} SES sender`}

+ + + )} {!getUseUpdatedUx() && ( - -

{`${props.edit ? 'Edit' : 'Create'} SMTP sender`}

- + <> + +

{`${props.edit ? 'Edit' : 'Create'} SMTP sender`}

+ + + )} {!getUseUpdatedUx() && ( - -

Email recipient groups

- + <> + +

Email recipient groups

+ + + )} {!getUseUpdatedUx() && ( - -

Email senders

- + <> + +

Email senders

+ + + )} {mainStateContext.availableConfigTypes.includes('smtp_account') && ( <> From 2d8249fd5e1841d668693189b88c6fe9c7077c51 Mon Sep 17 00:00:00 2001 From: Joanne Wang Date: Mon, 16 Sep 2024 20:39:11 -0700 Subject: [PATCH 14/15] run yarn test:jest -u Signed-off-by: Joanne Wang --- .../__snapshots__/ContentPanel.test.tsx.snap | 24 +++---- .../ChannelControls.test.tsx.snap | 2 +- .../ChannelDetails.test.tsx.snap | 68 ++++++++----------- .../__snapshots__/Channels.test.tsx.snap | 22 +++--- .../ChannelNamePanel.test.tsx.snap | 20 +++--- .../RecipientGroupsTable.test.tsx.snap | 20 +++--- .../__snapshots__/SendersTable.test.tsx.snap | 22 +++--- .../SendersTableControls.test.tsx.snap | 2 +- .../__snapshots__/Main.test.tsx.snap | 22 +++--- 9 files changed, 87 insertions(+), 115 deletions(-) diff --git a/public/components/__tests__/__snapshots__/ContentPanel.test.tsx.snap b/public/components/__tests__/__snapshots__/ContentPanel.test.tsx.snap index 13d35e14..8c25393c 100644 --- a/public/components/__tests__/__snapshots__/ContentPanel.test.tsx.snap +++ b/public/components/__tests__/__snapshots__/ContentPanel.test.tsx.snap @@ -11,13 +11,11 @@ exports[` spec renders the component 1`] = `
-
-

- Testing -

-
+ Testing +
spec renders the component 1`] = ` class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall" />
Testing ContentPanel @@ -59,20 +57,18 @@ exports[` spec renders with empty actions 1`] = `
-
-

- Testing -

-
+ Testing +
Testing ContentPanel diff --git a/public/pages/Channels/__tests__/__snapshots__/ChannelControls.test.tsx.snap b/public/pages/Channels/__tests__/__snapshots__/ChannelControls.test.tsx.snap index acf23670..4af9ef5d 100644 --- a/public/pages/Channels/__tests__/__snapshots__/ChannelControls.test.tsx.snap +++ b/public/pages/Channels/__tests__/__snapshots__/ChannelControls.test.tsx.snap @@ -2,7 +2,7 @@ exports[` spec renders the component 1`] = `
spec handles a non-existing channel 1`] = `
spec handles a non-existing channel 1`] = `
spec handles a non-existing channel 1`] = ` />
spec handles a non-existing channel 1`] = `
-
-

- Name and description -

-
+ Name and description +
spec handles a non-existing channel 1`] = ` />
spec handles a non-existing channel 1`] = `
-
-

- Configurations -

-
+ Configurations +
spec renders a specific channel 1`] = `
spec renders a specific channel 1`] = `
spec renders a specific channel 1`] = ` />
spec renders a specific channel 1`] = `
-
-

- Name and description -

-
+ Name and description +
spec renders a specific channel 1`] = ` />
spec renders a specific channel 1`] = `
-
-

- Configurations -

-
+ Configurations +
spec renders a specific channel 1`] = ` exports[` spec renders the component 1`] = `
spec renders the component 1`] = `
spec renders the empty component 1`] = `
-
-

- Channels - - (0) - -

-
+ Channels + + (0) + +
spec renders the empty component 1`] = ` style="padding: initial;" >
spec renders errors 1`] = `
-
-

- Name and description -

-
+ Name and description +
spec renders the component 1`] = `
-
-

- Name and description -

-
+ Name and description +
spec renders empty state 1`] = `
-
-

- Recipient groups - - (0) - -

-
+ Recipient groups + + (0) + +
spec renders empty state 1`] = `
-
-

- SMTP senders - - (0) - -

-
+ SMTP senders + + (0) + +
spec renders empty state 1`] = ` style="padding: initial;" >
spec renders the component 1`] = `
spec renders the component 1`] = `
-
-

- Channels - - (0) - -

-
+ Channels + + (0) + +
spec renders the component 1`] = ` style="padding: initial;" >
Date: Mon, 16 Sep 2024 20:48:45 -0700 Subject: [PATCH 15/15] upgrade to v4 Signed-off-by: Joanne Wang --- ...ifications-test-and-build-workflow-prod-docker-linux.yml | 2 +- .../dashboards-notifications-test-and-build-workflow.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 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 b1f4a76b..4c88195c 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 @@ -120,7 +120,7 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} - name: Upload Artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: dashboards-notifications path: OpenSearch-Dashboards/plugins/dashboards-notifications/build diff --git a/.github/workflows/dashboards-notifications-test-and-build-workflow.yml b/.github/workflows/dashboards-notifications-test-and-build-workflow.yml index b0cf1fc7..0c43570f 100644 --- a/.github/workflows/dashboards-notifications-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-notifications-test-and-build-workflow.yml @@ -196,14 +196,14 @@ jobs: CYPRESS_CACHE_FOLDER: ${{ matrix.cypress_cache_folder }} # Screenshots are only captured on failure, will change this once we do visual regression tests - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-screenshots-${{ matrix.os }} path: OpenSearch-Dashboards/plugins/dashboards-notifications/.cypress/screenshots # Test run video was always captured, so this action uses "always()" condition - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: always() with: name: cypress-videos-${{ matrix.os }} @@ -218,7 +218,7 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} - name: Upload Artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: dashboards-notifications path: OpenSearch-Dashboards/plugins/dashboards-notifications/build