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

Author: Rishabh-Rathod

app/client/cypress/fixtures/ChartDsl.json

@@ -63,6 +63,24 @@
         "bottomRow": 6,
         "parentId": "0",
         "widgetId": "y4gcv7cjg0"
+      },
+      {
+        "isVisible": true,
+        "inputType": "TEXT",
+        "label": "",
+        "widgetName": "Input2",
+        "version": 1,
+        "resetOnSubmit": true,
+        "type": "INPUT_WIDGET",
+        "isLoading": false,
+        "parentColumnSpace": 74,
+        "parentRowSpace": 40,
+        "leftColumn": 8,
+        "rightColumn": 13,
+        "topRow": 7,
+        "bottomRow": 7,
+        "parentId": "0",
+        "widgetId": "y4gcv7cjg1"
       }
     ]
   }

app/client/cypress/fixtures/application-file.json

@@ -1,5 +1,5 @@
 {
-    "appsmithVersion":"v1.5.13",
+    "appsmithVersion":"1.5.14",
     "exportedApplication": {
         "userPermissions": [
             "canComment:applications",

app/client/cypress/fixtures/testdata.json

@@ -116,6 +116,7 @@
   "dropdownErrorMsg": "This value does not evaluate to type \"Array<{ \"label\": \"string\", \"value\": \"string\" }>\".",
   "tableWidgetErrorMsg": "This value does not evaluate to type \"Array<Object>\".",
   "bindingDataPoint": "{{JSON.stringify(Chart1.selectedDataPoint)}}",
+  "bindingSeriesTitle": "{{Chart1.selectedDataPoint.seriesTitle",
   "bindChartData": "{{Chart1.selectedDataPoint",
   "appUrl": "https://oauth.mocklab.io/userinfo",
   "clientID": "169444434892406",

app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Chart_Data_point_spec.js

@@ -52,4 +52,13 @@ describe("Chart Widget Functionality", function() {
           });
       });
   });
+
+  it("Chart with seriesTitle feature validation", function() {
+    cy.SearchEntityandOpen("Input2");
+    cy.get(widgetsPage.defaultInput).type(testdata.bindingSeriesTitle);
+
+    cy.get(publish.inputWidget + " " + "input")
+      .last()
+      .should("have.value", dsl.dsl.children[0].chartData[0].seriesName);
+  });
 });

app/client/src/actions/commentActions.ts

@@ -265,3 +265,13 @@ export const incrementThreadUnreadCount = () => ({
 export const decrementThreadUnreadCount = () => ({
   type: ReduxActionTypes.DECREMENT_COMMENT_THREAD_UNREAD_COUNT,
 });
+
+export const deleteCommentThreadEvent = (thread: CommentThread) => ({
+  type: ReduxActionTypes.DELETE_COMMENT_THREAD_EVENT,
+  payload: thread,
+});
+
+export const deleteCommentEvent = (comment: Comment) => ({
+  type: ReduxActionTypes.DELETE_COMMENT_EVENT,
+  payload: comment,
+});

app/client/src/actions/gitSyncActions.ts

@@ -0,0 +1,6 @@
+import { ReduxActionTypes } from "constants/ReduxActionConstants";
+
+export const setIsGitSyncModalOpen = (isOpen: boolean) => ({
+  type: ReduxActionTypes.SET_IS_GIT_SYNC_MODAL_OPEN,
+  payload: isOpen,
+});

app/client/src/assets/icons/ads/check.svg

@@ -6,6 +6,7 @@ const StyledDialog = styled(Dialog)<{
   setMaxWidth?: boolean;
   width?: string;
   maxHeight?: string;
+  maxWidth?: string;
   showHeaderUnderline?: boolean;
 }>`
   && {
@@ -15,6 +16,7 @@ const StyledDialog = styled(Dialog)<{
     ${(props) => (props.maxHeight ? `max-height: ${props.maxHeight};` : "")}
     width: ${(props) => props.width || "640px"};
     ${(props) => props.setMaxWidth && `width: 100vh;`}
+    ${(props) => props.maxWidth && `max-width: ${props.maxWidth};`}
 
     & .${Classes.DIALOG_HEADER} {
       position: relative;
@@ -86,21 +88,24 @@ type DialogComponentProps = {
   width?: string;
   maxHeight?: string;
   onOpening?: () => void;
+  onClose?: () => void;
   setModalClose?: (close: boolean) => void;
   triggerZIndex?: number;
   showHeaderUnderline?: boolean;
   getHeader?: () => ReactNode;
   canEscapeKeyClose?: boolean;
   className?: string;
+  maxWidth?: string;
 };
 
 export function DialogComponent(props: DialogComponentProps) {
   const [isOpen, setIsOpen] = useState(!!props.isOpen);
 
-  const { setModalClose } = props;
+  const { onClose: onCloseProp, setModalClose } = props;
   const onClose = () => {
     setModalClose ? setModalClose(false) : null;
     setIsOpen(false);
+    onCloseProp && onCloseProp();
   };
 
   useEffect(() => {
@@ -128,6 +133,7 @@ export function DialogComponent(props: DialogComponentProps) {
         className={props.className}
         isOpen={isOpen}
         maxHeight={props.maxHeight}
+        maxWidth={props.maxWidth}
         onClose={onClose}
         onOpening={props.onOpening}
         setMaxWidth={props.setMaxWidth}