diff --git a/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx b/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx index 36a2d43a67..3921123851 100644 --- a/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx +++ b/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx @@ -42,6 +42,7 @@ import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag"; import { ASSETS_CDN_URL } from "constants/ThirdPartyConstants"; import { getAssetUrl } from "@appsmith/utils/airgapHelpers"; +import { fetchPlugins } from "actions/pluginActions"; const SectionWrapper = styled.div` display: flex; @@ -192,7 +193,12 @@ const CreateNewAppsOption = ({ } }; - const onClickStartWithData = () => {}; + const onClickStartWithData = () => { + // fetch plugins information to show list of all plugins + if (isEnabledForStartWithData) { + dispatch(fetchPlugins()); + } + }; const goBackFromTemplate = () => { setUseTemplate(false); diff --git a/app/client/src/ce/sagas/ApplicationSagas.tsx b/app/client/src/ce/sagas/ApplicationSagas.tsx index 23a7ce406c..56691e35de 100644 --- a/app/client/src/ce/sagas/ApplicationSagas.tsx +++ b/app/client/src/ce/sagas/ApplicationSagas.tsx @@ -209,6 +209,14 @@ export function* getAllApplicationSaga() { const response: FetchUsersApplicationsWorkspacesResponse = yield call( ApplicationApi.getAllApplication, ); + const isEnabledForStartWithData: boolean = yield select( + selectFeatureFlagCheck, + FEATURE_FLAG.ab_onboarding_flow_start_with_data_dev_only_enabled, + ); + const isEnabledForCreateNew: boolean = yield select( + selectFeatureFlagCheck, + FEATURE_FLAG.ab_create_new_apps_enabled, + ); const isValidResponse: boolean = yield validateResponse(response); if (isValidResponse) { const workspaceApplication: WorkspaceApplicationObject[] = @@ -233,6 +241,17 @@ export function* getAllApplicationSaga() { type: ReduxActionTypes.FETCH_USER_APPLICATIONS_WORKSPACES_SUCCESS, payload: workspaceApplication, }); + + if ( + isEnabledForStartWithData && + isEnabledForCreateNew && + workspaceApplication.length > 0 + ) { + yield put({ + type: ReduxActionTypes.SET_CURRENT_WORKSPACE, + payload: workspaceApplication[0]?.workspace, + }); + } } if (!isAirgappedInstance) { yield call(fetchReleases);