Merging changes from users developer branch to dev

pages/Dashboard/Dashboard.json

@@ -6,7 +6,7 @@
       {
         "dsl": {
           "backgroundColor": "none",
-          "bottomRow": 510,
+          "bottomRow": 540,
           "canExtend": true,
           "containerStyle": "none",
           "detachFromLayout": true,

pages/Dashboard/queries/fetch_users_in_country/fetch_users_in_country.txt

@@ -1,2 +1,2 @@
 SELECT * from public.users
-WHERE country = {{chart_users.selectedDataPoint?.x || "United States"}}
+WHERE country = {{chart1.selectedDataPoint?.x || "United States"}}

pages/Dashboard/queries/fetch_users_in_country/metadata.json

@@ -5,7 +5,7 @@
   "pluginType": "DB",
   "unpublishedAction": {
     "actionConfiguration": {
-      "body": "SELECT * from public.users\nWHERE country = {{chart_users.selectedDataPoint?.x || \"United States\"}}",
+      "body": "SELECT * from public.users\nWHERE country = {{chart1.selectedDataPoint?.x || \"United States\"}}",
       "encodeParamsToggle": true,
       "paginationType": "NONE",
       "pluginSpecifiedTemplates": [

pages/Dashboard/widgets/con_main/Text1.json

@@ -1,7 +1,7 @@
 {
   "animateLoading": true,
   "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
-  "bottomRow": 16,
+  "bottomRow": 17,
   "displayName": "Text",
   "dynamicBindingPathList": [
     {
@@ -63,11 +63,11 @@
     "Suggested",
     "Content"
   ],
-  "text": "Users in {{chart_users.selectedDataPoint?.x || \"United States\"}}",
+  "text": "Users in {{chart1.selectedDataPoint?.x || \"United States\"}}",
   "textAlign": "CENTER",
   "textColor": "#231F20",
   "thumbnailSVG": "/static/media/thumbnail.0c129b82c9b3e4cd4920563b289659ab.svg",
-  "topRow": 12,
+  "topRow": 13,
   "truncateButtonColor": "{{appsmith.theme.colors.primaryColor}}",
   "type": "TEXT_WIDGET",
   "version": 1,

pages/Dashboard/widgets/con_main/Text2.json

@@ -0,0 +1,52 @@
+{
+  "animateLoading": true,
+  "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+  "bottomRow": 4,
+  "dynamicBindingPathList": [
+    {
+      "key": "truncateButtonColor"
+    },
+    {
+      "key": "fontFamily"
+    },
+    {
+      "key": "borderRadius"
+    }
+  ],
+  "dynamicHeight": "AUTO_HEIGHT",
+  "dynamicTriggerPathList": [],
+  "fontFamily": "{{appsmith.theme.fontFamily.appFont}}",
+  "fontSize": "1rem",
+  "fontStyle": "BOLD",
+  "isLoading": false,
+  "isVisible": true,
+  "key": "rtj55a2fgp",
+  "leftColumn": 0,
+  "maxDynamicHeight": 9000,
+  "minDynamicHeight": 4,
+  "minWidth": 450,
+  "mobileBottomRow": 55,
+  "mobileLeftColumn": 0,
+  "mobileRightColumn": 16,
+  "mobileTopRow": 51,
+  "needsErrorInfo": false,
+  "originalBottomRow": 55,
+  "originalTopRow": 51,
+  "overflow": "NONE",
+  "parentColumnSpace": 10.6875,
+  "parentId": "5r11ctbsu9",
+  "parentRowSpace": 10,
+  "renderMode": "CANVAS",
+  "responsiveBehavior": "fill",
+  "rightColumn": 64,
+  "shouldTruncate": false,
+  "text": "This is user's production branch",
+  "textAlign": "CENTER",
+  "textColor": "#231F20",
+  "topRow": 0,
+  "truncateButtonColor": "{{appsmith.theme.colors.primaryColor}}",
+  "type": "TEXT_WIDGET",
+  "version": 1,
+  "widgetId": "ohnk7r02vj",
+  "widgetName": "Text2"
+}

pages/Dashboard/widgets/con_main/chart_users.json → pages/Dashboard/widgets/con_main/chart1.json

@@ -3,16 +3,16 @@
   "allowScroll": false,
   "animateLoading": true,
   "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
-  "bottomRow": 49,
-  "boxShadow": "none",
+  "bottomRow": 52,
+  "boxShadow": "{{appsmith.theme.boxShadow.appBoxShadow}}",
   "chartData": {
-    "po5ewapojv": {
-      "data": "{{fetch_user_stats.data.map((stat) => {\n  return {\n    x: stat.country || 'India',\n    y: stat.user_count\n  }\n})}}",
+    "c61onb1yqg": {
+      "data": "{{fetch_user_stats.data.map((stat) => ({\n    x: stat.country || 'India',\n    y: stat.user_count \n}))}}",
       "seriesName": ""
     }
   },
-  "chartName": "",
-  "chartType": "PIE_CHART",
+  "chartName": "Users By Country",
+  "chartType": "COLUMN_CHART",
   "customEChartConfig": "{{\n{\n  \"dataset\": {\n    \"source\": [\n      [\n        \"Day\",\n        \"Baidu\",\n        \"Google\",\n        \"Bing\"\n      ],\n      [\n        \"Mon\",\n        620,\n        120,\n        60\n      ],\n      [\n        \"Tue\",\n        732,\n        132,\n        72\n      ],\n      [\n        \"Wed\",\n        701,\n        101,\n        71\n      ],\n      [\n        \"Thu\",\n        734,\n        134,\n        74\n      ],\n      [\n        \"Fri\",\n        1090,\n        290,\n        190\n      ],\n      [\n        \"Sat\",\n        1130,\n        230,\n        130\n      ],\n      [\n        \"Sun\",\n        1120,\n        220,\n        110\n      ]\n    ]\n  },\n  \"tooltip\": {\n    \"trigger\": \"axis\",\n    \"axisPointer\": {\n      \"type\": \"shadow\"\n    }\n  },\n  \"title\": {\n    \"text\": \"Search Engine Usage\",\n    \"left\": \"center\",\n    \"textStyle\": {\n      \"width\": 200,\n      \"overflow\": \"truncate\"\n    }\n  },\n  \"legend\": {\n    \"top\": 40,\n    \"type\": \"scroll\"\n  },\n  \"grid\": {\n    \"left\": 15,\n    \"right\": 15,\n    \"bottom\": 30,\n    \"top\": 100,\n    \"containLabel\": true\n  },\n  \"xAxis\": [\n    {\n      \"type\": \"category\"\n    }\n  ],\n  \"yAxis\": [\n    {\n      \"type\": \"value\"\n    }\n  ],\n  \"series\": [\n    {\n      \"type\": \"bar\",\n      \"stack\": \"Search Engine\"\n    },\n    {\n      \"type\": \"bar\",\n      \"stack\": \"Search Engine\"\n    },\n    {\n      \"type\": \"bar\",\n      \"stack\": \"Search Engine\"\n    }\n  ]\n}\n}}",
   "customFusionChartConfig": {
     "dataSource": {
@@ -61,22 +61,29 @@
     },
     "type": "column2d"
   },
-  "displayName": "Chart",
   "dynamicBindingPathList": [
     {
       "key": "customEChartConfig"
     },
     {
       "key": "borderRadius"
     },
+    {
+      "key": "boxShadow"
+    },
     {
       "key": "accentColor"
     },
     {
       "key": "fontFamily"
     },
     {
-      "key": "chartData.po5ewapojv.data"
+      "key": "chartData.c61onb1yqg.data"
+    }
+  ],
+  "dynamicPropertyPathList": [
+    {
+      "key": "onDataPointClick"
     }
   ],
   "dynamicTriggerPathList": [
@@ -86,12 +93,9 @@
   ],
   "flexVerticalAlignment": "start",
   "fontFamily": "{{appsmith.theme.fontFamily.appFont}}",
-  "hideCard": false,
-  "iconSVG": "/static/media/icon.07abfb45c3867c2e1b1d5d4818b7078c.svg",
-  "isDeprecated": false,
   "isLoading": false,
   "isVisible": true,
-  "key": "c42gh41ssb",
+  "key": "i49t3gbwn1",
   "labelOrientation": "auto",
   "leftColumn": 0,
   "minWidth": 450,
@@ -100,37 +104,19 @@
   "mobileRightColumn": 24,
   "mobileTopRow": 16,
   "needsErrorInfo": true,
-  "onCanvasUI": {
-    "disableParentSelection": false,
-    "focusBGCSSVar": "--on-canvas-ui-widget-focus",
-    "focusColorCSSVar": "--on-canvas-ui-widget-selection",
-    "selectionBGCSSVar": "--on-canvas-ui-widget-selection",
-    "selectionColorCSSVar": "--on-canvas-ui-widget-focus"
-  },
   "onDataPointClick": "{{fetch_users_in_country.run()}}",
-  "originalBottomRow": 48,
-  "originalTopRow": 15,
-  "parentColumnSpace": 12.32666015625,
+  "parentColumnSpace": 10.375,
   "parentId": "5r11ctbsu9",
   "parentRowSpace": 10,
   "renderMode": "CANVAS",
   "responsiveBehavior": "fill",
   "rightColumn": 30,
-  "searchTags": [
-    "graph",
-    "visuals",
-    "visualisations"
-  ],
-  "showDataPointLabel": true,
-  "tags": [
-    "Display"
-  ],
-  "thumbnailSVG": "/static/media/thumbnail.98fb19b2c4f99671c0888284cf939f3a.svg",
-  "topRow": 16,
+  "showDataPointLabel": false,
+  "topRow": 20,
   "type": "CHART_WIDGET",
   "version": 1,
-  "widgetId": "rw9fdina5i",
-  "widgetName": "chart_users",
-  "xAxisName": "Product Line",
-  "yAxisName": "Revenue($)"
+  "widgetId": "4k1d0c07p1",
+  "widgetName": "chart1",
+  "xAxisName": "Country",
+  "yAxisName": "Number of Users"
 }

pages/Dashboard/widgets/con_main/con_main.json

@@ -4,12 +4,12 @@
   "borderColor": "#E0DEDE",
   "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
   "borderWidth": "1",
-  "bottomRow": 51,
+  "bottomRow": 54,
   "boxShadow": "{{appsmith.theme.boxShadow.appBoxShadow}}",
   "children": [
     {
       "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
-      "bottomRow": 510,
+      "bottomRow": 540,
       "boxShadow": "{{appsmith.theme.boxShadow.appBoxShadow}}",
       "canExtend": false,
       "containerStyle": "none",
@@ -95,7 +95,7 @@
     "selectionBGCSSVar": "--on-canvas-ui-widget-selection",
     "selectionColorCSSVar": "--on-canvas-ui-widget-focus"
   },
-  "originalBottomRow": 51,
+  "originalBottomRow": 54,
   "originalTopRow": 0,
   "parentColumnSpace": 28.734375,
   "parentId": "0",

pages/Dashboard/widgets/con_main/dat_bornAfter.json

@@ -2,7 +2,7 @@
   "accentColor": "{{appsmith.theme.colors.primaryColor}}",
   "animateLoading": true,
   "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
-  "bottomRow": 16,
+  "bottomRow": 20,
   "boxShadow": "none",
   "closeOnSelection": true,
   "dateFormat": "LL",
@@ -69,7 +69,7 @@
     "Inputs"
   ],
   "timePrecision": "minute",
-  "topRow": 9,
+  "topRow": 13,
   "type": "DATE_PICKER_WIDGET2",
   "version": 2,
   "widgetId": "5narj60vjc",

pages/Dashboard/widgets/con_main/div_header.json

@@ -1,6 +1,6 @@
 {
   "animateLoading": true,
-  "bottomRow": 9,
+  "bottomRow": 13,
   "capSide": 0,
   "capType": "nc",
   "displayName": "Divider",
@@ -36,7 +36,7 @@
     "Layout"
   ],
   "thickness": "1",
-  "topRow": 5,
+  "topRow": 9,
   "type": "DIVIDER_WIDGET",
   "version": 1,
   "widgetId": "n1xfrbcmf1",

pages/Dashboard/widgets/con_main/sel_gender.json

@@ -2,7 +2,7 @@
   "accentColor": "{{appsmith.theme.colors.primaryColor}}",
   "animateLoading": true,
   "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
-  "bottomRow": 16,
+  "bottomRow": 20,
   "boxShadow": "none",
   "defaultOptionValue": "",
   "displayName": "Select",
@@ -64,7 +64,7 @@
   ],
   "serverSideFiltering": false,
   "sourceData": "[\n  {\n    \"label\": \"Male\",\n    \"value\": \"male\"\n  },\n  {\n    \"label\": \"Female\",\n    \"value\": \"female\"\n  }\n]",
-  "topRow": 9,
+  "topRow": 13,
   "type": "SELECT_WIDGET",
   "version": 1,
   "widgetId": "i4k1hh3ckz",

pages/Dashboard/widgets/con_main/tbl_users.json

@@ -4,7 +4,7 @@
   "borderColor": "#E0DEDE",
   "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
   "borderWidth": "1",
-  "bottomRow": 49,
+  "bottomRow": 50,
   "boxShadow": "none",
   "canFreezeColumn": true,
   "childStylesheet": {
@@ -531,7 +531,7 @@
   ],
   "textSize": "0.875rem",
   "thumbnailSVG": "/static/media/thumbnail.d0492f06681daa69baf92b07d3829dfc.svg",
-  "topRow": 16,
+  "topRow": 17,
   "totalRecordsCount": 0,
   "type": "TABLE_WIDGET_V2",
   "version": 2,

pages/Dashboard/widgets/con_main/txt_title.json

@@ -1,7 +1,7 @@
 {
   "animateLoading": true,
   "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
-  "bottomRow": 5,
+  "bottomRow": 9,
   "displayName": "Text",
   "dynamicBindingPathList": [
     {
@@ -54,7 +54,7 @@
   "text": "User Stats",
   "textAlign": "LEFT",
   "textColor": "#231F20",
-  "topRow": 0,
+  "topRow": 4,
   "truncateButtonColor": "{{appsmith.theme.colors.primaryColor}}",
   "type": "TEXT_WIDGET",
   "version": 1,