From 9da0da6012b6c4b80db90fdd5862d37ad2113aa4 Mon Sep 17 00:00:00 2001 From: Pawel Kowalczyk Date: Wed, 14 Nov 2018 11:44:13 +0100 Subject: [PATCH 1/1] cr changes Feature #14461 Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk --- .../process-remove-dialog.tsx | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/views-components/process-remove-dialog/process-remove-dialog.tsx b/src/views-components/process-remove-dialog/process-remove-dialog.tsx index 4f6f907690..0994c28a31 100644 --- a/src/views-components/process-remove-dialog/process-remove-dialog.tsx +++ b/src/views-components/process-remove-dialog/process-remove-dialog.tsx @@ -2,19 +2,24 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { Dispatch } from "redux"; +import { Dispatch, compose } from 'redux'; import { connect } from "react-redux"; import { ConfirmationDialog } from "~/components/confirmation-dialog/confirmation-dialog"; import { withDialog, WithDialogProps } from "~/store/dialog/with-dialog"; -import { removeProcessPermanently, REMOVE_PROCESS_DIALOG } from "~/store/processes/processes-actions"; +import { removeProcessPermanently, REMOVE_PROCESS_DIALOG } from '~/store/processes/processes-actions'; - const mapDispatchToProps = (dispatch: Dispatch, props: WithDialogProps) => ({ +const mapStateToProps = (props: WithDialogProps) => ({ + ...props, +}); + +const mapDispatchToProps = (dispatch: Dispatch, props: WithDialogProps) => ({ onConfirm: () => { props.closeDialog(); dispatch(removeProcessPermanently(props.data.uuid)); } }); - export const [RemoveProcessDialog] = [ConfirmationDialog] - .map(connect(null, mapDispatchToProps) as any) - .map(withDialog(REMOVE_PROCESS_DIALOG)); \ No newline at end of file +export const RemoveProcessDialog = compose( + withDialog(REMOVE_PROCESS_DIALOG), + connect(mapStateToProps, mapDispatchToProps) +)(ConfirmationDialog); -- 2.30.2