Merge branch 'release' of https://github.com/appsmithorg/appsmith int…

…o chore/update-action-name
appsmithorg · Sep 27, 2024 · 73647e5 · 73647e5
2 parents d506892 + 6368215
commit 73647e5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Edit_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Edit_spec.js
@@ -96,7 +96,7 @@ describe(
           force: true,
         })
         .type(
-          "https://www.facebook.com/users/{{Button2.text}}?key=test&val={{Button2.text}}",
+          "http://host.docker.internal:5001/{{Button2.text}}?key=test&val={{Button2.text}}",
           { force: true, parseSpecialCharSequences: false },
         )
         .wait(3000)
@@ -106,7 +106,7 @@ describe(
         .type("{enter}", { parseSpecialCharSequences: true });
 
       cy.validateEvaluatedValue(
-        "https://www.facebook.com/users/Cancel?key=test&val=Cancel",
+        "http://host.docker.internal:5001/Cancel?key=test&val=Cancel",
       );
     });
   },

diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/PluginActionForm.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/PluginActionForm.tsx
@@ -2,13 +2,18 @@ import React from "react";
 import APIEditorForm from "./components/APIEditorForm";
 import { Flex } from "@appsmith/ads";
 import { useChangeActionCall } from "./hooks/useChangeActionCall";
+import { usePluginActionContext } from "../../PluginActionContext";
+import { UIComponentTypes } from "api/PluginApi";
 
 const PluginActionForm = () => {
   useChangeActionCall();
+  const { plugin } = usePluginActionContext();
 
   return (
     <Flex p="spaces-2" w="100%">
-      <APIEditorForm />
+      {plugin.uiComponent === UIComponentTypes.ApiEditorForm ? (
+        <APIEditorForm />
+      ) : null}
     </Flex>
   );
 };

diff --git a/...r/components/PluginActionForm/components/CommonEditorForm/hooks/useGetFormActionValues.ts b/...r/components/PluginActionForm/components/CommonEditorForm/hooks/useGetFormActionValues.ts
@@ -18,7 +18,7 @@ function useGetFormActionValues() {
 
   // In an unlikely scenario where form is not initialised,
   // return empty values to avoid form ui issues
-  if (!isAPIAction(formValues)) {
+  if (!formValues || !isAPIAction(formValues)) {
     return {
       actionHeaders: [],
       actionParams: [],

diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/PluginActionResponse.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/PluginActionResponse.tsx
@@ -57,7 +57,7 @@ function PluginActionResponse() {
         expandedHeight={`${ActionExecutionResizerHeight}px`}
         isCollapsed={!open}
         onSelect={updateSelectedResponseTab}
-        selectedTabKey={selectedTab || tabs[0].key}
+        selectedTabKey={selectedTab || tabs[0]?.key}
         tabs={tabs}
       />
     </IDEBottomView>