From a3597acae534eb18000181e369d78ccc0fc3d4e7 Mon Sep 17 00:00:00 2001 From: Rahul Barwal Date: Tue, 27 Feb 2024 15:21:53 +0530 Subject: [PATCH] fix: Add useEffect hook to close modal when reconnecting modal is open (#31200) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description This pull request adds the useEffect hook to the CreateNewAppFromTemplatesWrapper component. The useEffect hook listens for changes in the isReconnectingModalOpen state and closes the modal when it is true. This ensures that the modal is closed when the reconnecting modal is open. #### PR fixes following issue(s) Fixes # (issue number) > 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 > > > ## Testing > #### How Has This Been Tested? > Please describe the tests that you ran to verify your changes. Also list any relevant details for your test configuration. > Delete anything that is not relevant - [ ] Manual - [ ] JUnit - [ ] 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: - [ ] [Speedbreak features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-) have been covered - [ ] Test plan covers all impacted features and [areas of interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-) - [ ] Test plan has been peer reviewed by project stakeholders and other QA members - [ ] Manually tested functionality on DP - [ ] We had an implementation alignment call with stakeholders post QA Round 2 - [ ] Cypress test cases have been added and approved by SDET/manual QA - [ ] Added `Test Plan Approved` label after Cypress tests were reviewed - [ ] Added `Test Plan Approved` label after JUnit tests were reviewed ## Summary by CodeRabbit - **New Features** - Introduced a new state to automatically close the modal when certain conditions are met, enhancing user experience. - Adjusted the control flow in the test scenario to improve accuracy. --- .../Onboarding/StartFromScratch_spec.ts | 86 ------------------- .../CreateNewAppFromTemplatesWrapper.tsx | 14 ++- 2 files changed, 13 insertions(+), 87 deletions(-) delete mode 100644 app/client/cypress/e2e/Regression/ClientSide/Onboarding/StartFromScratch_spec.ts diff --git a/app/client/cypress/e2e/Regression/ClientSide/Onboarding/StartFromScratch_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Onboarding/StartFromScratch_spec.ts deleted file mode 100644 index bc71bf9bdf..0000000000 --- a/app/client/cypress/e2e/Regression/ClientSide/Onboarding/StartFromScratch_spec.ts +++ /dev/null @@ -1,86 +0,0 @@ -import template from "../../../../locators/TemplatesLocators.json"; -import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags"; -import { - agHelper, - onboarding, - dataSources, - templates, - homePage, -} from "../../../../support/Objects/ObjectsCore"; -import { - AppSidebar, - AppSidebarButton, -} from "../../../../support/Pages/EditorNavigation"; - -describe( - "Start with scratch userflow", - { tags: ["@tag.excludeForAirgap", "@tag.Templates"] }, - function () { - beforeEach(() => { - homePage.Signout(true); - featureFlagIntercept( - { - ab_show_templates_instead_of_blank_canvas_enabled: true, - ab_create_new_apps_enabled: true, - }, - false, - ); - agHelper.GenerateUUID(); - cy.get("@guid").then((uid) => { - homePage.SignUp(`${uid}@appsmithtest.com`, uid as unknown as string); - }); - agHelper.GetNClick(onboarding.locators.startFromScratchCard); - onboarding.closeIntroModal(); - featureFlagIntercept({ - ab_show_templates_instead_of_blank_canvas_enabled: true, - }); - agHelper.AssertElementLength( - templates.locators._buildingBlockCardOnCanvas, - 3, - ); - }); - - it("1. onboarding flow - should check page entity selection in explorer", function () { - agHelper.GetNClick(onboarding.locators.seeMoreButtonOnCanvas, 0, true); - - agHelper.AssertElementVisibility(template.templateDialogBox); - - const filterItemWrapper = agHelper.GetElement(".filter-wrapper"); - - const templateFilterItemSelectedIcon = filterItemWrapper.find( - templates.locators._templateFilterItemSelectedIcon, - ); - templateFilterItemSelectedIcon.should("have.length", 1); - templateFilterItemSelectedIcon - .first() - .prev() - .should("have.text", "Building Blocks"); - agHelper.GetNClick(template.closeButton); - }); - - it("2. `Connect your data` pop up should come up when we fork a building block from canvas.", function () { - agHelper.GetNClick(templates.locators._buildingBlockCardOnCanvas); - - agHelper.WaitUntilEleDisappear("Importing template"); - agHelper.AssertElementVisibility( - templates.locators._datasourceConnectPromptSubmitBtn, - ); - agHelper.GetNClick(templates.locators._datasourceConnectPromptSubmitBtn); - cy.url().should("include", "datasources/NEW"); - }); - - it("3. `Connect your data` pop up should NOT come up when user already has a datasource.", function () { - dataSources.CreateMockDB("Users"); - AppSidebar.navigate(AppSidebarButton.Editor); - - agHelper.GetNClick(templates.locators._buildingBlockCardOnCanvas, 0); - - agHelper.WaitUntilEleDisappear("Importing template"); - - agHelper.AssertElementAbsence( - templates.locators._datasourceConnectPromptSubmitBtn, - 4000, - ); - }); - }, -); diff --git a/app/client/src/ce/pages/Applications/CreateNewAppFromTemplateModal/CreateNewAppFromTemplatesWrapper.tsx b/app/client/src/ce/pages/Applications/CreateNewAppFromTemplateModal/CreateNewAppFromTemplatesWrapper.tsx index 2214a40434..c5c706b215 100644 --- a/app/client/src/ce/pages/Applications/CreateNewAppFromTemplateModal/CreateNewAppFromTemplatesWrapper.tsx +++ b/app/client/src/ce/pages/Applications/CreateNewAppFromTemplateModal/CreateNewAppFromTemplatesWrapper.tsx @@ -1,5 +1,7 @@ -import React from "react"; +import React, { useEffect } from "react"; import CreateNewAppFromTemplatesModal from "."; +import { getIsReconnectingDatasourcesModalOpen } from "@appsmith/selectors/entitiesSelector"; +import { useSelector } from "react-redux"; interface Props { currentWorkspaceId: string; @@ -12,6 +14,16 @@ const CreateNewAppFromTemplatesWrapper = ({ isOpen, onModalClose, }: Props) => { + const isReconnectingModalOpen = useSelector( + getIsReconnectingDatasourcesModalOpen, + ); + + useEffect(() => { + if (isReconnectingModalOpen) { + onModalClose(); + } + }, [isReconnectingModalOpen]); + return (