From 28ba588536f7e12caab7f1bcef0bc340c3439373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cdorac-ext=E2=80=9D?= <103416234+doracretu3pillar@users.noreply.github.com> Date: Thu, 2 Nov 2023 10:55:45 +0200 Subject: [PATCH] Update according to review --- public/app/percona/pmm-dump/PMMDump.messages.ts | 1 + public/app/percona/pmm-dump/SendToSupportModal.tsx | 6 ++++-- public/app/percona/shared/core/reducers/pmmDump/pmmDump.ts | 4 ---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/public/app/percona/pmm-dump/PMMDump.messages.ts b/public/app/percona/pmm-dump/PMMDump.messages.ts index 0879063e48b7..d9d9ab56f85a 100644 --- a/public/app/percona/pmm-dump/PMMDump.messages.ts +++ b/public/app/percona/pmm-dump/PMMDump.messages.ts @@ -26,6 +26,7 @@ export const Messages = { addressPlaceholder: 'sftp.percona.com', savingButton: 'Saving...', sendButton: 'Send', + cancelButton: 'Cancel', }, emptyTable: 'No dumps available', createDataset: 'Create dataset', diff --git a/public/app/percona/pmm-dump/SendToSupportModal.tsx b/public/app/percona/pmm-dump/SendToSupportModal.tsx index a2280110fd47..b92a6fd9df5c 100644 --- a/public/app/percona/pmm-dump/SendToSupportModal.tsx +++ b/public/app/percona/pmm-dump/SendToSupportModal.tsx @@ -8,6 +8,8 @@ import { sendToSupportAction } from 'app/percona/shared/core/reducers/pmmDump/pm import { getDumps } from 'app/percona/shared/core/selectors'; import { useDispatch, useSelector } from 'app/types'; +import { PasswordField } from '../../core/components/PasswordField/PasswordField'; + interface ModalProps { onClose: (saved?: boolean) => void; dumpIds: string[]; @@ -68,7 +70,7 @@ export const SendToSupportModal: FC = ({ onClose, dumpIds }) => { /> - = ({ onClose, dumpIds }) => { onClick={() => onClose(false)} fill="outline" > - Cancel + {Messages.dumps.actions.cancelButton} diff --git a/public/app/percona/shared/core/reducers/pmmDump/pmmDump.ts b/public/app/percona/shared/core/reducers/pmmDump/pmmDump.ts index c872de326d78..2caa82a6007b 100644 --- a/public/app/percona/shared/core/reducers/pmmDump/pmmDump.ts +++ b/public/app/percona/shared/core/reducers/pmmDump/pmmDump.ts @@ -22,10 +22,6 @@ export const pmmDumpSlice = createSlice({ initialState, reducers: {}, extraReducers: (builder) => { - builder.addCase(fetchPmmDumpAction.pending, (state) => ({ - ...state, - })); - builder.addCase(fetchPmmDumpAction.fulfilled, (state, action) => ({ ...state, dumps: action.payload,