## Description Added ESLint rule to force blank lines between statements. Fixes #`Issue Number` _or_ Fixes `Issue URL` > [!WARNING] > _If no issue exists, please create an issue first, and check with the maintainers if the issue is valid._ ## Automation /ok-to-test tags="@tag.All" ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!CAUTION] > 🔴 🔴 🔴 Some tests have failed. > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/10924926728> > Commit: 34f57714a1575ee04e94e03cbcaf95e57a96c86c > <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=10924926728&attempt=1&selectiontype=test&testsstatus=failed&specsstatus=fail" target="_blank">Cypress dashboard</a>. > Tags: @tag.All > Spec: > The following are new failures, please fix them before merging the PR: <ol> > <li>cypress/e2e/Regression/ClientSide/Anvil/AnvilModal_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCheckboxGroupWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCurrencyInputWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilIconButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilInlineButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilInputWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilParagraphWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilPhoneInputWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilStatsWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilSwitchGroupWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilSwitchWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilTableWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilToolbarButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilZoneSectionWidgetSnapshot_spec.ts</ol> > <a href="https://internal.appsmith.com/app/cypress-dashboard/identified-flaky-tests-65890b3c81d7400d08fa9ee3?branch=master" target="_blank">List of identified flaky tests</a>. > <hr>Wed, 18 Sep 2024 16:33:36 UTC <!-- end of auto-generated comment: Cypress test results --> ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [ ] No --------- Co-authored-by: Valera Melnikov <valera@appsmith.com>
200 lines
5.9 KiB
TypeScript
200 lines
5.9 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 { getJSTabs, getQueryTabs } from "selectors/ideSelectors";
|
|
import {
|
|
setIdeEditorViewMode,
|
|
setJSTabs,
|
|
setQueryTabs,
|
|
} from "actions/ideActions";
|
|
import history from "../utils/history";
|
|
import {
|
|
jsCollectionAddURL,
|
|
jsCollectionListURL,
|
|
queryAddURL,
|
|
queryListURL,
|
|
} from "ee/RouteBuilder";
|
|
import type { EntityItem } from "ee/entities/IDE/constants";
|
|
import { getQueryEntityItemUrl } from "ee/pages/Editor/IDE/EditorPane/Query/utils";
|
|
import { getJSEntityItemUrl } from "ee/pages/Editor/IDE/EditorPane/JS/utils";
|
|
import log from "loglevel";
|
|
import type { ReduxAction } from "ee/constants/ReduxActionConstants";
|
|
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
|
|
import type { EditorViewMode } from "ee/entities/IDE/constants";
|
|
import { retrieveIDEViewMode, storeIDEViewMode } from "utils/storage";
|
|
import {
|
|
selectJSSegmentEditorTabs,
|
|
selectQuerySegmentEditorTabs,
|
|
} from "ee/selectors/appIDESelectors";
|
|
import { getCurrentBasePageId } from "selectors/editorSelectors";
|
|
|
|
export function* updateIDETabsOnRouteChangeSaga(entityInfo: FocusEntityInfo) {
|
|
const { entity, id, params } = entityInfo;
|
|
|
|
if (!params.basePageId) return;
|
|
|
|
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, params.basePageId));
|
|
}
|
|
|
|
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, params.basePageId));
|
|
}
|
|
}
|
|
|
|
function* getUpdatedTabs(newId: string, currentTabs: string[]) {
|
|
if (currentTabs.includes(newId)) return currentTabs;
|
|
|
|
const newTabs = [...currentTabs, newId];
|
|
|
|
return newTabs;
|
|
}
|
|
|
|
export function* handleJSEntityRedirect(deletedId: string) {
|
|
const basePageId: string = yield select(getCurrentBasePageId);
|
|
const jsTabs: EntityItem[] = yield select(selectJSSegmentEditorTabs);
|
|
const redirectAction = getNextEntityAfterRemove(deletedId, jsTabs);
|
|
|
|
switch (redirectAction.action) {
|
|
case RedirectAction.LIST:
|
|
history.push(jsCollectionListURL({ basePageId }));
|
|
break;
|
|
case RedirectAction.ITEM:
|
|
if (!redirectAction.payload) {
|
|
log.error("Redirect item does not have a payload");
|
|
history.push(jsCollectionAddURL({ basePageId }));
|
|
break;
|
|
}
|
|
|
|
const { payload } = redirectAction;
|
|
|
|
history.push(getJSEntityItemUrl(payload, basePageId));
|
|
break;
|
|
}
|
|
}
|
|
|
|
export function* handleQueryEntityRedirect(deletedId: string) {
|
|
const basePageId: string = yield select(getCurrentBasePageId);
|
|
const queryTabs: EntityItem[] = yield select(selectQuerySegmentEditorTabs);
|
|
const redirectAction = getNextEntityAfterRemove(deletedId, queryTabs);
|
|
|
|
switch (redirectAction.action) {
|
|
case RedirectAction.LIST:
|
|
history.push(queryListURL({ basePageId }));
|
|
break;
|
|
case RedirectAction.ITEM:
|
|
if (!redirectAction.payload) {
|
|
history.push(queryAddURL({ basePageId }));
|
|
log.error("Redirect item does not have a payload");
|
|
break;
|
|
}
|
|
|
|
const { payload } = redirectAction;
|
|
|
|
history.push(getQueryEntityItemUrl(payload, basePageId));
|
|
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 getNextEntityAfterRemove(
|
|
removedId: string,
|
|
tabs: EntityItem[],
|
|
): RedirectActionDescription {
|
|
const currentSelectedEntity = identifyEntityFromPath(
|
|
window.location.pathname,
|
|
);
|
|
const isSelectedActionRemoved = currentSelectedEntity.id === removedId;
|
|
|
|
// If removed item is not currently selected, don't redirect
|
|
if (!isSelectedActionRemoved) {
|
|
return {
|
|
action: RedirectAction.NA,
|
|
};
|
|
}
|
|
|
|
const indexOfTab = tabs.findIndex((item) => item.key === removedId);
|
|
|
|
switch (indexOfTab) {
|
|
case -1:
|
|
// If no other action is remaining, navigate to the creation url
|
|
return {
|
|
action: RedirectAction.LIST,
|
|
};
|
|
case 0:
|
|
// if the removed item is first item, then if tabs present, tabs + 1
|
|
// else otherItems[0] -> TODO: consider changing this logic after discussion with
|
|
// design team. May be new listing UI for side by side
|
|
if (tabs.length > 1) {
|
|
return {
|
|
action: RedirectAction.ITEM,
|
|
payload: tabs[1],
|
|
};
|
|
} else {
|
|
return {
|
|
action: RedirectAction.LIST,
|
|
};
|
|
}
|
|
default:
|
|
return {
|
|
action: RedirectAction.ITEM,
|
|
payload: tabs[indexOfTab - 1],
|
|
};
|
|
}
|
|
}
|
|
|
|
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,
|
|
),
|
|
]);
|
|
}
|