Merge branch 'release' of github.com:Namatek/appsmith into release

.github/workflows/ci-test-limited.yml

@@ -41,20 +41,15 @@ jobs:
 
     # Service containers to run with this job. Required for running tests
     services:
-      # Label used to access the service container
       redis:
-        # Docker Hub image for Redis
         image: redis
         ports:
-          # Opens tcp port 6379 on the host and service container
           - 6379:6379
       postgres:
-        if: github.base_ref == 'pg' || github.ref_name == 'pg'
         image: postgres:14
         ports:
           - 5432:5432
       mongo:
-        if: github.base_ref == 'release' || github.ref_name == 'release'
         image: mongo
         ports:
           - 27017:27017

app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug25148_Spec.ts

@@ -17,10 +17,10 @@ describe(
         dataSources.FillAuthAPIUrl();
         dataSources.SaveDatasource();
         apiPage.CreateApi("API" + uid, "GET", true);
+        agHelper.AssertElementAbsence(apiPage._saveAsDS);
         apiPage.SelectPaneTab("Authentication");
-        agHelper.AssertElementEnabledDisabled(apiPage._saveAsDS, 0, false);
         // Last one if present on the authentication tab.
-        agHelper.AssertElementEnabledDisabled(apiPage._saveAsDS, 1, false);
+        agHelper.AssertElementEnabledDisabled(apiPage._saveAsDS, 0, false);
       });
     });
   },

app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26941_Spec.ts

@@ -12,7 +12,7 @@ describe(
     it("1. Checking whether the appropriate error is displayed even after the removal of invalid chars in header key.", function () {
       const randomApi = `${
         dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl
-      }123`;
+      }`;
       apiPage.CreateAndFillApi(randomApi);
       apiPage.RunAPI(false, 2000, {
         expectedPath: "response.body.data.body.data.isExecutionSuccess",

app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/PropertyControl_spec.ts

@@ -97,15 +97,15 @@ describe(
       propPane.ToggleJSMode("Table data", false);
 
       oneClickBinding.ChooseAndAssertForm("Users", "Users", "public.users", {
-        searchableColumn: "gender",
+        searchableColumn: "email",
       });
 
       propPane.MoveToTab("Style");
 
       propPane.MoveToTab("Content");
 
       oneClickBinding.ChooseAndAssertForm("sample Movies", "movies", "movies", {
-        searchableColumn: "status",
+        searchableColumn: "imdb_id",
       });
       dataSources.NavigateToDSCreateNew();
       dataSources.CreatePlugIn("Mongo");

app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/EntityBottomBar_spec.ts

@@ -102,7 +102,7 @@ describe(
           //Create and run query.
 
           _.dataSources.EnterQuery(
-            "SELECT * FROM users ORDER BY id LIMIT 10;",
+            "SELECT * FROM users ORDER BY username LIMIT 10;",
             1000,
           );
           _.dataSources.RunQuery();

app/client/cypress/e2e/Regression/ClientSide/Widgets/Iframe/IframeTest_spec.ts

@@ -46,7 +46,11 @@ describe(
 
       // User interaction - Click
       getIframeBody(1).find(locators._pageHeaderToggle).click({ force: true });
-      getIframeBody(1).find(locators._pageHeaderMenuList).should("be.visible");
+      agHelper.WaitForCondition(() => {
+        return getIframeBody(1)
+          .find(locators._pageHeaderMenuList)
+          .then(($el: JQuery<HTMLElement>) => $el.length > 0);
+      });
     });
 
     it("2. Verify colors, borders and shadows", () => {
@@ -81,7 +85,7 @@ describe(
       propPane.UpdatePropertyFieldValue("URL", " ");
       agHelper.ValidateToastMessage("url updated");
 
-      agHelper.ClickButton("Submit");
+      agHelper.ClickButton("Submit", { force: true });
       getIframeBody(0)
         .find("input")
         .should("be.visible")
@@ -90,6 +94,7 @@ describe(
           expect(inputValue).to.equal("submitclicked");
         });
 
+      EditorNavigation.SelectEntityByName("Iframe1", EntityType.Widget);
       propPane.UpdatePropertyFieldValue(
         "srcDoc",
         `<!DOCTYPE html>

app/client/cypress/e2e/Sanity/Datasources/GraphQL_spec.ts

@@ -305,6 +305,7 @@ describe(
         variable: GRAPHQL_VARIABLES,
       });
       apiPage.RunAPI();
+      apiPage.SelectPaneTab("Authentication");
       agHelper.GetNClick(locators._saveDatasource);
       dataSources.AssertDataSourceInfo([
         dataManager.dsValues[

app/client/cypress/e2e/Sanity/Datasources/RestApiDatasource_spec.js

@@ -5,7 +5,8 @@ import {
   apiPage,
 } from "../../../support/Objects/ObjectsCore";
 
-describe(
+//Skip test case due to : https://github.com/appsmithorg/appsmith/issues/37353
+describe.skip(
   "Create a rest datasource",
   {
     tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],

app/client/cypress/support/Objects/CommonLocators.ts

@@ -326,7 +326,7 @@ export class CommonLocators {
   _treeSelectedContent = ".rc-tree-select-selection-item-content";
   _switcherIcon = ".switcher-icon";
   _root = "#root";
-  _pageHeaderToggle = ".navbar__items>button";
+  _pageHeaderToggle = ".navbar__items > button";
   _pageHeaderMenuList = ".navbar-sidebar__backdrop";
   _enterFullScreen = ".application-demo-new-dashboard-control-enter-fullscreen";
   _dashboardContainer = ".application-demo-new-dashboard-container";

app/client/cypress/support/Pages/DataSources.ts

@@ -206,7 +206,7 @@ export class DataSources {
     ".t--datasource-name:contains('" + dsName + "')";
   _mandatoryMark = "//span[text()='*']";
   _deleteDSHostPort = ".t--delete-field";
-  _dsTabSchema = "[data-testid='t--tab-SCHEMA_TAB']";
+  _dsTabSchema = "[data-testid='t--tab-DATASOURCE_TAB']";
   private _pageSelectionMenu = "[data-testid='t--page-selection']";
 
   private _pageSelectMenuItem = ".ads-v2-menu__menu-item";
@@ -1891,7 +1891,9 @@ export class DataSources {
     cy.intercept("GET", "/api/v1/datasources/*/structure?ignoreCache=*").as(
       `getDatasourceStructureUpdated_${ds_entity_name}`,
     );
-    cy.get("[data-testid=t--tab-SCHEMA_TAB]").first().click({ force: true });
+    cy.get("[data-testid=t--tab-DATASOURCE_TAB]")
+      .first()
+      .click({ force: true });
     this.RefreshDatasourceSchema();
     this.assertHelper
       .WaitForNetworkCall(`@getDatasourceStructureUpdated_${ds_entity_name}`)

app/client/packages/design-system/ads/src/Icon/Icon.provider.tsx

@@ -1033,6 +1033,10 @@ const DashboardLineIcon = importSvg(
   async () => import("../__assets__/icons/ads/dashboard-line.svg"),
 );
 
+const DatasourceConfigIcon = importSvg(
+  async () => import("../__assets__/icons/ads/datasource-config.svg"),
+);
+
 // v3 icons
 const JsSquareV3Icon = importSvg(
   async () => import("../__assets__/icons/ads/js-square-v3-icon.svg"),
@@ -1173,6 +1177,7 @@ const ICON_LOOKUP = {
   "cut-control": CutIcon,
   "dashboard-line": DashboardLineIcon,
   "database-2-line": Database2Line,
+  "datasource-config": DatasourceConfigIcon,
   "datasource-v3": DatasourceV3Icon,
   "datasources-2": Datasources2,
   "decrease-control": DecreaseIcon,

app/client/packages/design-system/ads/src/Switch/Switch.styles.tsx

@@ -31,6 +31,7 @@ export const StyledSwitchLabel = styled(Text)<{
   justify-content: space-between;
   min-width: 9rem;
   cursor: pointer;
+  word-break: break-all;
 
   ${({ isDisabled }) =>
     isDisabled &&

app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/EmbeddedDatasourcePathField.tsx

@@ -593,7 +593,7 @@ class EmbeddedDatasourcePathComponent extends React.Component<
               </Text>
             </StyledTooltip>
           )}
-        {displayValue && (
+        {displayValue && shouldSave && (
           <StoreAsDatasource
             datasourceId={
               datasourceObject && "id" in datasourceObject

app/client/src/PluginActionEditor/components/PluginActionResponse/PluginActionResponse.tsx

@@ -60,7 +60,7 @@ function PluginActionResponse() {
         dispatch(
           setPluginActionEditorDebuggerState({
             open: true,
-            selectedTab: DEBUGGER_TAB_KEYS.SCHEMA_TAB,
+            selectedTab: DEBUGGER_TAB_KEYS.DATASOURCE_TAB,
           }),
         );
       }

app/client/src/PluginActionEditor/components/PluginActionResponse/components/Schema/Schema.tsx → app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/Datasource.tsx

@@ -15,23 +15,24 @@ import { datasourcesEditorIdURL } from "ee/RouteBuilder";
 import { DatasourceComponentTypes } from "api/PluginApi";
 import { getPluginActionDebuggerState } from "PluginActionEditor/store";
 import { SchemaDisplayStatus, StatusDisplay } from "./StatusDisplay";
-import DatasourceSelector from "./DatasourceSelector";
-import { SchemaTables } from "./SchemaTables";
+import { DatasourceTables } from "./DatasourceTables";
 import { DatasourceEditEntryPoints } from "constants/Datasource";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import { isEmpty, omit } from "lodash";
 import { getQueryParams } from "utils/URLUtils";
-import { getCurrentPageId } from "selectors/editorSelectors";
 import { TableColumns } from "./TableColumns";
 import { BOTTOMBAR_HEIGHT } from "./constants";
+import { useEditorType } from "ee/hooks";
+import { useParentEntityInfo } from "ee/hooks/datasourceEditorHooks";
+import DatasourceInfo from "./DatasourceInfo";
 
 interface Props {
   datasourceId: string;
   datasourceName: string;
   currentActionId: string;
 }
 
-const Schema = (props: Props) => {
+const Datasource = (props: Props) => {
   const dispatch = useDispatch();
 
   const datasourceStructure = useSelector((state) =>
@@ -44,7 +45,8 @@ const Schema = (props: Props) => {
     getPluginIdFromDatasourceId(state, props.datasourceId),
   );
 
-  const currentPageId = useSelector(getCurrentPageId);
+  const editorType = useEditorType(location.pathname);
+  const { parentEntityId } = useParentEntityInfo(editorType);
 
   const [selectedTable, setSelectedTable] = useState<string>();
 
@@ -107,7 +109,7 @@ const Schema = (props: Props) => {
     });
 
     const url = datasourcesEditorIdURL({
-      basePageId: currentPageId,
+      baseParentEntityId: parentEntityId,
       datasourceId: props.datasourceId,
       params: { ...omit(getQueryParams(), "viewMode"), viewMode: false },
       generateEditorPath: true,
@@ -137,13 +139,12 @@ const Schema = (props: Props) => {
     }
 
     return (
-      <>
-        <Flex padding="spaces-3">
-          <DatasourceSelector
-            datasourceId={props.datasourceId}
-            datasourceName={props.datasourceName}
-          />
-        </Flex>
+      <Flex flexDirection="column" padding="spaces-3">
+        <DatasourceInfo
+          datasourceId={props.datasourceId}
+          datasourceName={props.datasourceName}
+          showEditButton={!isLoading}
+        />
         <StatusDisplay
           editDatasource={editDatasource}
           errorMessage={
@@ -153,7 +154,7 @@ const Schema = (props: Props) => {
           }
           state={statusState}
         />
-      </>
+      </Flex>
     );
   };
 
@@ -164,7 +165,7 @@ const Schema = (props: Props) => {
 
     return (
       <Flex h="100%">
-        <SchemaTables
+        <DatasourceTables
           currentActionId={props.currentActionId}
           datasourceId={props.datasourceId}
           datasourceName={props.datasourceName}
@@ -194,4 +195,4 @@ const Schema = (props: Props) => {
   );
 };
 
-export { Schema };
+export { Datasource };

app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceInfo.tsx

@@ -0,0 +1,69 @@
+import React from "react";
+import { Button, Flex, Tooltip } from "@appsmith/ads";
+import DatasourceSelector from "./DatasourceSelector";
+import { createMessage, EDIT_DS_CONFIG } from "ee/constants/messages";
+import { DatasourceEditEntryPoints } from "constants/Datasource";
+import AnalyticsUtil from "ee/utils/AnalyticsUtil";
+import { datasourcesEditorIdURL } from "ee/RouteBuilder";
+import { omit } from "lodash";
+import { getQueryParams } from "utils/URLUtils";
+import history from "utils/history";
+import { useEditorType } from "ee/hooks";
+import { useParentEntityInfo } from "ee/hooks/datasourceEditorHooks";
+
+interface Props {
+  datasourceId: string;
+  datasourceName: string;
+  showEditButton: boolean;
+}
+
+const DatasourceInfo = ({
+  datasourceId,
+  datasourceName,
+  showEditButton,
+}: Props) => {
+  const editorType = useEditorType(location.pathname);
+  const { parentEntityId } = useParentEntityInfo(editorType);
+
+  // eslint-disable-next-line react-perf/jsx-no-new-function-as-prop
+  const editDatasource = () => {
+    const entryPoint = DatasourceEditEntryPoints.QUERY_EDITOR_DATASOURCE_SCHEMA;
+
+    AnalyticsUtil.logEvent("EDIT_DATASOURCE_CLICK", {
+      datasourceId: datasourceId,
+      pluginName: "",
+      entryPoint: entryPoint,
+    });
+
+    const url = datasourcesEditorIdURL({
+      baseParentEntityId: parentEntityId,
+      datasourceId: datasourceId,
+      params: { ...omit(getQueryParams(), "viewMode"), viewMode: false },
+      generateEditorPath: true,
+    });
+
+    history.push(url);
+  };
+
+  return (
+    <Flex alignItems={"center"} gap="spaces-2">
+      <DatasourceSelector
+        datasourceId={datasourceId}
+        datasourceName={datasourceName}
+      />
+      {showEditButton && (
+        <Tooltip content={createMessage(EDIT_DS_CONFIG)} placement="top">
+          <Button
+            isIconButton
+            kind="tertiary"
+            onClick={editDatasource}
+            size="sm"
+            startIcon="datasource-config"
+          />
+        </Tooltip>
+      )}
+    </Flex>
+  );
+};
+
+export default DatasourceInfo;

app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceSelector/ApiDatasourceSelector.tsx

@@ -0,0 +1,13 @@
+import { API_EDITOR_FORM_NAME } from "ee/constants/forms";
+import { type Action } from "entities/Action";
+import { reduxForm } from "redux-form";
+import {
+  PluginDatasourceSelector,
+  type CustomProps,
+} from "./PluginDatasourceSelector";
+
+export default reduxForm<Action, CustomProps>({
+  form: API_EDITOR_FORM_NAME,
+  destroyOnUnmount: false,
+  enableReinitialize: true,
+})(PluginDatasourceSelector);