## Description ### Fixes - [x] https://github.com/appsmithorg/appsmith/issues/19383 - [x] https://github.com/appsmithorg/appsmith/issues/19384 - [x] https://github.com/appsmithorg/appsmith/issues/19385 - [x] https://github.com/appsmithorg/appsmith/issues/19386 - [x] https://github.com/appsmithorg/appsmith/issues/19387 - [x] https://github.com/appsmithorg/appsmith/issues/19388 - [x] https://github.com/appsmithorg/appsmith/issues/19389 - [x] https://github.com/appsmithorg/appsmith/issues/19390 - [x] https://github.com/appsmithorg/appsmith/issues/19391 - [x] https://github.com/appsmithorg/appsmith/issues/19392 - [x] https://github.com/appsmithorg/appsmith/issues/19393 - [x] https://github.com/appsmithorg/appsmith/issues/19394 - [x] https://github.com/appsmithorg/appsmith/issues/19395 - [x] https://github.com/appsmithorg/appsmith/issues/19396 - [x] https://github.com/appsmithorg/appsmith/issues/19397 - [x] https://github.com/appsmithorg/appsmith/issues/19398 - [x] https://github.com/appsmithorg/appsmith/issues/19399 - [x] https://github.com/appsmithorg/appsmith/issues/19400 - [x] https://github.com/appsmithorg/appsmith/issues/19401 - [x] https://github.com/appsmithorg/appsmith/issues/19402 - [x] https://github.com/appsmithorg/appsmith/issues/19403 - [x] https://github.com/appsmithorg/appsmith/issues/19404 - [x] https://github.com/appsmithorg/appsmith/issues/19405 - [x] https://github.com/appsmithorg/appsmith/issues/19406 - [x] https://github.com/appsmithorg/appsmith/issues/19407 - [x] https://github.com/appsmithorg/appsmith/issues/19408 - [x] https://github.com/appsmithorg/appsmith/issues/19409 Fixes # (issue) > if no issue exists, please create an issue and ask the maintainers about this first Media > A video or a GIF is preferred. when using Loom, don’t embed because it looks like it’s a GIF. instead, just link to the video ## Type of change > Please delete options that are not relevant. - Bug fix (non-breaking change which fixes an issue) - New feature (non-breaking change which adds functionality) - Breaking change (fix or feature that would cause existing functionality to not work as expected) - Chore (housekeeping or task changes that don't impact user perception) - This change requires a documentation update ## How Has This Been Tested? > Please describe the tests that you ran to verify your changes. Provide instructions, so we can reproduce. > Please also list any relevant details for your test configuration. > Delete anything that is not important - Manual - Jest - Cypress ### Test Plan > Add Testsmith test cases links that relate to this PR ### Issues raised during DP testing > Link issues raised during DP testing for better visiblity and tracking (copy link from comments dropped on this PR) ## Checklist: ### Dev activity - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] PR is being merged under a feature flag ### QA activity: - [ ] Test plan has been approved by relevant developers - [ ] Test plan has been peer reviewed by QA - [ ] Cypress test cases have been added and approved by either SDET or manual QA - [ ] Organized project review call with relevant stakeholders after Round 1/2 of QA - [ ] Added Test Plan Approved label after reveiwing all Cypress test --------- Co-authored-by: Ankita Kinger <ankita@appsmith.com> Co-authored-by: akash-codemonk <67054171+akash-codemonk@users.noreply.github.com> Co-authored-by: Tanvi Bhakta <tanvi@appsmith.com> Co-authored-by: Arsalan <arsalanyaldram0211@outlook.com> Co-authored-by: Aman Agarwal <aman@appsmith.com> Co-authored-by: Rohit Agarwal <rohit_agarwal@live.in> Co-authored-by: Nilesh Sarupriya <nilesh@appsmith.com> Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com> Co-authored-by: Tanvi Bhakta <tanvibhakta@gmail.com> Co-authored-by: Aishwarya UR <aishwarya@appsmith.com> Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local> Co-authored-by: Vijetha-Kaja <vijetha@appsmith.com> Co-authored-by: Parthvi <80334441+Parthvi12@users.noreply.github.com> Co-authored-by: Apple <nandan@thinkify.io> Co-authored-by: Saroj <43822041+sarojsarab@users.noreply.github.com> Co-authored-by: Sangeeth Sivan <74818788+berzerkeer@users.noreply.github.com> Co-authored-by: Ashok Kumar M <35134347+marks0351@users.noreply.github.com> Co-authored-by: Aishwarya-U-R <91450662+Aishwarya-U-R@users.noreply.github.com> Co-authored-by: rahulramesha <rahul@appsmith.com> Co-authored-by: Aswath K <aswath.sana@gmail.com> Co-authored-by: Preet Sidhu <preetsidhu.bits@gmail.com> Co-authored-by: Vijetha-Kaja <119562824+Vijetha-Kaja@users.noreply.github.com> Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
125 lines
3.8 KiB
TypeScript
125 lines
3.8 KiB
TypeScript
import React from "react";
|
|
import { connect } from "react-redux";
|
|
import type { AppState } from "@appsmith/reducers";
|
|
import { Keys } from "@blueprintjs/core";
|
|
import {
|
|
showActionConfirmationModal,
|
|
cancelActionConfirmationModal,
|
|
acceptActionConfirmationModal,
|
|
} from "actions/pluginActionActions";
|
|
import {
|
|
Button,
|
|
Modal,
|
|
ModalBody,
|
|
ModalContent,
|
|
ModalFooter,
|
|
ModalHeader,
|
|
} from "design-system";
|
|
import {
|
|
createMessage,
|
|
QUERY_CONFIRMATION_MODAL_MESSAGE,
|
|
} from "@appsmith/constants/messages";
|
|
import type { ModalInfo } from "reducers/uiReducers/modalActionReducer";
|
|
|
|
type Props = {
|
|
modals: ModalInfo[];
|
|
dispatch: any;
|
|
};
|
|
|
|
class RequestConfirmationModal extends React.Component<Props> {
|
|
addEventListener = () => {
|
|
document.addEventListener("keydown", this.onKeyUp);
|
|
};
|
|
|
|
removeEventListener = () => {
|
|
document.removeEventListener("keydown", this.onKeyUp);
|
|
};
|
|
|
|
onKeyUp = (event: KeyboardEvent) => {
|
|
// Sometimes calling the shortcut keys "Cmd + Enter" also triggers the onConfirm function below
|
|
// so We check if no multiple keys are being pressed currently before executing this block of code.
|
|
if (!(event.metaKey || event.ctrlKey) && event.keyCode === Keys.ENTER) {
|
|
// please note: due to the way the state is being updated, the last action will always correspond to the right Action Modal.
|
|
// this is not a bug.
|
|
this.onConfirm(this.props.modals[this.props.modals.length - 1]);
|
|
}
|
|
};
|
|
|
|
onConfirm = (modalInfo: ModalInfo) => {
|
|
const { dispatch } = this.props;
|
|
dispatch(acceptActionConfirmationModal(modalInfo.name));
|
|
this.handleClose(modalInfo);
|
|
};
|
|
|
|
handleClose = (modalInfo: ModalInfo) => {
|
|
const { dispatch } = this.props;
|
|
dispatch(showActionConfirmationModal({ ...modalInfo, modalOpen: false }));
|
|
dispatch(cancelActionConfirmationModal(modalInfo.name));
|
|
};
|
|
|
|
componentDidUpdate() {
|
|
const { modals } = this.props;
|
|
if (!!modals) {
|
|
this.addEventListener();
|
|
} else {
|
|
this.removeEventListener();
|
|
}
|
|
}
|
|
|
|
render() {
|
|
const { dispatch, modals } = this.props;
|
|
|
|
// making sure that only modals that are set to be open are eventually opened.
|
|
// basically filters out modals that have already been opened and prevents it from flashing after other modals have been confirmed.
|
|
const modalsToBeOpened = modals.filter((modal) => modal.modalOpen);
|
|
|
|
return (
|
|
<>
|
|
{modalsToBeOpened.map((modalInfo: ModalInfo) => (
|
|
<Modal
|
|
key={modalInfo.name}
|
|
onOpenChange={() => this.handleClose(modalInfo)}
|
|
open={modalInfo?.modalOpen}
|
|
>
|
|
<ModalContent
|
|
data-testid="t--query-run-confirmation-modal"
|
|
style={{ width: "600px" }}
|
|
>
|
|
<ModalHeader>Confirmation dialog</ModalHeader>
|
|
<ModalBody>
|
|
{createMessage(QUERY_CONFIRMATION_MODAL_MESSAGE)}{" "}
|
|
<b>{modalInfo.name}</b> ?
|
|
</ModalBody>
|
|
<ModalFooter>
|
|
<Button
|
|
kind="secondary"
|
|
onClick={() => {
|
|
dispatch(cancelActionConfirmationModal(modalInfo.name));
|
|
this.handleClose(modalInfo);
|
|
}}
|
|
size="md"
|
|
>
|
|
No
|
|
</Button>
|
|
<Button
|
|
kind="primary"
|
|
onClick={() => this.onConfirm(modalInfo)}
|
|
size="md"
|
|
>
|
|
Yes
|
|
</Button>
|
|
</ModalFooter>
|
|
</ModalContent>
|
|
</Modal>
|
|
))}
|
|
</>
|
|
);
|
|
}
|
|
}
|
|
|
|
const mapStateToProps = (state: AppState) => ({
|
|
modals: state.ui.modalAction.modals,
|
|
});
|
|
|
|
export default connect(mapStateToProps)(RequestConfirmationModal);
|