From e8b101baa3cd5b1cc59d1de741e779dec50e4305 Mon Sep 17 00:00:00 2001 From: sneha122 Date: Thu, 7 Dec 2023 16:12:22 +0530 Subject: [PATCH] feat: rest, graphql and curl fixed for onboarding (#29377) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description This PR adds: - functionality to REST, GraphQL and Curl import options when using these during onboarding start with data flow. On clicking on any of these options would take us inside application. #### PR fixes following issue(s) Fixes #29303 #### 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 - New feature (non-breaking change which adds functionality) > > > ## 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 - [x] 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 - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [x] 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 - **Enhancements** - Improved the onboarding process by integrating new application and page identification logic within the data source creation workflow. - **Refactor** - Updated state management to enhance the user experience during the onboarding phase. --------- Co-authored-by: “sneha122” <“sneha@appsmith.com”> --- .../IntegrationEditor/CreateNewDatasourceTab.tsx | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx b/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx index 92e394ca9d..75fb54572f 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx @@ -35,6 +35,10 @@ import { SAMPLE_DATASOURCES, } from "@appsmith/constants/messages"; import { Divider } from "design-system"; +import { + getApplicationByIdFromWorkspaces, + getCurrentApplicationIdForCreateNewApp, +} from "@appsmith/selectors/applicationSelectors"; const NewIntegrationsContainer = styled.div` ${thinScrollbar}; @@ -312,7 +316,14 @@ class CreateNewDatasourceTab extends React.Component< } const mapStateToProps = (state: AppState) => { - const pageId = getCurrentPageId(state); + const onboardingAppId = getCurrentApplicationIdForCreateNewApp(state); + const onboardingApplication = getApplicationByIdFromWorkspaces( + state, + onboardingAppId || "", + ); + const pageId = !!onboardingAppId + ? onboardingApplication?.defaultPageId || "" + : getCurrentPageId(state); const showDebugger = showDebuggerFlag(state); const userWorkspacePermissions = getCurrentAppWorkspace(state).userPermissions ?? [];