diff --git a/app/client/src/layoutSystems/anvil/integrations/selectors.ts b/app/client/src/layoutSystems/anvil/integrations/selectors.ts index 51fa581e4b..87f6249221 100644 --- a/app/client/src/layoutSystems/anvil/integrations/selectors.ts +++ b/app/client/src/layoutSystems/anvil/integrations/selectors.ts @@ -1,6 +1,5 @@ import type { AppState } from "@appsmith/reducers"; import { LayoutComponentTypes, type LayoutProps } from "../utils/anvilTypes"; -import { createSelector } from "reselect"; import { selectFeatureFlagCheck } from "@appsmith/selectors/featureFlagsSelectors"; import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag"; import { LayoutSystemTypes } from "layoutSystems/types"; @@ -10,12 +9,10 @@ export const getIsAnvilLayoutEnabled = (state: AppState) => { return selectFeatureFlagCheck(state, FEATURE_FLAG.release_anvil_enabled); }; -export const getIsAnvilLayout = createSelector( - getLayoutSystemType, - (layoutSystemType) => { - return layoutSystemType === LayoutSystemTypes.ANVIL; - }, -); +export const getIsAnvilLayout = (state: AppState) => { + const layoutSystemType = getLayoutSystemType(state); + return layoutSystemType === LayoutSystemTypes.ANVIL; +}; // ToDo: This is a placeholder implementation this is bound to change export function getDropTargetLayoutId(state: AppState, canvasId: string) { diff --git a/app/client/src/layoutSystems/fixedlayout/editor/FixedLayoutCanvasArenas/CanvasSelectionArena.test.tsx b/app/client/src/layoutSystems/fixedlayout/editor/FixedLayoutCanvasArenas/CanvasSelectionArena.test.tsx index bc273ba901..0777c612d9 100644 --- a/app/client/src/layoutSystems/fixedlayout/editor/FixedLayoutCanvasArenas/CanvasSelectionArena.test.tsx +++ b/app/client/src/layoutSystems/fixedlayout/editor/FixedLayoutCanvasArenas/CanvasSelectionArena.test.tsx @@ -13,7 +13,6 @@ import { sagasToRunForTests } from "test/sagas"; import { MockApplication, mockCreateCanvasWidget, - mockGetIsAnvilLayout, mockGetWidgetEvalValues, MockPageDSL, syntheticTestMouseEvent, @@ -24,16 +23,12 @@ import { generateReactKey } from "utils/generators"; import * as widgetRenderUtils from "utils/widgetRenderUtils"; import * as widgetSelectionsActions from "actions/widgetSelectionActions"; import { SelectionRequestType } from "sagas/WidgetSelectUtils"; -import * as anvilSelectors from "layoutSystems/anvil/integrations/selectors"; import Canvas from "pages/Editor/Canvas"; describe("Canvas selection test cases", () => { jest .spyOn(dataTreeSelectors, "getWidgetEvalValues") .mockImplementation(mockGetWidgetEvalValues); - jest - .spyOn(anvilSelectors, "getIsAnvilLayout") - .mockImplementation(mockGetIsAnvilLayout); jest .spyOn(utilities, "computeMainContainerWidget") .mockImplementation((widget) => widget as any); diff --git a/app/client/src/sagas/WidgetBlueprintSagas.test.ts b/app/client/src/sagas/WidgetBlueprintSagas.test.ts index 3e2bf907fd..9f53a36e2f 100644 --- a/app/client/src/sagas/WidgetBlueprintSagas.test.ts +++ b/app/client/src/sagas/WidgetBlueprintSagas.test.ts @@ -1,14 +1,9 @@ -import * as anvilSelectors from "layoutSystems/anvil/integrations/selectors"; -import { mockGetIsAnvilLayout } from "test/testCommon"; import WidgetFactory from "WidgetProvider/factory"; import { BlueprintOperationTypes } from "WidgetProvider/constants"; import type { BlueprintOperation } from "./WidgetBlueprintSagas"; import { executeWidgetBlueprintChildOperations } from "./WidgetBlueprintSagas"; -jest - .spyOn(anvilSelectors, "getIsAnvilLayout") - .mockImplementation(mockGetIsAnvilLayout); describe("WidgetBlueprintSagas", () => { it("should returns widgets after executing the child operation", async () => { const mockBlueprintChildOperation: BlueprintOperation = { diff --git a/app/client/test/testCommon.ts b/app/client/test/testCommon.ts index 50e02d29eb..ac22f6831d 100644 --- a/app/client/test/testCommon.ts +++ b/app/client/test/testCommon.ts @@ -137,10 +137,6 @@ export const mockGetWidgetEvalValues = ( ) as WidgetEntity; }; -export const mockGetIsAnvilLayout = (state: AppState) => { - return false; -}; - export const syntheticTestMouseEvent = ( event: MouseEvent, optionsToAdd = {},