@@ -80,13 +80,7 @@ import AnalyticsUtil from "utils/AnalyticsUtil";
8080import { createOrganizationSubmitHandler } from "../organization/helpers" ;
8181import UserApi from "api/UserApi" ;
8282import ImportApplicationModal from "./ImportApplicationModal" ;
83- import OnboardingForm from "./OnboardingForm" ;
84- import { getAppsmithConfigs } from "configs" ;
8583import { SIGNUP_SUCCESS_URL } from "constants/routes" ;
86- import {
87- setOnboardingFormInProgress ,
88- getOnboardingFormInProgress ,
89- } from "utils/storage" ;
9084
9185import { getIsSafeRedirectURL } from "utils/helpers" ;
9286
@@ -899,7 +893,6 @@ const getIsFromSignup = () => {
899893 return window . location ?. pathname === SIGNUP_SUCCESS_URL ;
900894} ;
901895
902- const { onboardingFormEnabled } = getAppsmithConfigs ( ) ;
903896class Applications extends Component <
904897 ApplicationProps ,
905898 { selectedOrgId : string ; showOnboardingForm : boolean }
@@ -916,29 +909,12 @@ class Applications extends Component<
916909 componentDidMount ( ) {
917910 PerformanceTracker . stopTracking ( PerformanceTransactionName . LOGIN_CLICK ) ;
918911 PerformanceTracker . stopTracking ( PerformanceTransactionName . SIGN_UP ) ;
919- this . props . getAllApplication ( ) ;
920- window . addEventListener ( "message" , this . handleTypeFormMessage , false ) ;
921- this . showOnboardingForm ( ) ;
922- }
923-
924- componentWillUnmount ( ) {
925- window . removeEventListener ( "message" , this . handleTypeFormMessage ) ;
926- }
927-
928- showOnboardingForm = async ( ) => {
929912 const isFromSignUp = getIsFromSignup ( ) ;
930- const isOnboardingFormInProgress = await getOnboardingFormInProgress ( ) ;
931- const showOnboardingForm =
932- onboardingFormEnabled && ( isFromSignUp || isOnboardingFormInProgress ) ;
933- this . setState ( {
934- showOnboardingForm : ! ! showOnboardingForm ,
935- } ) ;
936-
937- // Redirect directly in case we're not showing the onboarding form
938- if ( isFromSignUp && ! onboardingFormEnabled ) {
913+ if ( isFromSignUp ) {
939914 this . redirectUsingQueryParam ( ) ;
940915 }
941- } ;
916+ this . props . getAllApplication ( ) ;
917+ }
942918
943919 redirectUsingQueryParam = ( ) => {
944920 const urlObject = new URL ( window . location . href ) ;
@@ -954,32 +930,19 @@ class Applications extends Component<
954930 }
955931 } ;
956932
957- handleTypeFormMessage = ( event : any ) => {
958- if ( event ?. data ?. type === "form-submit" && this . state . showOnboardingForm ) {
959- setOnboardingFormInProgress ( ) ;
960- this . redirectUsingQueryParam ( ) ;
961- }
962- } ;
963-
964933 public render ( ) {
965934 return (
966935 < PageWrapper displayName = "Applications" >
967- { this . state . showOnboardingForm ? (
968- < OnboardingForm />
969- ) : (
970- < >
971- < ProductUpdatesModal />
972- < LeftPane />
973- < SubHeader
974- search = { {
975- placeholder : "Search for apps..." ,
976- queryFn : this . props . searchApplications ,
977- defaultValue : this . props . searchKeyword ,
978- } }
979- />
980- < ApplicationsSection searchKeyword = { this . props . searchKeyword } />
981- </ >
982- ) }
936+ < ProductUpdatesModal />
937+ < LeftPane />
938+ < SubHeader
939+ search = { {
940+ placeholder : "Search for apps..." ,
941+ queryFn : this . props . searchApplications ,
942+ defaultValue : this . props . searchKeyword ,
943+ } }
944+ />
945+ < ApplicationsSection searchKeyword = { this . props . searchKeyword } />
983946 </ PageWrapper >
984947 ) ;
985948 }
0 commit comments