## Description This PR aims to achieve 2 things 1. Make route building independent of explicitly passing `pageId` as param when the route is generated against the current page navigation. 2. Add extensible points to extend basePath generation in EE. THIS PR DOES NOT CHANGE ROUTE GENERATION. Changes: In `app/client/src/ce/entities/URLRedirect/URLAssembly.ts` 1. Moves the logic of `generateBasePath` way to specific method called `generateBasePathForApps` and the generateBasePath is available to extend and switch between a different base path generation logic in EE. 2. Adds a new member variable called `currentPageId`. This `currentPageId` would help generating basePath without explicitly passing `pageId` to the build method. If a `pageId` is passed it would be overridden in the `resolveEntityId` logic. 3. Added `resolveEntityId` method to resolve the entity (pageId) based on the params passed and the `currentPageId`. This method also acts as an extension point for extending the logic to any other resolution logic similar to `generateBasePath` In `app/client/src/pages/AppViewer/index.tsx` and `app/client/src/pages/Editor/index.tsx` The `currentPageId` is set using the `urlBuilder.setCurrentPageId` when the component mounts or page changes and unset when the component unmounts. #### PR fixes following issue(s) Fixes #27840 #### 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 - Chore (housekeeping or task changes that don't impact user perception) ## 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 - [x] 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 - [x] 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
111 lines
3.6 KiB
TypeScript
111 lines
3.6 KiB
TypeScript
import { all, put, select, takeEvery } from "redux-saga/effects";
|
|
import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
|
|
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
|
|
import history from "utils/history";
|
|
import {
|
|
getGenerateCRUDEnabledPluginMap,
|
|
getPlugin,
|
|
} from "@appsmith/selectors/entitiesSelector";
|
|
import type { Action } from "entities/Action";
|
|
import { PluginType } from "entities/Action";
|
|
import type { GenerateCRUDEnabledPluginMap, Plugin } from "api/PluginApi";
|
|
import {
|
|
generateTemplateFormURL,
|
|
saasEditorApiIdURL,
|
|
saasEditorDatasourceIdURL,
|
|
} from "@appsmith/RouteBuilder";
|
|
import { getCurrentPageId } from "selectors/editorSelectors";
|
|
import type { CreateDatasourceSuccessAction } from "actions/datasourceActions";
|
|
import { getQueryParams } from "utils/URLUtils";
|
|
import { getIsGeneratePageInitiator } from "utils/GenerateCrudUtil";
|
|
import { DATASOURCE_SAAS_FORM } from "@appsmith/constants/forms";
|
|
import { initialize } from "redux-form";
|
|
import { omit } from "lodash";
|
|
|
|
function* handleDatasourceCreatedSaga(
|
|
actionPayload: CreateDatasourceSuccessAction,
|
|
) {
|
|
const { isDBCreated, payload } = actionPayload;
|
|
const plugin: Plugin | undefined = yield select(getPlugin, payload.pluginId);
|
|
const pageId: string = yield select(getCurrentPageId);
|
|
// Only look at SAAS plugins
|
|
if (!plugin) return;
|
|
if (plugin.type !== PluginType.SAAS) return;
|
|
|
|
yield put(initialize(DATASOURCE_SAAS_FORM, omit(payload, "name")));
|
|
|
|
const queryParams = getQueryParams();
|
|
const updatedDatasource = payload;
|
|
|
|
const isGeneratePageInitiator = getIsGeneratePageInitiator(
|
|
queryParams.isGeneratePageMode,
|
|
);
|
|
const generateCRUDSupportedPlugin: GenerateCRUDEnabledPluginMap =
|
|
yield select(getGenerateCRUDEnabledPluginMap);
|
|
|
|
// isGeneratePageInitiator ensures that datasource is being created from generate page with data
|
|
// then we check if the current plugin is supported for generate page with data functionality
|
|
// and finally isDBCreated ensures that datasource is not in temporary state and
|
|
// user has explicitly saved the datasource, before redirecting back to generate page
|
|
if (
|
|
isGeneratePageInitiator &&
|
|
updatedDatasource.pluginId &&
|
|
generateCRUDSupportedPlugin[updatedDatasource.pluginId] &&
|
|
isDBCreated
|
|
) {
|
|
history.push(
|
|
generateTemplateFormURL({
|
|
pageId,
|
|
params: {
|
|
datasourceId: updatedDatasource.id,
|
|
},
|
|
}),
|
|
);
|
|
} else {
|
|
history.push(
|
|
saasEditorDatasourceIdURL({
|
|
pageId,
|
|
pluginPackageName: plugin.packageName,
|
|
datasourceId: payload.id,
|
|
params: {
|
|
from: "datasources",
|
|
pluginId: plugin?.id,
|
|
viewMode: "false",
|
|
},
|
|
}),
|
|
);
|
|
}
|
|
}
|
|
|
|
function* handleActionCreatedSaga(actionPayload: ReduxAction<Action>) {
|
|
const { id, pluginId } = actionPayload.payload;
|
|
const plugin: Plugin | undefined = yield select(getPlugin, pluginId);
|
|
const pageId: string = yield select(getCurrentPageId);
|
|
|
|
if (!plugin) return;
|
|
if (plugin.type !== "SAAS") return;
|
|
history.push(
|
|
saasEditorApiIdURL({
|
|
pageId,
|
|
pluginPackageName: plugin.packageName,
|
|
apiId: id,
|
|
params: {
|
|
editName: "true",
|
|
from: "datasources",
|
|
},
|
|
}),
|
|
);
|
|
}
|
|
|
|
// since we are re-using the query editor form names for SAAS actions, all formValueChanges will be handled in the QuerypaneSagas.
|
|
|
|
export default function* root() {
|
|
yield all([
|
|
takeEvery(
|
|
ReduxActionTypes.CREATE_DATASOURCE_SUCCESS,
|
|
handleDatasourceCreatedSaga,
|
|
),
|
|
takeEvery(ReduxActionTypes.CREATE_ACTION_SUCCESS, handleActionCreatedSaga),
|
|
]);
|
|
}
|