chore: Replace entities in entity explorer with new ADS templates

app/client/src/IDE/Components/EditableName/RenameMenuItem.tsx

@@ -2,6 +2,7 @@ import React, { useCallback } from "react";
 import { MenuItem } from "@appsmith/ads";
 import { useDispatch } from "react-redux";
 import { setRenameEntity } from "actions/ideActions";
+import { CONTEXT_RENAME, createMessage } from "ee/constants/messages";
 
 interface Props {
   disabled?: boolean;
@@ -24,7 +25,7 @@ export const RenameMenuItem = ({ disabled, entityId }: Props) => {
       onSelect={setRename}
       startIcon="input-cursor-move"
     >
-      Rename
+      {createMessage(CONTEXT_RENAME)}
     </MenuItem>
   );
 };

app/client/src/ce/pages/Editor/IDE/EditorPane/JS/ListItem.tsx

@@ -1,27 +1,7 @@
 import React from "react";
-import ExplorerJSCollectionEntity from "pages/Editor/Explorer/JSActions/JSActionEntity";
-import { Flex } from "@appsmith/ads";
 import type { EntityItem } from "ee/entities/IDE/constants";
+import { JSEntityItem } from "pages/Editor/IDE/EditorPane/JS/EntityItem/JSEntityItem";
 
-export interface JSListItemProps {
-  item: EntityItem;
-  isActive: boolean;
-  parentEntityId: string;
-}
-
-export const JSListItem = (props: JSListItemProps) => {
-  const { isActive, item, parentEntityId } = props;
-
-  return (
-    <Flex data-testid="t--ide-list-item" flexDirection={"column"}>
-      <ExplorerJSCollectionEntity
-        baseCollectionId={item.key}
-        isActive={isActive}
-        key={item.key}
-        parentEntityId={parentEntityId}
-        searchKeyword={""}
-        step={1}
-      />
-    </Flex>
-  );
+export const JSEntity = (props: { item: EntityItem }) => {
+  return <JSEntityItem {...props} />;
 };

app/client/src/ce/pages/Editor/IDE/EditorPane/JS/old/ListItem.tsx

@@ -0,0 +1,27 @@
+import React from "react";
+import ExplorerJSCollectionEntity from "pages/Editor/Explorer/JSActions/JSActionEntity";
+import { Flex } from "@appsmith/ads";
+import type { EntityItem } from "ee/entities/IDE/constants";
+
+export interface JSListItemProps {
+  item: EntityItem;
+  isActive: boolean;
+  parentEntityId: string;
+}
+
+export const JSListItem = (props: JSListItemProps) => {
+  const { isActive, item, parentEntityId } = props;
+
+  return (
+    <Flex data-testid="t--ide-list-item" flexDirection={"column"}>
+      <ExplorerJSCollectionEntity
+        baseCollectionId={item.key}
+        isActive={isActive}
+        key={item.key}
+        parentEntityId={parentEntityId}
+        searchKeyword={""}
+        step={1}
+      />
+    </Flex>
+  );
+};

app/client/src/ce/pages/Editor/IDE/EditorPane/JS/utils/getJSContextMenuByIdeType.tsx

@@ -0,0 +1,20 @@
+import React from "react";
+import { IDE_TYPE, type IDEType } from "ee/entities/IDE/constants";
+import EntityContextMenu from "pages/Editor/IDE/EditorPane/components/EntityContextMenu";
+import { AppJSContextMenuItems } from "pages/Editor/IDE/EditorPane/JS/EntityItem/AppJSContextMenuItems";
+import type { JSCollection } from "entities/JSCollection";
+
+export const getJSContextMenuByIdeType = (
+  ideType: IDEType,
+  jsAction: JSCollection,
+) => {
+  switch (ideType) {
+    case IDE_TYPE.App: {
+      return (
+        <EntityContextMenu
+          menuContent={<AppJSContextMenuItems jsAction={jsAction} />}
+        />
+      );
+    }
+  }
+};

app/client/src/ce/pages/Editor/IDE/EditorPane/Query/ListItem.tsx

@@ -1,25 +1,7 @@
 import React from "react";
-import ExplorerActionEntity from "pages/Editor/Explorer/Actions/ActionEntity";
+import { QueryEntityItem } from "pages/Editor/IDE/EditorPane/Query/EntityItem/QueryEntityItem";
 import type { EntityItem } from "ee/entities/IDE/constants";
 
-export interface QueryListItemProps {
-  item: EntityItem;
-  isActive: boolean;
-  parentEntityId: string;
-}
-
-export const QueryListItem = (props: QueryListItemProps) => {
-  const { isActive, item, parentEntityId } = props;
-
-  return (
-    <ExplorerActionEntity
-      baseId={item.key}
-      isActive={isActive}
-      key={item.key}
-      parentEntityId={parentEntityId}
-      searchKeyword={""}
-      step={1}
-      type={item.type}
-    />
-  );
+export const ActionEntityItem = (props: { item: EntityItem }) => {
+  return <QueryEntityItem {...props} />;
 };

app/client/src/ce/pages/Editor/IDE/EditorPane/Query/old/ListItem.tsx

@@ -0,0 +1,25 @@
+import React from "react";
+import ExplorerActionEntity from "pages/Editor/Explorer/Actions/ActionEntity";
+import type { EntityItem } from "ee/entities/IDE/constants";
+
+export interface QueryListItemProps {
+  item: EntityItem;
+  isActive: boolean;
+  parentEntityId: string;
+}
+
+export const QueryListItem = (props: QueryListItemProps) => {
+  const { isActive, item, parentEntityId } = props;
+
+  return (
+    <ExplorerActionEntity
+      baseId={item.key}
+      isActive={isActive}
+      key={item.key}
+      parentEntityId={parentEntityId}
+      searchKeyword={""}
+      step={1}
+      type={item.type}
+    />
+  );
+};

app/client/src/ce/pages/Editor/IDE/EditorPane/Query/utils/getQueryContextMenuByIdeType.tsx

@@ -0,0 +1,20 @@
+import React from "react";
+import { IDE_TYPE, type IDEType } from "ee/entities/IDE/constants";
+import type { Action } from "entities/Action";
+import { AppQueryContextMenuItems } from "pages/Editor/IDE/EditorPane/Query/EntityItem/AppQueryContextMenuItems";
+import EntityContextMenu from "pages/Editor/IDE/EditorPane/components/EntityContextMenu";
+
+export const getQueryContextMenuByIdeType = (
+  ideType: IDEType,
+  action: Action,
+) => {
+  switch (ideType) {
+    case IDE_TYPE.App: {
+      return (
+        <EntityContextMenu
+          menuContent={<AppQueryContextMenuItems action={action} />}
+        />
+      );
+    }
+  }
+};

app/client/src/ee/pages/Editor/IDE/EditorPane/JS/old/ListItem.tsx

@@ -0,0 +1 @@
+export * from "ce/pages/Editor/IDE/EditorPane/JS/old/ListItem";

app/client/src/ee/pages/Editor/IDE/EditorPane/JS/utils/getJSContextMenuByIdeType.tsx

@@ -0,0 +1 @@
+export * from "ce/pages/Editor/IDE/EditorPane/JS/utils/getJSContextMenuByIdeType";

app/client/src/ee/pages/Editor/IDE/EditorPane/Query/old/ListItem.tsx

@@ -0,0 +1 @@
+export * from "ce/pages/Editor/IDE/EditorPane/Query/old/ListItem";

app/client/src/ee/pages/Editor/IDE/EditorPane/Query/utils/getQueryContextMenuByIdeType.ts

@@ -0,0 +1 @@
+export * from "ce/pages/Editor/IDE/EditorPane/Query/utils/getQueryContextMenuByIdeType";

app/client/src/pages/Editor/AppPluginActionEditor/components/ConvertToModule/ConvertToModuleCTA.tsx → app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/ConvertToModule.tsx

@@ -1,5 +1,4 @@
 import React from "react";
-import { usePluginActionContext } from "PluginActionEditor";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import { useSelector } from "react-redux";
@@ -11,21 +10,27 @@ import {
 import { MODULE_TYPE } from "ee/constants/ModuleConstants";
 import ConvertToModuleInstanceCTA from "ee/pages/Editor/EntityEditor/ConvertToModuleInstanceCTA";
 import { PluginType } from "entities/Plugin";
+import type { Action } from "entities/Action";
 
-const ConvertToModuleCTA = () => {
-  const { action, plugin } = usePluginActionContext();
-  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
+interface Props {
+  action: Action;
+}
+
+export const ConvertToModule = ({ action }: Props) => {
   const pagePermissions = useSelector(getPagePermissions);
+  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
+
   const isCreatePermitted = getHasCreateActionPermission(
     isFeatureEnabled,
     pagePermissions,
   );
+
   const isDeletePermitted = getHasDeleteActionPermission(
     isFeatureEnabled,
     action.userPermissions,
   );
 
-  if (plugin.type === PluginType.INTERNAL) {
+  if (action.pluginType === PluginType.INTERNAL) {
     // Workflow queries cannot be converted to modules
     return null;
   }
@@ -39,5 +44,3 @@ const ConvertToModuleCTA = () => {
 
   return <ConvertToModuleInstanceCTA {...convertToModuleProps} />;
 };
-
-export default ConvertToModuleCTA;

app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Copy.tsx → app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/Copy.tsx

@@ -1,19 +1,20 @@
+import React from "react";
+import { MenuSub, MenuSubContent, MenuSubTrigger } from "@appsmith/ads";
 import { useDispatch, useSelector } from "react-redux";
-import { getPageList } from "ee/selectors/entitiesSelector";
-import { usePluginActionContext } from "PluginActionEditor";
-import React, { useCallback } from "react";
+import { getPageList } from "selectors/editorSelectors";
+import { PageMenuItem } from "./PageMenuItem";
+import { useCallback } from "react";
+import type { Action } from "entities/Action";
 import { copyActionRequest } from "actions/pluginActionActions";
-import { MenuSub, MenuSubContent, MenuSubTrigger } from "@appsmith/ads";
 import { CONTEXT_COPY, createMessage } from "ee/constants/messages";
-import { PageMenuItem } from "./PageMenuItem";
 
 interface Props {
+  action: Action;
   disabled?: boolean;
 }
 
-export const Copy = ({ disabled }: Props) => {
+export const Copy = ({ action, disabled }: Props) => {
   const menuPages = useSelector(getPageList);
-  const { action } = usePluginActionContext();
   const dispatch = useDispatch();
 
   const copyActionToPage = useCallback(
@@ -30,13 +31,14 @@ export const Copy = ({ disabled }: Props) => {
 
   return (
     <MenuSub>
-      <MenuSubTrigger disabled={disabled} startIcon="duplicate">
+      <MenuSubTrigger startIcon="duplicate">
         {createMessage(CONTEXT_COPY)}
       </MenuSubTrigger>
-      <MenuSubContent>
+      <MenuSubContent style={{ maxHeight: "350px" }} width="220px">
         {menuPages.map((page) => {
           return (
             <PageMenuItem
+              disabled={disabled}
               key={page.basePageId}
               onSelect={copyActionToPage}
               page={page}

app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Delete.tsx → app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/Delete.tsx

@@ -1,24 +1,41 @@
-import { useHandleDeleteClick } from "PluginActionEditor/hooks";
 import React, { useCallback, useState } from "react";
 import {
   CONFIRM_CONTEXT_DELETE,
   CONTEXT_DELETE,
   createMessage,
 } from "ee/constants/messages";
 import { MenuItem } from "@appsmith/ads";
+import { useDispatch } from "react-redux";
+import { deleteAction } from "actions/pluginActionActions";
+import type { Action } from "entities/Action";
 
 interface Props {
+  action: Action;
   disabled?: boolean;
 }
 
-export const Delete = ({ disabled }: Props) => {
-  const { handleDeleteClick } = useHandleDeleteClick();
+export const Delete = ({ action, disabled }: Props) => {
+  const dispatch = useDispatch();
   const [confirmDelete, setConfirmDelete] = useState(false);
 
+  const handleDeleteClick = useCallback(
+    ({ onSuccess }: { onSuccess?: () => void }) => {
+      dispatch(
+        deleteAction({
+          id: action?.id ?? "",
+          name: action?.name ?? "",
+          onSuccess,
+        }),
+      );
+    },
+    [action.id, action.name, dispatch],
+  );
+
   const handleSelect = useCallback(
     (e?: Event) => {
       e?.preventDefault();
       confirmDelete ? handleDeleteClick({}) : setConfirmDelete(true);
+      e?.stopPropagation();
     },
     [confirmDelete, handleDeleteClick],
   );
@@ -29,7 +46,7 @@ export const Delete = ({ disabled }: Props) => {
 
   return (
     <MenuItem
-      className="t--apiFormDeleteBtn error-menuitem"
+      className="t--apiFormDeleteBtn single-select error-menuitem"
       disabled={disabled}
       onSelect={handleSelect}
       startIcon="trash"

app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Move.tsx → app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/Move.tsx

@@ -1,5 +1,4 @@
 import { useDispatch, useSelector } from "react-redux";
-import { usePluginActionContext } from "PluginActionEditor";
 import { getCurrentPageId } from "selectors/editorSelectors";
 import { getPageList } from "ee/selectors/entitiesSelector";
 import React, { useCallback, useMemo } from "react";
@@ -12,14 +11,15 @@ import {
 } from "@appsmith/ads";
 import { CONTEXT_MOVE, createMessage } from "ee/constants/messages";
 import { PageMenuItem } from "./PageMenuItem";
+import type { Action } from "entities/Action";
 
 interface Props {
+  action: Action;
   disabled?: boolean;
 }
 
-export const Move = ({ disabled }: Props) => {
+export const Move = ({ action, disabled }: Props) => {
   const dispatch = useDispatch();
-  const { action } = usePluginActionContext();
 
   const currentPageId = useSelector(getCurrentPageId);
   const allPages = useSelector(getPageList);
@@ -42,14 +42,15 @@ export const Move = ({ disabled }: Props) => {
 
   return (
     <MenuSub>
-      <MenuSubTrigger disabled={disabled} startIcon="swap-horizontal">
+      <MenuSubTrigger startIcon="swap-horizontal">
         {createMessage(CONTEXT_MOVE)}
       </MenuSubTrigger>
-      <MenuSubContent>
+      <MenuSubContent style={{ maxHeight: "350px" }} width="220px">
         {menuPages.length ? (
           menuPages.map((page) => {
             return (
               <PageMenuItem
+                disabled={disabled}
                 key={page.basePageId}
                 onSelect={moveActionToPage}
                 page={page}

app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/PageMenuItem.tsx → app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/PageMenuItem.tsx

@@ -5,10 +5,15 @@ import { MenuItem } from "@appsmith/ads";
 export const PageMenuItem = (props: {
   page: Page;
   onSelect: (id: string) => void;
+  disabled?: boolean;
 }) => {
   const handleOnSelect = useCallback(() => {
     props.onSelect(props.page.pageId);
   }, [props]);
 
-  return <MenuItem onSelect={handleOnSelect}>{props.page.pageName}</MenuItem>;
+  return (
+    <MenuItem disabled={props.disabled} onSelect={handleOnSelect}>
+      {props.page.pageName}
+    </MenuItem>
+  );
 };