Merge branch 'release' into feature/add-s3-crud-support

Author: Rishabh-Rathod

app/client/.eslintrc.json

@@ -35,7 +35,10 @@
     "react/jsx-sort-props": "error",
     "react/jsx-fragments": "error",
     "react/jsx-no-useless-fragment": "error",
-    "sort-destructure-keys/sort-destructure-keys": ["error", {"caseSensitive": false}]
+    "sort-destructure-keys/sort-destructure-keys": ["error", {"caseSensitive": false}],
+    "no-console": ["error", {
+      "allow": ["error"]
+    }]
   },
   "settings": {
     "react": {

app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Datasources/MockDatasource_spec.js

@@ -8,6 +8,7 @@ describe("Create, test, save then delete a user mock datasource", function() {
   it("Create, test, save then delete a user mock datasource", function() {
     cy.NavigateToDatasourceEditor();
     cy.get(datasource.mockUserDatabase).click();
+    cy.wait(1000);
     cy.get(datasource.mockUserDatasources)
       .last()
       .click({ force: true });
@@ -18,6 +19,7 @@ describe("Create, test, save then delete a user mock datasource", function() {
   it("Create with whitespaces in host address and database name, test, save then delete a user mock datasource", function() {
     cy.NavigateToDatasourceEditor();
     cy.get(datasource.mockUserDatabase).click();
+    cy.wait(1000);
     cy.get(datasource.mockUserDatasources)
       .last()
       .click({ force: true });

app/client/cypress/locators/DatasourcesEditor.json

@@ -47,6 +47,6 @@
   "basic": "//div[contains(@class,'option') and text()='Basic']",
   "basicUsername": "input[name='authentication.username']",
   "basicPassword": "input[name='authentication.password']",
-  "mockUserDatabase":"div[id='mock-database'] span:contains('users')",
-  "mockUserDatasources":".t--datasource-name:contains('USERS - Mock')"
+  "mockUserDatabase":"div[id='mock-database'] span:contains('Users')",
+  "mockUserDatasources":".t--datasource-name:contains('Users')"
 }

app/client/src/api/ApiUtils.ts

@@ -139,6 +139,6 @@ export const apiFailureResponseInterceptor = (error: any) => {
     // Something happened in setting up the request that triggered an Error
     log.error("Error", error.message);
   }
-  console.log(error.config);
+  log.debug(error.config);
   return Promise.resolve(error);
 };

app/client/src/comments/AppComments/AppCommentsFilterPopover.tsx

@@ -17,6 +17,7 @@ import {
 } from "actions/commentActions";
 
 import "@blueprintjs/popover2/lib/css/blueprint-popover2.css";
+import log from "loglevel";
 
 export const options = [
   { label: "Show all comments", value: "show-all" },
@@ -49,7 +50,7 @@ const useSetResolvedFilterFromQuery = () => {
   useEffect(() => {
     const url = new URL(window.location.href);
     const searchParams = url.searchParams;
-    console.log(window.location.href, "window.location.href");
+    log.debug(window.location.href, "window.location.href");
     if (searchParams.get("isResolved")) {
       dispatch(setShouldShowResolvedComments(true));
     }

app/client/src/components/ads/Button.tsx

@@ -62,6 +62,7 @@ type ButtonProps = CommonComponentProps & {
   tag?: "a" | "button";
   type?: "submit" | "reset" | "button";
   target?: string;
+  width?: string;
 };
 
 const defaultProps = {
@@ -292,7 +293,8 @@ const btnFontStyles = (props: ThemeProp & ButtonProps): BtnFontType => {
 };
 
 const ButtonStyles = css<ThemeProp & ButtonProps>`
-  width: ${(props) => (props.fill ? "100%" : "auto")};
+  width: ${(props) =>
+    props.width ? props.width : props.fill ? "100%" : "auto"};
   height: ${(props) => btnFontStyles(props).height}px;
   border: none;
   text-decoration: none;

app/client/src/components/designSystems/appsmith/IconButtonComponent.tsx

@@ -226,7 +226,6 @@ function IconButtonComponent(props: IconButtonComponentProps) {
    * we will use that for the dimension of the widget
    */
   const dimension = useMemo(() => {
-    console.log({ width, height });
     if (width > height) {
       return height - WIDGET_PADDING * 2;
     }

app/client/src/components/designSystems/appsmith/TableComponent/CascadeFields.tsx

@@ -215,7 +215,7 @@ function RenderOptions(props: {
     trigger: {
       content: (
         <DropdownTrigger className={props.className}>
-          <AutoToolTipComponentWrapper isCellVisible title={selectedValue}>
+          <AutoToolTipComponentWrapper title={selectedValue}>
             {selectedValue}
           </AutoToolTipComponentWrapper>
           <Icon color={Colors.SLATE_GRAY} icon="caret-down" iconSize={16} />

app/client/src/components/designSystems/blueprint/InputComponent.test.tsx

@@ -5,6 +5,7 @@ import InputComponent from "components/designSystems/blueprint/InputComponent";
 import { Provider } from "react-redux";
 import ReactDOM from "react-dom";
 import { act } from "react-dom/test-utils";
+import { noop } from "utils/AppsmithUtils";
 
 let container: HTMLDivElement | null;
 
@@ -30,15 +31,9 @@ describe("<InputComponent />", () => {
               isLoading={false}
               label="label"
               multiline
-              onCurrencyTypeChange={(code?: string) => {
-                console.log(code);
-              }}
-              onFocusChange={(state: boolean) => {
-                console.log(state);
-              }}
-              onValueChange={(valueAsString: string) => {
-                console.log(valueAsString);
-              }}
+              onCurrencyTypeChange={noop}
+              onFocusChange={noop}
+              onValueChange={noop}
               showError={false}
               value="something"
               widgetId="24234r35"

app/client/src/components/propertyControls/IconSelectControl.tsx

@@ -101,10 +101,6 @@ class IconSelectControl extends BaseControl<
   componentDidMount() {
     this.timer = setTimeout(() => {
       const iconSelectTargetElement = this.iconSelectTargetRef.current;
-      console.log(
-        `target width: => `,
-        iconSelectTargetElement?.getBoundingClientRect().width,
-      );
       this.setState((prevState: IconSelectControlState) => {
         return {
           ...prevState,