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

…o fix-36080/selectedRowIndex-getting-updated-unnecessarily
appsmithorg · Sep 20, 2024 · 1a2d644 · 1a2d644
2 parents 05ec2fe + 6224ffb
commit 1a2d644
Show file tree

Hide file tree

Showing 25 changed files with 746 additions and 890 deletions.
diff --git a/.github/workflows/pr-cypress.yml b/.github/workflows/pr-cypress.yml
@@ -62,7 +62,6 @@ jobs:
     secrets: inherit
     with:
       pr: ${{ github.event.number }}
-      is-pg-build: ${{ inputs.is-pg-build }}
 
   ci-test:
     needs: [build-docker-image]

diff --git a/app/client/public/index.html b/app/client/public/index.html
@@ -41,6 +41,7 @@
         const CLOUD_HOSTING = parseConfig('{{env "APPSMITH_CLOUD_HOSTING"}}');
         const ZIPY_KEY = parseConfig('{{env "APPSMITH_ZIPY_SDK_KEY"}}');
         const AIRGAPPED = parseConfig('{{env "APPSMITH_AIRGAP_ENABLED"}}');
+        const REO_CLIENT_ID = parseConfig('{{env "APPSMITH_REO_CLIENT_ID"}}');
       </script>
     <script>
         window.__APPSMITH_CHUNKS_TO_PRELOAD =
@@ -78,6 +79,14 @@
 
 
     </script>
+
+    <!-- Start of Reo Javascript -->
+    <script type="text/javascript">
+      if (CLOUD_HOSTING && REO_CLIENT_ID) {
+        !function(){var e,t,n;e=REO_CLIENT_ID,t=function(){Reo.init({clientID:REO_CLIENT_ID})},(n=document.createElement("script")).src="https://static.reo.dev/"+e+"/reo.js",n.async=!0,n.onload=t,document.head.appendChild(n)}();
+      }
+    </script>
+    <!-- End of Reo Javascript -->
   </head>
 
   <body class="appsmith-light-theme">

diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/PluginActionForm.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/PluginActionForm.tsx
@@ -1,10 +1,16 @@
 import React from "react";
+import APIEditorForm from "./components/APIEditorForm";
+import { Flex } from "@appsmith/ads";
 import { useChangeActionCall } from "./hooks/useChangeActionCall";
 
 const PluginActionForm = () => {
   useChangeActionCall();
 
-  return <div />;
+  return (
+    <Flex p="spaces-2" w="100%">
+      <APIEditorForm />
+    </Flex>
+  );
 };
 
 export default PluginActionForm;
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/APIEditorForm.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/APIEditorForm.tsx
@@ -0,0 +1,55 @@
+import React from "react";
+import CommonEditorForm from "./CommonEditorForm";
+import { usePluginActionContext } from "PluginActionEditor";
+import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
+import { API_EDITOR_FORM_NAME } from "ee/constants/forms";
+import { HTTP_METHOD_OPTIONS } from "constants/ApiEditorConstants/CommonApiConstants";
+import PostBodyData from "pages/Editor/APIEditor/PostBodyData";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import { getHasManageActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
+import Pagination from "pages/Editor/APIEditor/Pagination";
+import { noop } from "lodash";
+import { reduxForm } from "redux-form";
+
+const FORM_NAME = API_EDITOR_FORM_NAME;
+
+const APIEditorForm = () => {
+  const { action } = usePluginActionContext();
+  const theme = EditorTheme.LIGHT;
+
+  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
+  const isChangePermitted = getHasManageActionPermission(
+    isFeatureEnabled,
+    action.userPermissions,
+  );
+
+  return (
+    <CommonEditorForm
+      action={action}
+      bodyUIComponent={
+        <PostBodyData
+          dataTreePath={`${action.name}.config`}
+          theme={EditorTheme.LIGHT}
+        />
+      }
+      formName={FORM_NAME}
+      headersCount={0}
+      httpMethodOptions={HTTP_METHOD_OPTIONS}
+      isChangePermitted={isChangePermitted}
+      paginationUiComponent={
+        <Pagination
+          actionName={action.name}
+          onTestClick={noop}
+          paginationType={action.actionConfiguration.paginationType}
+          theme={theme}
+        />
+      }
+      paramsCount={0}
+    />
+  );
+};
+
+export default reduxForm({ form: FORM_NAME, enableReinitialize: true })(
+  APIEditorForm,
+);
diff --git a/...ActionEditor/components/PluginActionForm/components/CommonEditorForm/CommonEditorForm.tsx b/...ActionEditor/components/PluginActionForm/components/CommonEditorForm/CommonEditorForm.tsx
@@ -0,0 +1,70 @@
+import React from "react";
+import { type Action } from "entities/Action";
+import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
+import type { AutoGeneratedHeader } from "pages/Editor/APIEditor/helpers";
+import { InfoFields } from "./InfoFields";
+import { RequestTabs } from "./RequestTabs";
+import { HintMessages } from "./HintMessages";
+import { Flex } from "@appsmith/ads";
+
+interface Props {
+  httpMethodOptions: { value: string }[];
+  action: Action;
+  formName: string;
+  isChangePermitted: boolean;
+  bodyUIComponent: React.ReactNode;
+  paginationUiComponent: React.ReactNode;
+  headersCount: number;
+  paramsCount: number;
+  // TODO: Fix this the next time the file is edited
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  datasourceHeaders?: any;
+  // TODO: Fix this the next time the file is edited
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  datasourceParams?: any;
+  // TODO: Fix this the next time the file is edited
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  actionConfigurationHeaders?: any;
+  // TODO: Fix this the next time the file is edited
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  actionConfigurationParams?: any;
+  autoGeneratedActionConfigHeaders?: AutoGeneratedHeader[];
+}
+
+const CommonEditorForm = (props: Props) => {
+  const { action } = props;
+  const hintMessages = action.messages || [];
+  const theme = EditorTheme.LIGHT;
+
+  return (
+    <Flex flexDirection="column" gap="spaces-3" w="100%">
+      <InfoFields
+        actionName={action.name}
+        changePermitted={props.isChangePermitted}
+        formName={props.formName}
+        options={props.httpMethodOptions}
+        pluginId={action.pluginId}
+        theme={theme}
+      />
+      <HintMessages hintMessages={hintMessages} />
+      <RequestTabs
+        actionConfigurationHeaders={props.actionConfigurationHeaders}
+        actionConfigurationParams={props.actionConfigurationParams}
+        actionName={action.name}
+        autogeneratedHeaders={props.autoGeneratedActionConfigHeaders}
+        bodyUIComponent={props.bodyUIComponent}
+        datasourceHeaders={props.datasourceHeaders}
+        datasourceParams={props.datasourceParams}
+        formName={props.formName}
+        headersCount={props.headersCount}
+        paginationUiComponent={props.paginationUiComponent}
+        paramsCount={props.paramsCount}
+        pushFields={props.isChangePermitted}
+        showSettings={false}
+        theme={theme}
+      />
+    </Flex>
+  );
+};
+
+export default CommonEditorForm;
diff --git a/...uginActionEditor/components/PluginActionForm/components/CommonEditorForm/HintMessages.tsx b/...uginActionEditor/components/PluginActionForm/components/CommonEditorForm/HintMessages.tsx
@@ -0,0 +1,18 @@
+import React from "react";
+import { Callout } from "@appsmith/ads";
+
+export function HintMessages(props: { hintMessages: string[] }) {
+  if (props.hintMessages.length === 0) {
+    return null;
+  }
+
+  return (
+    <>
+      {props.hintMessages.map((msg, i) => (
+        <Callout key={i} kind="info">
+          {msg}
+        </Callout>
+      ))}
+    </>
+  );
+}
diff --git a/...PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/InfoFields.tsx b/...PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/InfoFields.tsx
@@ -0,0 +1,50 @@
+import React from "react";
+import type { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
+import RequestDropdownField from "components/editorComponents/form/fields/RequestDropdownField";
+import { replayHighlightClass } from "globalStyles/portals";
+import EmbeddedDatasourcePathField from "components/editorComponents/form/fields/EmbeddedDatasourcePathField";
+import styled from "styled-components";
+import { Flex } from "@appsmith/ads";
+
+const DatasourceWrapper = styled.div`
+  margin-left: 8px;
+  width: 100%;
+`;
+
+export function InfoFields(props: {
+  changePermitted: boolean;
+  options: { value: string }[];
+  actionName: string;
+  pluginId: string;
+  formName: string;
+  theme: EditorTheme.LIGHT;
+}) {
+  return (
+    <Flex w="100%">
+      <div>
+        <RequestDropdownField
+          className={`t--apiFormHttpMethod ${replayHighlightClass}`}
+          data-location-id={btoa("actionConfiguration.httpMethod")}
+          disabled={!props.changePermitted}
+          name="actionConfiguration.httpMethod"
+          options={props.options}
+          placeholder="Method"
+          width={"110px"}
+        >
+          <div />
+        </RequestDropdownField>
+      </div>
+      <DatasourceWrapper className="t--dataSourceField">
+        <EmbeddedDatasourcePathField
+          actionName={props.actionName}
+          codeEditorVisibleOverflow
+          formName={props.formName}
+          name="actionConfiguration.path"
+          placeholder="https://mock-api.appsmith.com/users"
+          pluginId={props.pluginId}
+          theme={props.theme}
+        />
+      </DatasourceWrapper>
+    </Flex>
+  );
+}
diff --git a/...luginActionEditor/components/PluginActionForm/components/CommonEditorForm/RequestTabs.tsx b/...luginActionEditor/components/PluginActionForm/components/CommonEditorForm/RequestTabs.tsx
@@ -0,0 +1,137 @@
+import styled from "styled-components";
+import { Tab, TabPanel, Tabs, TabsList } from "@appsmith/ads";
+import FormLabel from "components/editorComponents/FormLabel";
+import type { AutoGeneratedHeader } from "pages/Editor/APIEditor/helpers";
+import type { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
+import React from "react";
+import { API_EDITOR_TABS } from "constants/ApiEditorConstants/CommonApiConstants";
+import { DatasourceConfig } from "./components/DatasourceConfig";
+import KeyValueFieldArray from "components/editorComponents/form/fields/KeyValueFieldArray";
+import ApiAuthentication from "pages/Editor/APIEditor/ApiAuthentication";
+import ActionSettings from "pages/Editor/ActionSettings";
+import { API_EDITOR_TAB_TITLES, createMessage } from "ee/constants/messages";
+import { useSelectedFormTab } from "./hooks/useSelectedFormTab";
+
+const SettingsWrapper = styled.div`
+  padding: var(--ads-v2-spaces-4) 0;
+  height: 100%;
+
+  ${FormLabel} {
+    padding: 0;
+  }
+`;
+const TabsListWrapper = styled.div`
+  padding: 0 var(--ads-v2-spaces-7);
+`;
+const StyledTabPanel = styled(TabPanel)`
+  height: calc(100% - 50px);
+  overflow: auto;
+  padding: 0 var(--ads-v2-spaces-7);
+`;
+
+export function RequestTabs(props: {
+  autogeneratedHeaders: AutoGeneratedHeader[] | undefined;
+  // TODO: Fix this the next time the file is edited
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  datasourceHeaders: any;
+  // TODO: Fix this the next time the file is edited
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  actionConfigurationHeaders: any;
+  headersCount: number;
+  actionName: string;
+  pushFields: boolean;
+  theme: EditorTheme.LIGHT;
+  // TODO: Fix this the next time the file is edited
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  datasourceParams: any;
+  // TODO: Fix this the next time the file is edited
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  actionConfigurationParams: any;
+  paramsCount: number;
+  bodyUIComponent: React.ReactNode;
+  paginationUiComponent: React.ReactNode;
+  formName: string;
+  showSettings: boolean;
+  // TODO: Fix this the next time the file is edited
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  actionSettingsConfig?: any;
+}) {
+  const [value, onValueChange] = useSelectedFormTab();
+
+  return (
+    <Tabs className="h-full" onValueChange={onValueChange} value={value}>
+      <TabsListWrapper>
+        <TabsList>
+          {Object.values(API_EDITOR_TABS).map((tab) => (
+            <Tab
+              data-testid={`t--api-editor-${tab}`}
+              key={tab}
+              notificationCount={
+                tab == "HEADERS"
+                  ? props.headersCount
+                  : tab == "PARAMS"
+                    ? props.paramsCount
+                    : undefined
+              }
+              value={tab}
+            >
+              {createMessage(API_EDITOR_TAB_TITLES[tab])}
+            </Tab>
+          ))}
+        </TabsList>
+      </TabsListWrapper>
+      <StyledTabPanel value={API_EDITOR_TABS.HEADERS}>
+        <DatasourceConfig
+          attributeName="header"
+          autogeneratedHeaders={props.autogeneratedHeaders}
+          data={props.datasourceHeaders}
+        />
+        <KeyValueFieldArray
+          actionConfig={props.actionConfigurationHeaders}
+          dataTreePath={`${props.actionName}.config.headers`}
+          hideHeader
+          label="Headers"
+          name="actionConfiguration.headers"
+          placeholder="Value"
+          pushFields={props.pushFields}
+          theme={props.theme}
+        />
+      </StyledTabPanel>
+      <StyledTabPanel value={API_EDITOR_TABS.PARAMS}>
+        <DatasourceConfig
+          attributeName={"param"}
+          data={props.datasourceParams}
+        />
+        <KeyValueFieldArray
+          actionConfig={props.actionConfigurationParams}
+          dataTreePath={`${props.actionName}.config.queryParameters`}
+          hideHeader
+          label="Params"
+          name="actionConfiguration.queryParameters"
+          pushFields={props.pushFields}
+          theme={props.theme}
+        />
+      </StyledTabPanel>
+      <StyledTabPanel className="h-full" value={API_EDITOR_TABS.BODY}>
+        {props.bodyUIComponent}
+      </StyledTabPanel>
+      <StyledTabPanel value={API_EDITOR_TABS.PAGINATION}>
+        {props.paginationUiComponent}
+      </StyledTabPanel>
+      <StyledTabPanel value={API_EDITOR_TABS.AUTHENTICATION}>
+        <ApiAuthentication formName={props.formName} />
+      </StyledTabPanel>
+      {props.showSettings ? (
+        <StyledTabPanel value={API_EDITOR_TABS.SETTINGS}>
+          <SettingsWrapper>
+            <ActionSettings
+              actionSettingsConfig={props.actionSettingsConfig}
+              formName={props.formName}
+              theme={props.theme}
+            />
+          </SettingsWrapper>
+        </StyledTabPanel>
+      ) : null}
+    </Tabs>
+  );
+}