As part of updating the IDE IA Redesign, we are splitting certain functionalities so that they can be extended on the EE side. Summary of changes: - Create a `WithAddView` interface in RouteBuilder to indicate a scenario where the url can be suffixed with a `/add` to have edit and add views together - Create a common GroupedList component - Adds a dummy JS Add screen and routes. Wont navigate to it via the system - Move `EntityItem` interface to a more common location for extensibility - Update FocusElement config type to allow for a limited targeting in FocusStrategy - Extracted out ListItem render components for JS and Query - Moved JS and Query segment hooks to a CE location for extensibility of AddQuery and ListQuery - Extracted EditorPaneRoutes for extensibility - Added FocusEntity entries for QueryModuleInstance and JSModuleInstance. This will be cleaned up at a later date. Companion EE PR: https://github.com/appsmithorg/appsmith-ee/pull/3389 Fixes: #30544 <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Introduced an interface for adding views to enhance URL generation for different editor functions. - Added new user-facing messages for creating blank JavaScript objects in the editor. - Implemented new hooks and components to manage and render JavaScript and Query entities within the IDE. - Created a grouped list component for categorizing items within the editor pane. - **Enhancements** - Extended existing enums and utilities to support new module instance types and actions. - Improved navigation and focus management within the IDE based on user interaction and context. - Streamlined the process of adding JavaScript operations and queries in the editor. - **Refactor** - Updated import paths for better code organization and module resolution. - Removed redundant code and replaced components with more efficient implementations. - **Bug Fixes** - Corrected the behavior of the `Files` component to handle undefined types appropriately. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
226 lines
7.5 KiB
TypeScript
226 lines
7.5 KiB
TypeScript
import type { FocusState } from "reducers/uiReducers/focusHistoryReducer";
|
|
import type { StrictEffect } from "redux-saga/effects";
|
|
import { call, put, select } from "redux-saga/effects";
|
|
import { getCurrentFocusInfo } from "selectors/focusHistorySelectors";
|
|
import type { FocusEntityInfo } from "navigation/FocusEntity";
|
|
import {
|
|
FocusEntity,
|
|
FocusStoreHierarchy,
|
|
identifyEntityFromPath,
|
|
} from "navigation/FocusEntity";
|
|
import type { FocusElementConfig } from "navigation/FocusElements";
|
|
import { FocusElementConfigType } from "navigation/FocusElements";
|
|
import {
|
|
removeFocusHistory,
|
|
storeFocusHistory,
|
|
} from "actions/focusHistoryActions";
|
|
import type { AppsmithLocationState } from "utils/history";
|
|
import type { ReduxAction } 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 { getIDETypeByUrl } from "@appsmith/entities/IDE/utils";
|
|
import { getIDEFocusStrategy } from "@appsmith/navigation/FocusStrategy";
|
|
import { IDE_TYPE } from "@appsmith/entities/IDE/constants";
|
|
|
|
export interface FocusPath {
|
|
key: string;
|
|
entityInfo: FocusEntityInfo;
|
|
}
|
|
|
|
export type FocusElementsConfigList = {
|
|
[key in FocusEntity]?: FocusElementConfig[];
|
|
};
|
|
|
|
export interface FocusStrategy {
|
|
focusElements: FocusElementsConfigList;
|
|
/** based on the route change, what states need to be set in the upcoming route **/
|
|
getEntitiesForSet: (
|
|
previousPath: string,
|
|
currentPath: string,
|
|
state: AppsmithLocationState,
|
|
) => Generator<any, Array<FocusPath>, any>;
|
|
/** based on the route change, what states need to be stored for the previous route **/
|
|
getEntitiesForStore: (path: string) => Generator<any, Array<FocusPath>, any>;
|
|
/** For entities with hierarchy, return the parent entity path for storing its state **/
|
|
getEntityParentUrl: (
|
|
entityInfo: FocusEntityInfo,
|
|
parentEntity: FocusEntity,
|
|
) => string;
|
|
/** Define a wait (saga) before we start setting states **/
|
|
waitForPathLoad: (
|
|
currentPath: string,
|
|
previousPath: string,
|
|
) => Generator<any, void, any>;
|
|
}
|
|
|
|
/**
|
|
* Context switching works by restoring the states of ui elements to as they were
|
|
* the last time the user was on a particular URL.
|
|
*
|
|
* To do this, there are two simple steps
|
|
* 1. When leaving an url, store the ui or url states
|
|
* 2. When entering an url, restore stored ui or url states, or defaults
|
|
*
|
|
* @param currentPath
|
|
* @param previousPath
|
|
* @param state
|
|
*/
|
|
class FocusRetention {
|
|
private focusStrategy: FocusStrategy;
|
|
|
|
constructor() {
|
|
this.focusStrategy = getIDEFocusStrategy(IDE_TYPE.None);
|
|
this.updateFocusStrategy = this.updateFocusStrategy.bind(this);
|
|
this.storeStateOfPath = this.storeStateOfPath.bind(this);
|
|
this.setStateOfPath = this.setStateOfPath.bind(this);
|
|
this.getState = this.getState.bind(this);
|
|
this.setState = this.setState.bind(this);
|
|
}
|
|
|
|
public *onRouteChange(
|
|
currentPath: string,
|
|
previousPath: string,
|
|
state: AppsmithLocationState,
|
|
) {
|
|
this.updateFocusStrategy(currentPath);
|
|
/* STORE THE UI STATE OF PREVIOUS URL */
|
|
if (previousPath) {
|
|
const toStore: Array<FocusPath> = yield call(
|
|
this.focusStrategy.getEntitiesForStore,
|
|
previousPath,
|
|
);
|
|
for (const storePath of toStore) {
|
|
yield call(this.storeStateOfPath, storePath, previousPath);
|
|
}
|
|
}
|
|
/* RESTORE THE UI STATE OF THE NEW URL */
|
|
yield call(this.focusStrategy.waitForPathLoad, currentPath, previousPath);
|
|
const setPaths: Array<FocusPath> = yield call(
|
|
this.focusStrategy.getEntitiesForSet,
|
|
previousPath,
|
|
currentPath,
|
|
state,
|
|
);
|
|
for (const setPath of setPaths) {
|
|
yield call(this.setStateOfPath, setPath.key, setPath.entityInfo);
|
|
}
|
|
}
|
|
|
|
public *handleRemoveFocusHistory(action: ReduxAction<{ url: string }>) {
|
|
const { url } = action.payload;
|
|
const branch: string | undefined = yield select(getCurrentGitBranch);
|
|
const removeKeys: string[] = [];
|
|
const entity = identifyEntityFromPath(url);
|
|
removeKeys.push(`${url}#${branch}`);
|
|
const parentElement = FocusStoreHierarchy[entity.entity];
|
|
if (parentElement) {
|
|
const parentPath = this.focusStrategy.getEntityParentUrl(
|
|
entity,
|
|
parentElement,
|
|
);
|
|
removeKeys.push(`${parentPath}#${branch}`);
|
|
}
|
|
for (const key of removeKeys) {
|
|
yield put(removeFocusHistory(key));
|
|
}
|
|
}
|
|
|
|
private updateFocusStrategy(currentPath: string) {
|
|
const ideType = getIDETypeByUrl(currentPath);
|
|
this.focusStrategy = getIDEFocusStrategy(ideType);
|
|
}
|
|
|
|
protected *storeStateOfPath(
|
|
focusPath: FocusPath,
|
|
fromPath: string,
|
|
): Generator<StrictEffect, void, FocusState | undefined> {
|
|
const selectors =
|
|
this.focusStrategy.focusElements[focusPath.entityInfo.entity];
|
|
if (!selectors) return;
|
|
const state: Record<string, any> = {};
|
|
for (const selectorInfo of selectors) {
|
|
state[selectorInfo.name] = yield call(
|
|
this.getState,
|
|
selectorInfo,
|
|
fromPath,
|
|
);
|
|
}
|
|
yield put(
|
|
storeFocusHistory(focusPath.key, {
|
|
entityInfo: focusPath.entityInfo,
|
|
state,
|
|
}),
|
|
);
|
|
}
|
|
|
|
protected *setStateOfPath(key: string, entityInfo: FocusEntityInfo) {
|
|
const focusHistory: FocusState = yield select(getCurrentFocusInfo, key);
|
|
|
|
const selectors = this.focusStrategy.focusElements[entityInfo.entity];
|
|
if (!selectors) return;
|
|
|
|
if (focusHistory) {
|
|
for (const selectorInfo of selectors) {
|
|
yield call(
|
|
this.setState,
|
|
selectorInfo,
|
|
focusHistory.state[selectorInfo.name],
|
|
);
|
|
}
|
|
} else {
|
|
const subType: string | undefined = yield call(
|
|
this.getEntitySubType,
|
|
entityInfo,
|
|
);
|
|
for (const selectorInfo of selectors) {
|
|
const { defaultValue, subTypes } = selectorInfo;
|
|
if (subType && subTypes && subType in subTypes) {
|
|
yield call(
|
|
this.setState,
|
|
selectorInfo,
|
|
subTypes[subType].defaultValue,
|
|
);
|
|
} else if (defaultValue !== undefined) {
|
|
if (typeof defaultValue === "function") {
|
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
// @ts-ignore
|
|
const stateDefaultValue: unknown = yield select(defaultValue);
|
|
yield call(this.setState, selectorInfo, stateDefaultValue);
|
|
} else {
|
|
yield call(this.setState, selectorInfo, defaultValue);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private *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;
|
|
}
|
|
}
|
|
}
|
|
|
|
private *getState(config: FocusElementConfig, previousURL: string): unknown {
|
|
if (config.type === FocusElementConfigType.Redux) {
|
|
return yield select(config.selector);
|
|
} else if (config.type === FocusElementConfigType.URL) {
|
|
return config.selector(previousURL);
|
|
}
|
|
}
|
|
private *setState(config: FocusElementConfig, value: unknown): unknown {
|
|
if (config.type === FocusElementConfigType.Redux) {
|
|
yield put(config.setter(value));
|
|
} else if (config.type === FocusElementConfigType.URL) {
|
|
config.setter(value);
|
|
}
|
|
}
|
|
}
|
|
|
|
export default new FocusRetention();
|