## Description This PR changes the add button placement to RHS in IDE tabs. Fixes #32438 ## Automation /ok-to-test tags="@tag.IDE, @tag.Sanity" ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!IMPORTANT] > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/8595616324> > Commit: `fc1ec96d29b2d1664892c24dd25ccaced1e07c86` > Cypress dashboard url: <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=8595616324&attempt=2" target="_blank">Click here!</a> > All cypress tests have passed 🎉🎉🎉 <!-- end of auto-generated comment: Cypress test results -->
202 lines
6.3 KiB
TypeScript
202 lines
6.3 KiB
TypeScript
import type { FocusEntityInfo } from "navigation/FocusEntity";
|
|
import { FocusEntity, identifyEntityFromPath } from "navigation/FocusEntity";
|
|
import { all, call, put, select, takeEvery } from "redux-saga/effects";
|
|
import {
|
|
getIsTabsRevampEnabled,
|
|
getJSTabs,
|
|
getQueryTabs,
|
|
} from "selectors/ideSelectors";
|
|
import {
|
|
setIdeEditorViewMode,
|
|
setJSTabs,
|
|
setQueryTabs,
|
|
} from "actions/ideActions";
|
|
import history from "../utils/history";
|
|
import {
|
|
jsCollectionAddURL,
|
|
jsCollectionListURL,
|
|
queryAddURL,
|
|
queryListURL,
|
|
} from "@appsmith/RouteBuilder";
|
|
import type { EditorSegmentList } from "@appsmith/selectors/appIDESelectors";
|
|
import { groupAndSortEntitySegmentList } from "@appsmith/selectors/appIDESelectors";
|
|
import type { EntityItem } from "@appsmith/entities/IDE/constants";
|
|
import {
|
|
getCurrentPageId,
|
|
getJSSegmentItems,
|
|
getQuerySegmentItems,
|
|
} from "@appsmith/selectors/entitiesSelector";
|
|
import { getQueryEntityItemUrl } from "@appsmith/pages/Editor/IDE/EditorPane/Query/utils";
|
|
import { getJSEntityItemUrl } from "@appsmith/pages/Editor/IDE/EditorPane/JS/utils";
|
|
import log from "loglevel";
|
|
import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
|
|
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
|
|
import type { EditorViewMode } from "@appsmith/entities/IDE/constants";
|
|
import { retrieveIDEViewMode, storeIDEViewMode } from "utils/storage";
|
|
|
|
export function* updateIDETabsOnRouteChangeSaga(entityInfo: FocusEntityInfo) {
|
|
const { entity, id } = entityInfo;
|
|
if (
|
|
entity === FocusEntity.JS_OBJECT ||
|
|
entity === FocusEntity.JS_MODULE_INSTANCE
|
|
) {
|
|
const jsTabs: string[] = yield select(getJSTabs);
|
|
const newTabs: string[] = yield call(getUpdatedTabs, id, jsTabs);
|
|
yield put(setJSTabs(newTabs));
|
|
}
|
|
if (
|
|
entity === FocusEntity.QUERY ||
|
|
entity === FocusEntity.QUERY_MODULE_INSTANCE
|
|
) {
|
|
const queryTabs: string[] = yield select(getQueryTabs);
|
|
const newTabs: string[] = yield call(getUpdatedTabs, id, queryTabs);
|
|
yield put(setQueryTabs(newTabs));
|
|
}
|
|
}
|
|
|
|
function* getUpdatedTabs(newId: string, currentTabs: string[]) {
|
|
if (currentTabs.includes(newId)) return currentTabs;
|
|
const isTabsRevampEnabled: boolean = yield select(getIsTabsRevampEnabled);
|
|
let newTabs = isTabsRevampEnabled
|
|
? [...currentTabs, newId]
|
|
: [newId, ...currentTabs];
|
|
if (newTabs.length > 5) {
|
|
// take last 5 since new tab gets added to the end of the array
|
|
newTabs = newTabs.slice(-5);
|
|
}
|
|
return newTabs;
|
|
}
|
|
|
|
export function* handleJSEntityRedirect(deletedId: string) {
|
|
const pageId: string = yield select(getCurrentPageId);
|
|
const allJsItems: EntityItem[] = yield select(getJSSegmentItems);
|
|
const redirectAction = getNextEntityAfterDelete(deletedId, allJsItems);
|
|
switch (redirectAction.action) {
|
|
case RedirectAction.LIST:
|
|
history.push(jsCollectionListURL({ pageId }));
|
|
break;
|
|
case RedirectAction.ITEM:
|
|
if (!redirectAction.payload) {
|
|
log.error("Redirect item does not have a payload");
|
|
history.push(jsCollectionAddURL({ pageId }));
|
|
break;
|
|
}
|
|
const { payload } = redirectAction;
|
|
history.push(getJSEntityItemUrl(payload, pageId));
|
|
break;
|
|
}
|
|
}
|
|
|
|
export function* handleQueryEntityRedirect(deletedId: string) {
|
|
const pageId: string = yield select(getCurrentPageId);
|
|
const allQueryItems: EntityItem[] = yield select(getQuerySegmentItems);
|
|
const redirectAction = getNextEntityAfterDelete(deletedId, allQueryItems);
|
|
switch (redirectAction.action) {
|
|
case RedirectAction.LIST:
|
|
history.push(queryListURL({ pageId }));
|
|
break;
|
|
case RedirectAction.ITEM:
|
|
if (!redirectAction.payload) {
|
|
history.push(queryAddURL({ pageId }));
|
|
log.error("Redirect item does not have a payload");
|
|
break;
|
|
}
|
|
const { payload } = redirectAction;
|
|
history.push(getQueryEntityItemUrl(payload, pageId));
|
|
break;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Adds custom redirect logic to redirect after an item is deleted
|
|
* 1. Do not navigate if the deleted item is not selected
|
|
* 2. If it was the only item, navigate to the list url, to show the blank state
|
|
* 3. If there are other items, navigate to an item close to the current one
|
|
* **/
|
|
|
|
export enum RedirectAction {
|
|
NA = "NA", // No action is needed
|
|
LIST = "LIST", // Navigate to a creation URL
|
|
ITEM = "ITEM", // Navigate to this item
|
|
}
|
|
interface RedirectActionDescription {
|
|
action: RedirectAction;
|
|
payload?: EntityItem;
|
|
}
|
|
|
|
export function getNextEntityAfterDelete(
|
|
deletedId: string,
|
|
allItems: EntityItem[],
|
|
): RedirectActionDescription {
|
|
const currentSelectedEntity = identifyEntityFromPath(
|
|
window.location.pathname,
|
|
);
|
|
const isSelectedActionDeleted = currentSelectedEntity.id === deletedId;
|
|
|
|
// If deleted item is not currently selected, don't redirect
|
|
if (!isSelectedActionDeleted) {
|
|
return {
|
|
action: RedirectAction.NA,
|
|
};
|
|
}
|
|
|
|
const otherItems = allItems.filter((a) => deletedId !== a.key);
|
|
// If no other action is remaining, navigate to the creation url
|
|
if (otherItems.length === 0) {
|
|
return {
|
|
action: RedirectAction.LIST,
|
|
};
|
|
}
|
|
|
|
// Check if another action is present in the group and redirect to it, or else
|
|
// navigate to tht top of the list
|
|
const currentSortedList: EditorSegmentList =
|
|
groupAndSortEntitySegmentList(allItems);
|
|
|
|
let remainingGroupEntities: EntityItem[] = [];
|
|
for (const { items } of currentSortedList) {
|
|
if (items.find((a) => a.key === deletedId)) {
|
|
remainingGroupEntities = items.filter((a) => a.key !== deletedId);
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (remainingGroupEntities.length === 0) {
|
|
return {
|
|
action: RedirectAction.ITEM,
|
|
payload: otherItems[0],
|
|
};
|
|
} else {
|
|
return {
|
|
action: RedirectAction.ITEM,
|
|
payload: remainingGroupEntities[0],
|
|
};
|
|
}
|
|
}
|
|
|
|
function* storeIDEViewChangeSaga(
|
|
action: ReduxAction<{ view: EditorViewMode }>,
|
|
) {
|
|
yield call(storeIDEViewMode, action.payload.view);
|
|
}
|
|
|
|
function* restoreIDEViewModeSaga() {
|
|
const storedState: EditorViewMode = yield call(retrieveIDEViewMode);
|
|
if (storedState) {
|
|
yield put(setIdeEditorViewMode(storedState));
|
|
}
|
|
}
|
|
|
|
export default function* root() {
|
|
yield all([
|
|
takeEvery(
|
|
ReduxActionTypes.SET_IDE_EDITOR_VIEW_MODE,
|
|
storeIDEViewChangeSaga,
|
|
),
|
|
takeEvery(
|
|
ReduxActionTypes.RESTORE_IDE_EDITOR_VIEW_MODE,
|
|
restoreIDEViewModeSaga,
|
|
),
|
|
]);
|
|
}
|