## Description Changes add button in left pane to toggle button. #### PR fixes following issue(s) Fixes https://github.com/appsmithorg/appsmith/issues/31522 #### 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 - Bug fix (non-breaking change which fixes an issue) - New feature (non-breaking change which adds functionality) ## 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 - [ ] Manual - [ ] JUnit - [ ] 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 - [ ] 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 - [ ] 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 <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Improved entity identification in navigation based on URL path and query parameters. - **Refactor** - Updated the editor tabs to use `ToggleButton` for enhanced user interaction. - **Bug Fixes** - Modified logic in hooks for creating a new JS collection to handle segment mode appropriately. - Adjusted URL generation logic in the `useQueryAdd` hook for better functionality. - Enhanced conditions in the `identifyEntityFromPath` function to identify entities based on URL path endings and query ID values. - **Tests** - Updated test setup for the `JS Segment` component to include specific `pathname` for `useLocation` mocking. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
292 lines
7.6 KiB
TypeScript
292 lines
7.6 KiB
TypeScript
import type { match } from "react-router";
|
|
import { matchPath } from "react-router";
|
|
import { ADD_PATH, CURL_IMPORT_PAGE_PATH } from "constants/routes";
|
|
import { TEMP_DATASOURCE_ID } from "constants/Datasource";
|
|
import type { IDEType } from "@appsmith/entities/IDE/constants";
|
|
import { EditorState, EntityPaths } from "@appsmith/entities/IDE/constants";
|
|
import {
|
|
getBaseUrlsForIDEType,
|
|
getIDETypeByUrl,
|
|
} from "@appsmith/entities/IDE/utils";
|
|
import { memoize } from "lodash";
|
|
import { MODULE_TYPE } from "@appsmith/constants/ModuleConstants";
|
|
|
|
export enum FocusEntity {
|
|
API = "API",
|
|
CANVAS = "CANVAS",
|
|
DATASOURCE_LIST = "DATASOURCE_LIST",
|
|
DATASOURCE = "DATASOURCE",
|
|
DEBUGGER = "DEBUGGER",
|
|
QUERY = "QUERY",
|
|
QUERY_LIST = "QUERY_LIST",
|
|
JS_OBJECT = "JS_OBJECT",
|
|
JS_OBJECT_LIST = "JS_OBJECT_LIST",
|
|
PROPERTY_PANE = "PROPERTY_PANE",
|
|
NONE = "NONE",
|
|
APP_STATE = "APP_STATE",
|
|
LIBRARY = "LIBRARY",
|
|
SETTINGS = "SETTINGS",
|
|
WIDGET_LIST = "WIDGET_LIST",
|
|
EDITOR = "EDITOR",
|
|
QUERY_ADD = "QUERY_ADD",
|
|
DATASOURCE_CREATE = "DATASOURCE_CREATE",
|
|
QUERY_MODULE_INSTANCE = "QUERY_MODULE_INSTANCE",
|
|
JS_MODULE_INSTANCE = "JS_MODULE_INSTANCE",
|
|
JS_OBJECT_ADD = "JS_OBJECT_ADD",
|
|
}
|
|
|
|
export const FocusStoreHierarchy: Partial<Record<FocusEntity, FocusEntity>> = {
|
|
[FocusEntity.PROPERTY_PANE]: FocusEntity.WIDGET_LIST,
|
|
[FocusEntity.DATASOURCE]: FocusEntity.DATASOURCE_LIST,
|
|
[FocusEntity.JS_OBJECT]: FocusEntity.JS_OBJECT_LIST,
|
|
[FocusEntity.JS_MODULE_INSTANCE]: FocusEntity.JS_OBJECT_LIST,
|
|
[FocusEntity.QUERY]: FocusEntity.QUERY_LIST,
|
|
[FocusEntity.QUERY_MODULE_INSTANCE]: FocusEntity.QUERY_LIST,
|
|
};
|
|
|
|
export interface FocusEntityInfo {
|
|
entity: FocusEntity;
|
|
id: string;
|
|
appState: EditorState;
|
|
params: MatchEntityFromPath;
|
|
}
|
|
|
|
const getMatchPaths = memoize((type: IDEType): string[] => {
|
|
const basePaths = getBaseUrlsForIDEType(type);
|
|
return EntityPaths.reduce((previousValue, currentValue) => {
|
|
const toAdd = basePaths.map((b) => b + currentValue);
|
|
return previousValue.concat(...toAdd);
|
|
}, [] as string[]).concat(basePaths);
|
|
});
|
|
|
|
export interface MatchEntityFromPath {
|
|
applicationId?: string;
|
|
customSlug?: string;
|
|
applicationSlug?: string;
|
|
packageId?: string;
|
|
moduleId?: string;
|
|
workflowId?: string;
|
|
pageSlug?: string;
|
|
apiId?: string;
|
|
datasourceId?: string;
|
|
pluginPackageName?: string;
|
|
queryId?: string;
|
|
appId?: string;
|
|
pageId?: string;
|
|
collectionId?: string;
|
|
widgetIds?: string;
|
|
selectedTab?: string;
|
|
moduleType?: string;
|
|
moduleInstanceId?: string;
|
|
entity?: string;
|
|
}
|
|
|
|
export function matchEntityFromPath(
|
|
path: string,
|
|
): match<MatchEntityFromPath> | null {
|
|
const ideType = getIDETypeByUrl(path);
|
|
const matchPaths = getMatchPaths(ideType);
|
|
return matchPath(path, {
|
|
path: matchPaths,
|
|
exact: true,
|
|
});
|
|
}
|
|
|
|
const getQueryAddPathObj = (match: match<MatchEntityFromPath>) => {
|
|
return {
|
|
entity: FocusEntity.QUERY_ADD,
|
|
id: "",
|
|
appState: EditorState.EDITOR,
|
|
params: match.params,
|
|
};
|
|
};
|
|
|
|
const getJSAddPathObj = (match: match<MatchEntityFromPath>) => {
|
|
return {
|
|
entity: FocusEntity.JS_OBJECT_ADD,
|
|
id: "",
|
|
appState: EditorState.EDITOR,
|
|
params: match.params,
|
|
};
|
|
};
|
|
|
|
export function identifyEntityFromPath(path: string): FocusEntityInfo {
|
|
const match = matchEntityFromPath(path);
|
|
if (!match) {
|
|
return {
|
|
entity: FocusEntity.NONE,
|
|
id: "",
|
|
appState: EditorState.EDITOR,
|
|
params: {},
|
|
};
|
|
}
|
|
if (match.params.apiId) {
|
|
if (match.params.pluginPackageName) {
|
|
if (match.url.endsWith(ADD_PATH)) {
|
|
return getQueryAddPathObj(match);
|
|
}
|
|
return {
|
|
entity: FocusEntity.QUERY,
|
|
id: match.params.apiId,
|
|
appState: EditorState.EDITOR,
|
|
params: match.params,
|
|
};
|
|
}
|
|
if (match.url.endsWith(ADD_PATH)) {
|
|
return getQueryAddPathObj(match);
|
|
}
|
|
return {
|
|
entity: FocusEntity.QUERY,
|
|
id: match.params.apiId,
|
|
appState: EditorState.EDITOR,
|
|
params: match.params,
|
|
};
|
|
}
|
|
if (match.params.datasourceId) {
|
|
if (match.params.datasourceId == TEMP_DATASOURCE_ID) {
|
|
return {
|
|
entity: FocusEntity.NONE,
|
|
id: match.params.datasourceId,
|
|
appState: EditorState.DATA,
|
|
params: match.params,
|
|
};
|
|
} else {
|
|
return {
|
|
entity: FocusEntity.DATASOURCE,
|
|
id: match.params.datasourceId,
|
|
appState: EditorState.DATA,
|
|
params: match.params,
|
|
};
|
|
}
|
|
}
|
|
if (match.params.selectedTab) {
|
|
return {
|
|
entity: FocusEntity.DATASOURCE_CREATE,
|
|
id: match.params.selectedTab,
|
|
appState: EditorState.DATA,
|
|
params: match.params,
|
|
};
|
|
}
|
|
if (match.params.entity === "datasource") {
|
|
return {
|
|
entity: FocusEntity.DATASOURCE_LIST,
|
|
id: "",
|
|
appState: EditorState.DATA,
|
|
params: match.params,
|
|
};
|
|
}
|
|
if (match.params.queryId) {
|
|
if (match.params.queryId == "add" || match.url.endsWith(ADD_PATH)) {
|
|
return getQueryAddPathObj(match);
|
|
}
|
|
return {
|
|
entity: FocusEntity.QUERY,
|
|
id: match.params.queryId,
|
|
appState: EditorState.EDITOR,
|
|
params: match.params,
|
|
};
|
|
}
|
|
if (match.params.moduleType && match.params.moduleInstanceId) {
|
|
if (match.params.moduleType === MODULE_TYPE.QUERY) {
|
|
if (match.url.endsWith(ADD_PATH)) {
|
|
return getQueryAddPathObj(match);
|
|
}
|
|
return {
|
|
entity: FocusEntity.QUERY_MODULE_INSTANCE,
|
|
id: match.params.moduleInstanceId,
|
|
appState: EditorState.EDITOR,
|
|
params: match.params,
|
|
};
|
|
}
|
|
if (match.params.moduleType === MODULE_TYPE.JS) {
|
|
if (match.url.endsWith(ADD_PATH)) {
|
|
return getJSAddPathObj(match);
|
|
}
|
|
return {
|
|
entity: FocusEntity.JS_MODULE_INSTANCE,
|
|
id: match.params.moduleInstanceId,
|
|
appState: EditorState.EDITOR,
|
|
params: match.params,
|
|
};
|
|
}
|
|
}
|
|
if (match.params.collectionId) {
|
|
if (match.params.collectionId == "add" || match.url.endsWith(ADD_PATH)) {
|
|
return getJSAddPathObj(match);
|
|
}
|
|
return {
|
|
entity: FocusEntity.JS_OBJECT,
|
|
id: match.params.collectionId,
|
|
appState: EditorState.EDITOR,
|
|
params: match.params,
|
|
};
|
|
}
|
|
if (match.params.widgetIds) {
|
|
return {
|
|
entity: FocusEntity.PROPERTY_PANE,
|
|
id: match.params.widgetIds,
|
|
appState: EditorState.EDITOR,
|
|
params: match.params,
|
|
};
|
|
}
|
|
if (match.params.entity === "widgets") {
|
|
return {
|
|
entity: FocusEntity.WIDGET_LIST,
|
|
id: "",
|
|
appState: EditorState.EDITOR,
|
|
params: match.params,
|
|
};
|
|
}
|
|
if (match.params.entity === "queries") {
|
|
return {
|
|
entity: FocusEntity.QUERY_LIST,
|
|
id: "",
|
|
appState: EditorState.EDITOR,
|
|
params: match.params,
|
|
};
|
|
}
|
|
if (match.params.entity === "jsObjects") {
|
|
return {
|
|
entity: FocusEntity.JS_OBJECT_LIST,
|
|
id: "",
|
|
appState: EditorState.EDITOR,
|
|
params: match.params,
|
|
};
|
|
}
|
|
if (match.params.entity) {
|
|
if (match.params.entity === "libraries") {
|
|
return {
|
|
entity: FocusEntity.LIBRARY,
|
|
id: "",
|
|
appState: EditorState.LIBRARIES,
|
|
params: match.params,
|
|
};
|
|
}
|
|
if (match.params.entity === "settings") {
|
|
return {
|
|
entity: FocusEntity.SETTINGS,
|
|
id: "",
|
|
appState: EditorState.SETTINGS,
|
|
params: match.params,
|
|
};
|
|
}
|
|
}
|
|
if (
|
|
match.url.endsWith(CURL_IMPORT_PAGE_PATH) ||
|
|
match.url.endsWith(CURL_IMPORT_PAGE_PATH + ADD_PATH)
|
|
) {
|
|
return {
|
|
entity: FocusEntity.QUERY,
|
|
id: "curl",
|
|
appState: EditorState.EDITOR,
|
|
params: match.params,
|
|
};
|
|
}
|
|
return {
|
|
entity: FocusEntity.CANVAS,
|
|
id: "",
|
|
appState: EditorState.EDITOR,
|
|
params: match.params,
|
|
};
|
|
}
|