## 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
284 lines
8.4 KiB
TypeScript
284 lines
8.4 KiB
TypeScript
import type { FocusState } from "reducers/uiReducers/focusHistoryReducer";
|
|
import type {
|
|
CallEffectDescriptor,
|
|
PutEffectDescriptor,
|
|
SelectEffectDescriptor,
|
|
SimpleEffect,
|
|
} from "redux-saga/effects";
|
|
import { call, put, select, take } from "redux-saga/effects";
|
|
import { getCurrentFocusInfo } from "selectors/focusHistorySelectors";
|
|
import type { FocusEntityInfo } from "navigation/FocusEntity";
|
|
import {
|
|
FocusEntity,
|
|
FocusStoreHierarchy,
|
|
identifyEntityFromPath,
|
|
shouldStoreURLForFocus,
|
|
} from "navigation/FocusEntity";
|
|
import { FocusElementsConfig } from "navigation/FocusElements";
|
|
import { setFocusHistory } from "actions/focusHistoryActions";
|
|
import { builderURL } from "@appsmith/RouteBuilder";
|
|
import type { AppsmithLocationState } from "utils/history";
|
|
import history, { NavigationMethod } from "utils/history";
|
|
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
|
|
import type { Action } from "entities/Action";
|
|
import { getAction, getPlugin } from "@appsmith/selectors/entitiesSelector";
|
|
import type { Plugin } from "api/PluginApi";
|
|
import { getCurrentGitBranch } from "selectors/gitSyncSelectors";
|
|
import { has } from "lodash";
|
|
|
|
export function* contextSwitchingSaga(
|
|
currentPath: string,
|
|
previousPath: string,
|
|
state: AppsmithLocationState,
|
|
) {
|
|
if (previousPath) {
|
|
// store current state
|
|
const storePaths: Array<{
|
|
key: string;
|
|
entityInfo: FocusEntityInfo;
|
|
}> = yield call(getEntitiesForStore, previousPath, currentPath);
|
|
for (const storePath of storePaths) {
|
|
yield call(
|
|
storeStateOfPath,
|
|
storePath.key,
|
|
storePath.entityInfo,
|
|
previousPath,
|
|
);
|
|
}
|
|
}
|
|
yield call(waitForPathLoad, currentPath, previousPath);
|
|
const setPaths: Array<{
|
|
key: string;
|
|
entityInfo: FocusEntityInfo;
|
|
}> = yield call(getEntitiesForSet, previousPath, currentPath, state);
|
|
for (const setPath of setPaths) {
|
|
yield call(setStateOfPath, setPath.key, setPath.entityInfo);
|
|
}
|
|
}
|
|
|
|
function* waitForPathLoad(currentPath: string, previousPath?: string) {
|
|
if (previousPath) {
|
|
const currentFocus = identifyEntityFromPath(currentPath);
|
|
const prevFocus = identifyEntityFromPath(previousPath);
|
|
|
|
if (currentFocus.pageId !== prevFocus.pageId) {
|
|
yield take(ReduxActionTypes.FETCH_PAGE_SUCCESS);
|
|
}
|
|
}
|
|
}
|
|
|
|
type StoreStateOfPathType = Generator<
|
|
| SimpleEffect<"SELECT", SelectEffectDescriptor>
|
|
| SimpleEffect<"CALL", CallEffectDescriptor<void>>
|
|
| SimpleEffect<
|
|
"PUT",
|
|
PutEffectDescriptor<{
|
|
payload: { focusState: FocusState; key: string };
|
|
type: string;
|
|
}>
|
|
>,
|
|
void,
|
|
FocusState | undefined
|
|
>;
|
|
|
|
function* storeStateOfPath(
|
|
key: string,
|
|
entityInfo: FocusEntityInfo,
|
|
fromPath: string,
|
|
): StoreStateOfPathType {
|
|
const selectors = FocusElementsConfig[entityInfo.entity];
|
|
const state: Record<string, any> = {};
|
|
for (const selectorInfo of selectors) {
|
|
state[selectorInfo.name] = yield select(selectorInfo.selector);
|
|
}
|
|
if (entityInfo.entity === FocusEntity.PAGE) {
|
|
if (shouldStoreURLForFocus(fromPath)) {
|
|
if (fromPath) {
|
|
state._routingURL = fromPath;
|
|
}
|
|
}
|
|
}
|
|
yield put(
|
|
setFocusHistory(key, {
|
|
entityInfo,
|
|
state,
|
|
}),
|
|
);
|
|
}
|
|
|
|
function* setStateOfPath(key: string, entityInfo: FocusEntityInfo) {
|
|
const focusHistory: FocusState = yield select(getCurrentFocusInfo, key);
|
|
|
|
const selectors = FocusElementsConfig[entityInfo.entity];
|
|
|
|
if (focusHistory) {
|
|
for (const selectorInfo of selectors) {
|
|
yield put(selectorInfo.setter(focusHistory.state[selectorInfo.name]));
|
|
}
|
|
if (entityInfo.entity === FocusEntity.PAGE) {
|
|
if (focusHistory.state._routingURL) {
|
|
const params = history.location.search;
|
|
history.push(`${focusHistory.state._routingURL}${params ?? ""}`);
|
|
}
|
|
}
|
|
} else {
|
|
const subType: string | undefined = yield call(
|
|
getEntitySubType,
|
|
entityInfo,
|
|
);
|
|
for (const selectorInfo of selectors) {
|
|
const { defaultValue, subTypes } = selectorInfo;
|
|
if (subType && subTypes && subType in subTypes) {
|
|
yield put(selectorInfo.setter(subTypes[subType].defaultValue));
|
|
} else if (defaultValue !== undefined) {
|
|
yield put(selectorInfo.setter(defaultValue));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
function* getEntitySubType(entityInfo: FocusEntityInfo) {
|
|
if ([FocusEntity.API, FocusEntity.QUERY].includes(entityInfo.entity)) {
|
|
const action: Action | undefined = yield select(getAction, entityInfo.id);
|
|
if (action) {
|
|
const plugin: Plugin = yield select(getPlugin, action.pluginId);
|
|
return plugin.packageName;
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method returns boolean to indicate if state should be restored to the path
|
|
* @param prevPath
|
|
* @param currPath
|
|
* @param state
|
|
* @returns
|
|
*/
|
|
function shouldSetState(
|
|
prevPath: string,
|
|
currPath: string,
|
|
state?: AppsmithLocationState,
|
|
) {
|
|
if (
|
|
state &&
|
|
state.invokedBy &&
|
|
[NavigationMethod.CommandClick, NavigationMethod.Omnibar].includes(
|
|
state.invokedBy,
|
|
)
|
|
) {
|
|
// If it is a direct navigation, we will set the state
|
|
return true;
|
|
}
|
|
const prevFocusEntityInfo = identifyEntityFromPath(prevPath);
|
|
const currFocusEntityInfo = identifyEntityFromPath(currPath);
|
|
|
|
// While switching from selected widget state to canvas,
|
|
// it should not be restored stored state for canvas
|
|
return !(
|
|
prevFocusEntityInfo.entity === FocusEntity.PROPERTY_PANE &&
|
|
currFocusEntityInfo.entity === FocusEntity.CANVAS &&
|
|
prevFocusEntityInfo.pageId === currFocusEntityInfo.pageId
|
|
);
|
|
}
|
|
|
|
const getEntityParentUrl = (
|
|
entityInfo: FocusEntityInfo,
|
|
parentEntity: FocusEntity,
|
|
): string => {
|
|
if (parentEntity === FocusEntity.CANVAS) {
|
|
const canvasUrl = builderURL({ pageId: entityInfo.pageId ?? "" });
|
|
return canvasUrl.split("?")[0];
|
|
}
|
|
return "";
|
|
};
|
|
|
|
const isPageChange = (prevPath: string, currentPath: string) => {
|
|
const prevFocusEntityInfo = identifyEntityFromPath(prevPath);
|
|
const currFocusEntityInfo = identifyEntityFromPath(currentPath);
|
|
if (prevFocusEntityInfo.pageId === "" || currFocusEntityInfo.pageId === "") {
|
|
return false;
|
|
}
|
|
return prevFocusEntityInfo.pageId !== currFocusEntityInfo.pageId;
|
|
};
|
|
|
|
function* getEntitiesForStore(previousPath: string, currentPath: string) {
|
|
const branch: string | undefined = yield select(getCurrentGitBranch);
|
|
const entities: Array<{ entityInfo: FocusEntityInfo; key: string }> = [];
|
|
const prevFocusEntityInfo = identifyEntityFromPath(previousPath);
|
|
if (isPageChange(previousPath, currentPath)) {
|
|
if (prevFocusEntityInfo.pageId) {
|
|
entities.push({
|
|
key: `${prevFocusEntityInfo.pageId}#${branch}`,
|
|
entityInfo: {
|
|
entity: FocusEntity.PAGE,
|
|
id: prevFocusEntityInfo.pageId,
|
|
},
|
|
});
|
|
}
|
|
}
|
|
|
|
if (prevFocusEntityInfo.entity in FocusStoreHierarchy) {
|
|
const parentEntity = FocusStoreHierarchy[prevFocusEntityInfo.entity];
|
|
if (parentEntity) {
|
|
const parentPath = getEntityParentUrl(prevFocusEntityInfo, parentEntity);
|
|
entities.push({
|
|
entityInfo: {
|
|
entity: parentEntity,
|
|
id: "",
|
|
pageId: prevFocusEntityInfo.pageId,
|
|
},
|
|
key: `${parentPath}#${branch}`,
|
|
});
|
|
}
|
|
}
|
|
|
|
entities.push({
|
|
entityInfo: prevFocusEntityInfo,
|
|
key: `${previousPath}#${branch}`,
|
|
});
|
|
|
|
return entities.filter(
|
|
(entity) => entity.entityInfo.entity !== FocusEntity.NONE,
|
|
);
|
|
}
|
|
|
|
function* getEntitiesForSet(
|
|
previousPath: string,
|
|
currentPath: string,
|
|
state: AppsmithLocationState,
|
|
) {
|
|
if (!shouldSetState(previousPath, currentPath, state)) {
|
|
return [];
|
|
}
|
|
const branch: string | undefined = yield select(getCurrentGitBranch);
|
|
const entities: Array<{ entityInfo: FocusEntityInfo; key: string }> = [];
|
|
const currentEntityInfo = identifyEntityFromPath(currentPath);
|
|
if (isPageChange(previousPath, currentPath)) {
|
|
if (currentEntityInfo.pageId) {
|
|
entities.push({
|
|
key: `${currentEntityInfo.pageId}#${branch}`,
|
|
entityInfo: {
|
|
entity: FocusEntity.PAGE,
|
|
id: currentEntityInfo.pageId,
|
|
},
|
|
});
|
|
|
|
const focusHistory: FocusState = yield select(
|
|
getCurrentFocusInfo,
|
|
`${currentEntityInfo.pageId}#${branch}`,
|
|
);
|
|
if (has(focusHistory, "state._routingURL")) {
|
|
return entities;
|
|
}
|
|
}
|
|
}
|
|
|
|
entities.push({
|
|
entityInfo: currentEntityInfo,
|
|
key: `${currentPath}#${branch}`,
|
|
});
|
|
return entities.filter(
|
|
(entity) => entity.entityInfo.entity !== FocusEntity.NONE,
|
|
);
|
|
}
|