Merge branch 'release' of github.com:appsmithorg/appsmith into fix/edit-button-copy-text

Author: AmanAgarwal041

app/client/src/WidgetQueryGenerators/Snowflake/index.test.ts

@@ -1,5 +1,6 @@
 import { DatasourceConnectionMode } from "entities/Datasource";
 import Snowflake from ".";
+import { SSLType } from "entities/Datasource/RestAPIForm";
 
 describe("Snowflake WidgetQueryGenerator", () => {
   const initialValues = {
@@ -367,4 +368,36 @@ OFFSET
       },
     ]);
   });
+
+  test("should return provided connection mode when available", () => {
+    const datasourceConfiguration = {
+      connection: {
+        mode: DatasourceConnectionMode.READ_ONLY,
+        ssl: {
+          authType: SSLType.DEFAULT,
+          authTypeControl: false,
+          certificateFile: {
+            name: "",
+            base64Content: "",
+          },
+        },
+      },
+      url: "https://example.com",
+    };
+
+    const connectionMode = Snowflake.getConnectionMode(datasourceConfiguration);
+
+    expect(connectionMode).toEqual(DatasourceConnectionMode.READ_ONLY);
+  });
+
+  test("should return READ_WRITE as default when no connection mode is provided", () => {
+    const datasourceConfiguration = {
+      // No connection mode specified
+      url: "https://example.com",
+    };
+
+    const connectionMode = Snowflake.getConnectionMode(datasourceConfiguration);
+
+    expect(connectionMode).toEqual(DatasourceConnectionMode.READ_WRITE);
+  });
 });

app/client/src/WidgetQueryGenerators/Snowflake/index.ts

@@ -1,14 +1,17 @@
-import { BaseQueryGenerator } from "../BaseQueryGenerator";
+import {
+  DatasourceConnectionMode,
+  type DatasourceStorage,
+} from "entities/Datasource";
+import { without } from "lodash";
 import { formatDialect, snowflake } from "sql-formatter";
-import { QUERY_TYPE } from "../types";
+import { removeSpecialChars } from "utils/helpers";
+import { BaseQueryGenerator } from "../BaseQueryGenerator";
 import type {
+  ActionConfigurationSQL,
   WidgetQueryGenerationConfig,
   WidgetQueryGenerationFormConfig,
-  ActionConfigurationSQL,
 } from "../types";
-import { removeSpecialChars } from "utils/helpers";
-import { without } from "lodash";
-import { DatasourceConnectionMode } from "entities/Datasource";
+import { QUERY_TYPE } from "../types";
 
 export default abstract class Snowflake extends BaseQueryGenerator {
   private static buildSelect(
@@ -249,4 +252,13 @@ export default abstract class Snowflake extends BaseQueryGenerator {
   static getTotalRecordExpression(binding: string) {
     return `${binding}[0].count`;
   }
+
+  static getConnectionMode(
+    datasourceConfiguration: DatasourceStorage["datasourceConfiguration"],
+  ) {
+    return (
+      datasourceConfiguration?.connection?.mode ||
+      DatasourceConnectionMode.READ_WRITE
+    );
+  }
 }

app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/DropdownOption.tsx

@@ -22,27 +22,42 @@ const IconContainer = styled.div`
   align-items: center;
 `;
 
-const Label = styled.div`
+const LabelContainer = styled.div`
   width: calc(100% - 40px);
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+`;
+
+const Label = styled.div`
   overflow: hidden;
   text-overflow: ellipsis;
 `;
 
+const SubText = styled.span`
+  font-size: 12px;
+  color: var(--ads-v2-color-fg-muted);
+`;
+
 interface Props {
+  className?: string;
   label?: JSX.Element | string;
   leftIcon?: JSX.Element;
   rightIcon?: JSX.Element;
-  className?: string;
+  subText?: string;
 }
 
 export function DropdownOption(props: Props) {
-  const { className, label, leftIcon, rightIcon } = props;
+  const { className, label, leftIcon, rightIcon, subText } = props;
 
   return (
     <Container className={className}>
       <LeftSection>
         {leftIcon && <IconContainer>{leftIcon}</IconContainer>}
-        <Label>{label}</Label>
+        <LabelContainer>
+          <Label>{label}</Label>
+          {subText && <SubText>{subText}</SubText>}
+        </LabelContainer>
       </LeftSection>
       {rightIcon && <IconContainer>{rightIcon}</IconContainer>}
     </Container>

app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/index.tsx

@@ -1,11 +1,19 @@
 import React, { memo, useContext } from "react";
-import { ErrorMessage, Label, LabelWrapper, SelectWrapper } from "../../styles";
+import {
+  ErrorMessage,
+  Label,
+  LabelWrapper,
+  PrimaryKeysMessage,
+  SelectWrapper,
+} from "../../styles";
 import { useTableOrSpreadsheet } from "./useTableOrSpreadsheet";
 import { Select, Option, Tooltip } from "@appsmith/ads";
 import { DropdownOption } from "../DatasourceDropdown/DropdownOption";
 import type { DefaultOptionType } from "rc-select/lib/Select";
 import { ColumnSelectorModal } from "../ColumnSelectorModal";
 import { WidgetQueryGeneratorFormContext } from "components/editorComponents/WidgetQueryGeneratorForm/index";
+import { createMessage } from "ee/constants/messages";
+import { NO_PRIMARY_KEYS_MESSAGE, PRIMARY_KEYS_MESSAGE } from "../../constants";
 
 function TableOrSpreadsheetDropdown() {
   const {
@@ -55,17 +63,29 @@ function TableOrSpreadsheetDropdown() {
             return (
               <Option
                 data-testid="t--one-click-binding-table-selector--table"
+                disabled={option.disabled}
                 key={option.id}
                 value={option.value}
               >
-                <DropdownOption label={option.label} />
+                <DropdownOption
+                  label={option.label}
+                  subText={
+                    option.disabled
+                      ? createMessage(NO_PRIMARY_KEYS_MESSAGE)
+                      : undefined
+                  }
+                />
               </Option>
             );
           })}
         </Select>
         <ErrorMessage data-testid="t--one-click-binding-table-selector--error">
           {error}
         </ErrorMessage>
+
+        <PrimaryKeysMessage>
+          {createMessage(PRIMARY_KEYS_MESSAGE)}
+        </PrimaryKeysMessage>
       </SelectWrapper>
     );
   } else {