chore: refactor query duplication flow

app/client/src/PluginActionEditor/hooks/index.ts

@@ -1,5 +1,6 @@
 export { useActionSettingsConfig } from "ee/PluginActionEditor/hooks/useActionSettingsConfig";
 export { useHandleDeleteClick } from "ee/PluginActionEditor/hooks/useHandleDeleteClick";
+export { useHandleDuplicateClick } from "ee/PluginActionEditor/hooks/useHandleDuplicateClick";
 export { useHandleRunClick } from "ee/PluginActionEditor/hooks/useHandleRunClick";
 export { useBlockExecution } from "ee/PluginActionEditor/hooks/useBlockExecution";
 export { useAnalyticsOnRunClick } from "ee/PluginActionEditor/hooks/useAnalyticsOnRunClick";

app/client/src/actions/pluginActionActions.ts

@@ -21,6 +21,7 @@ import type { ApiResponse } from "api/ApiResponses";
 import type { JSCollection } from "entities/JSCollection";
 import type { ErrorActionPayload } from "sagas/ErrorSagas";
 import type { EventLocation } from "ee/utils/analyticsUtilTypes";
+import type { GenerateDestinationIdInfoReturnType } from "ee/sagas/helpers";
 
 export const createActionRequest = (payload: Partial<Action>) => {
   return {
@@ -225,7 +226,7 @@ export const moveActionError = (
 
 export const copyActionRequest = (payload: {
   id: string;
-  destinationPageId: string;
+  destinationEditorId: string;
   name: string;
 }) => {
   return {
@@ -244,7 +245,7 @@ export const copyActionSuccess = (payload: Action) => {
 export const copyActionError = (
   payload: {
     id: string;
-    destinationPageId: string;
+    destinationEditorIdInfo: GenerateDestinationIdInfoReturnType;
   } & ErrorActionPayload,
 ) => {
   return {

app/client/src/ce/PluginActionEditor/hooks/useHandleDuplicateClick.ts

@@ -0,0 +1,26 @@
+import { copyActionRequest } from "actions/pluginActionActions";
+import { usePluginActionContext } from "PluginActionEditor/PluginActionContext";
+import { useCallback } from "react";
+import { useDispatch } from "react-redux";
+
+function useHandleDuplicateClick() {
+  const { action } = usePluginActionContext();
+  const dispatch = useDispatch();
+
+  const handleDuplicateClick = useCallback(
+    (destinationEditorId: string) => {
+      dispatch(
+        copyActionRequest({
+          id: action.id,
+          destinationEditorId,
+          name: action.name,
+        }),
+      );
+    },
+    [action.id, action.name, dispatch],
+  );
+
+  return { handleDuplicateClick };
+}
+
+export { useHandleDuplicateClick };

app/client/src/ce/constants/messages.ts

@@ -337,7 +337,7 @@ export const ACTION_MOVE_SUCCESS = (actionName: string, pageName: string) =>
 export const ERROR_ACTION_MOVE_FAIL = (actionName: string) =>
   `Error while moving action ${actionName}`;
 export const ACTION_COPY_SUCCESS = (actionName: string, pageName: string) =>
-  `${actionName} action copied to page ${pageName} successfully`;
+  `${actionName} action copied ${pageName.length > 0 ? "to page " + pageName : ""} successfully`;
 export const ERROR_ACTION_COPY_FAIL = (actionName: string) =>
   `Error while copying action ${actionName}`;
 export const ERROR_ACTION_RENAME_FAIL = (actionName: string) =>
@@ -1731,6 +1731,7 @@ export const CONTEXT_RENAME = () => "Rename";
 export const CONTEXT_SHOW_BINDING = () => "Show bindings";
 export const CONTEXT_MOVE = () => "Move to page";
 export const CONTEXT_COPY = () => "Copy to page";
+export const CONTEXT_DUPLICATE = () => "Duplicate";
 export const CONTEXT_DELETE = () => "Delete";
 export const CONFIRM_CONTEXT_DELETE = () => "Are you sure?";
 export const CONFIRM_CONTEXT_DELETING = () => "Deleting";

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

@@ -17,7 +17,7 @@ export const Copy = () => {
       dispatch(
         copyActionRequest({
           id: action.id,
-          destinationPageId: pageId,
+          destinationEditorId: pageId,
           name: action.name,
         }),
       ),

app/client/src/ce/sagas/helpers.ts

@@ -10,6 +10,23 @@ export interface ResolveParentEntityMetadataReturnType {
   parentEntityKey?: CreateNewActionKeyInterface;
 }
 
+// This function is extended in EE. Please check the EE implementation before any modification.
+export interface GenerateDestinationIdInfoReturnType {
+  pageId?: string;
+}
+
+// This function is extended in EE. Please check the EE implementation before any modification.
+export function generateDestinationIdInfoForQueryDuplication(
+  destinationEditorId: string,
+  parentEntityKey: CreateNewActionKeyInterface,
+): GenerateDestinationIdInfoReturnType {
+  if (parentEntityKey === CreateNewActionKey.PAGE) {
+    return { pageId: destinationEditorId };
+  }
+
+  return {};
+}
+
 // This function is extended in EE. Please check the EE implementation before any modification.
 export const resolveParentEntityMetadata = (
   action: Partial<Action>,

app/client/src/ee/PluginActionEditor/hooks/useHandleDuplicateClick.ts

@@ -0,0 +1 @@
+export * from "ce/PluginActionEditor/hooks/useHandleDuplicateClick";

app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx

@@ -20,6 +20,7 @@ import {
   CONTEXT_NO_PAGE,
   CONTEXT_SHOW_BINDING,
   createMessage,
+  CONTEXT_DUPLICATE,
 } from "ee/constants/messages";
 import { builderURL } from "ee/RouteBuilder";
 
@@ -33,6 +34,7 @@ import { useConvertToModuleOptions } from "ee/pages/Editor/Explorer/hooks";
 import { MODULE_TYPE } from "ee/constants/ModuleConstants";
 import { PluginType } from "entities/Action";
 import { convertToBaseParentEntityIdSelector } from "selectors/pageListSelectors";
+import { ActionParentEntityType } from "ee/entities/Engine/actionHelpers";
 
 interface EntityContextMenuProps {
   id: string;
@@ -45,20 +47,20 @@ interface EntityContextMenuProps {
 export function ActionEntityContextMenu(props: EntityContextMenuProps) {
   // Import the context
   const context = useContext(FilesContext);
-  const { menuItems, parentEntityId } = context;
+  const { menuItems, parentEntityId, parentEntityType } = context;
   const baseParentEntityId = useSelector((state) =>
     convertToBaseParentEntityIdSelector(state, parentEntityId),
   );
 
   const { canDeleteAction, canManageAction } = props;
   const dispatch = useDispatch();
   const [confirmDelete, setConfirmDelete] = useState(false);
-  const copyActionToPage = useCallback(
-    (actionId: string, actionName: string, pageId: string) =>
+  const copyAction = useCallback(
+    (actionId: string, actionName: string, destinationEditorId: string) =>
       dispatch(
         copyActionRequest({
           id: actionId,
-          destinationPageId: pageId,
+          destinationEditorId,
           name: actionName,
         }),
       ),
@@ -129,14 +131,24 @@ export function ActionEntityContextMenu(props: EntityContextMenuProps) {
     menuItems.includes(ActionEntityContextMenuItemsEnum.COPY) &&
       canManageAction && {
         value: "copy",
-        onSelect: noop,
-        label: createMessage(CONTEXT_COPY),
-        children: menuPages.map((page) => {
-          return {
-            ...page,
-            onSelect: () => copyActionToPage(props.id, props.name, page.id),
-          };
-        }),
+        onSelect:
+          parentEntityType === ActionParentEntityType.PAGE
+            ? noop
+            : () => {
+                copyAction(props.id, props.name, parentEntityId);
+              },
+        label: createMessage(
+          menuPages.length > 0 ? CONTEXT_COPY : CONTEXT_DUPLICATE,
+        ),
+        children:
+          parentEntityType === ActionParentEntityType.PAGE &&
+          menuPages.length > 0 &&
+          menuPages.map((page) => {
+            return {
+              ...page,
+              onSelect: () => copyAction(props.id, props.name, page.id),
+            };
+          }),
       },
     menuItems.includes(ActionEntityContextMenuItemsEnum.MOVE) &&
       canManageAction && {

app/client/src/pages/Editor/Explorer/Actions/MoreActionsMenu.tsx

@@ -63,7 +63,7 @@ export function MoreActionsMenu(props: EntityContextMenuProps) {
       dispatch(
         copyActionRequest({
           id: actionId,
-          destinationPageId: pageId,
+          destinationEditorId: pageId,
           name: actionName,
         }),
       ),

app/client/src/sagas/ActionSagas.ts

@@ -134,7 +134,10 @@ import { sendAnalyticsEventSaga } from "./AnalyticsSaga";
 import { EditorModes } from "components/editorComponents/CodeEditor/EditorConfig";
 import { updateActionAPICall } from "ee/sagas/ApiCallerSagas";
 import FocusRetention from "./FocusRetentionSaga";
-import { resolveParentEntityMetadata } from "ee/sagas/helpers";
+import {
+  generateDestinationIdInfoForQueryDuplication,
+  resolveParentEntityMetadata,
+} from "ee/sagas/helpers";
 import { handleQueryEntityRedirect } from "./IDESaga";
 import { EditorViewMode, IDE_TYPE } from "ee/entities/IDE/constants";
 import { getIDETypeByUrl } from "ee/entities/IDE/utils";
@@ -144,7 +147,8 @@ import {
 } from "actions/ideActions";
 import { getIsSideBySideEnabled } from "selectors/ideSelectors";
 import { CreateNewActionKey } from "ee/entities/Engine/actionHelpers";
-import { convertToBasePageIdSelector } from "selectors/pageListSelectors";
+import { objectKeys } from "@appsmith/utils";
+import { convertToBaseParentEntityIdSelector } from "selectors/pageListSelectors";
 
 export const DEFAULT_PREFIX = {
   QUERY: "Query",
@@ -745,17 +749,34 @@ function* moveActionSaga(
 }
 
 function* copyActionSaga(
-  action: ReduxAction<{ id: string; destinationPageId: string; name: string }>,
+  action: ReduxAction<{
+    id: string;
+    destinationEditorId: string;
+    name: string;
+  }>,
 ) {
   let actionObject: Action = yield select(getAction, action.payload.id);
+
+  const { parentEntityId, parentEntityKey } =
+    resolveParentEntityMetadata(actionObject);
+
+  if (!parentEntityId || !parentEntityKey) return;
+
   const newName: string = yield select(getNewEntityName, {
     prefix: action.payload.name,
-    parentEntityId: action.payload.destinationPageId,
-    parentEntityKey: CreateNewActionKey.PAGE,
+    parentEntityId,
+    parentEntityKey,
     suffix: "Copy",
     startWithoutIndex: true,
   });
 
+  const destinationEditorIdInfo = generateDestinationIdInfoForQueryDuplication(
+    action.payload.destinationEditorId,
+    parentEntityKey,
+  );
+
+  if (objectKeys(destinationEditorIdInfo).length === 0) return;
+
   try {
     if (!actionObject) throw new Error("Could not find action to copy");
 
@@ -768,7 +789,7 @@ function* copyActionSaga(
 
     const copyAction = Object.assign({}, actionObject, {
       name: newName,
-      pageId: action.payload.destinationPageId,
+      ...destinationEditorIdInfo,
     }) as Partial<Action>;
 
     // Indicates that source of action creation is copy action
@@ -781,11 +802,15 @@ function* copyActionSaga(
     const datasources: Datasource[] = yield select(getDatasources);
 
     const isValidResponse: boolean = yield validateResponse(response);
-    const pageName: string = yield select(
-      getPageNameByPageId,
-      // @ts-expect-error: pageId not present on ActionCreateUpdateResponse
-      response.data.pageId,
-    );
+    let pageName: string = "";
+
+    if (parentEntityKey === CreateNewActionKey.PAGE) {
+      pageName = yield select(
+        getPageNameByPageId,
+        // @ts-expect-error: pageId not present on ActionCreateUpdateResponse
+        response.data.pageId,
+      );
+    }
 
     if (isValidResponse) {
       toast.show(
@@ -807,6 +832,8 @@ function* copyActionSaga(
       AnalyticsUtil.logEvent("DUPLICATE_ACTION", {
         // @ts-expect-error: name not present on ActionCreateUpdateResponse
         actionName: response.data.name,
+        parentEntityId,
+        parentEntityKey,
         pageName: pageName,
         actionId: response.data.id,
         originalActionId,
@@ -836,7 +863,8 @@ function* copyActionSaga(
 
     yield put(
       copyActionError({
-        ...action.payload,
+        id: action.payload.id,
+        destinationEditorIdInfo,
         show: true,
         error: {
           message: errorMessage,
@@ -1039,21 +1067,23 @@ function* toggleActionExecuteOnLoadSaga(
 }
 
 function* handleMoveOrCopySaga(actionPayload: ReduxAction<Action>) {
-  const {
-    baseId: baseActionId,
-    pageId,
-    pluginId,
-    pluginType,
-  } = actionPayload.payload;
+  const { baseId: baseActionId, pluginId, pluginType } = actionPayload.payload;
   const isApi = pluginType === PluginType.API;
   const isQuery = pluginType === PluginType.DB;
   const isSaas = pluginType === PluginType.SAAS;
-  const basePageId: string = yield select(convertToBasePageIdSelector, pageId);
+  const { parentEntityId } = resolveParentEntityMetadata(actionPayload.payload);
+
+  if (!parentEntityId) return;
+
+  const baseParentEntityId: string = yield select(
+    convertToBaseParentEntityIdSelector,
+    parentEntityId,
+  );
 
   if (isApi) {
     history.push(
       apiEditorIdURL({
-        basePageId,
+        baseParentEntityId,
         baseApiId: baseActionId,
       }),
     );
@@ -1062,7 +1092,7 @@ function* handleMoveOrCopySaga(actionPayload: ReduxAction<Action>) {
   if (isQuery) {
     history.push(
       queryEditorIdURL({
-        basePageId,
+        baseParentEntityId,
         baseQueryId: baseActionId,
       }),
     );
@@ -1076,7 +1106,7 @@ function* handleMoveOrCopySaga(actionPayload: ReduxAction<Action>) {
 
     history.push(
       saasEditorApiIdURL({
-        basePageId,
+        baseParentEntityId,
         pluginPackageName: plugin.packageName,
         baseApiId: baseActionId,
       }),