Improved navigation and filtering implementation

pages/Sales/Sales.json

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

pages/Sales/widgets/Heading.json

@@ -1,7 +1,7 @@
 {
   "animateLoading": true,
   "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
-  "bottomRow": 7,
+  "bottomRow": 11,
   "dynamicBindingPathList": [
     {
       "key": "truncateButtonColor"
@@ -30,8 +30,8 @@
   "mobileRightColumn": 17,
   "mobileTopRow": 1,
   "needsErrorInfo": false,
-  "originalBottomRow": 7,
-  "originalTopRow": 2,
+  "originalBottomRow": 11,
+  "originalTopRow": 3,
   "overflow": "NONE",
   "parentColumnSpace": 25.109375,
   "parentId": "0",
@@ -43,7 +43,7 @@
   "text": "Sales / Capacity Planning",
   "textAlign": "LEFT",
   "textColor": "#231F20",
-  "topRow": 2,
+  "topRow": 3,
   "truncateButtonColor": "{{appsmith.theme.colors.primaryColor}}",
   "type": "TEXT_WIDGET",
   "version": 1,

pages/Sales/widgets/Navigation.json

@@ -1,93 +0,0 @@
-{
-  "animateLoading": true,
-  "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
-  "bottomRow": 13,
-  "boxShadow": "none",
-  "buttonVariant": "PRIMARY",
-  "childStylesheet": {
-    "button": {
-      "buttonColor": "{{appsmith.theme.colors.primaryColor}}"
-    }
-  },
-  "dynamicBindingPathList": [
-    {
-      "key": "borderRadius"
-    },
-    {
-      "key": "groupButtons.groupButton3.buttonColor"
-    }
-  ],
-  "dynamicTriggerPathList": [
-    {
-      "key": "groupButtons.groupButton1.onClick"
-    },
-    {
-      "key": "groupButtons.groupButton3.onClick"
-    }
-  ],
-  "groupButtons": {
-    "groupButton1": {
-      "buttonColor": "#d4d4d8",
-      "buttonType": "SIMPLE",
-      "disabledWhenInvalid": false,
-      "iconAlign": "right",
-      "id": "groupButton1",
-      "index": 0,
-      "isDisabled": false,
-      "isVisible": true,
-      "label": "Capacity Planning",
-      "menuItems": {},
-      "onClick": "{{navigateTo('Sales', {}, 'SAME_WINDOW');}}",
-      "placement": "CENTER",
-      "widgetId": ""
-    },
-    "groupButton3": {
-      "buttonColor": "{{appsmith.theme.colors.primaryColor}}",
-      "buttonType": "SIMPLE",
-      "disabledWhenInvalid": false,
-      "id": "groupButton3",
-      "index": 1,
-      "isDisabled": false,
-      "isVisible": true,
-      "label": "Units Shipped",
-      "menuItems": {
-        "menuItemr01yri5nag": {
-          "id": "menuItemr01yri5nag",
-          "index": 0,
-          "isDisabled": false,
-          "isVisible": true,
-          "label": "Menu Item",
-          "widgetId": "z3w4r50nta"
-        }
-      },
-      "onClick": "{{navigateTo('Sales - Units Shipped', {}, 'SAME_WINDOW');}}",
-      "placement": "CENTER",
-      "widgetId": ""
-    }
-  },
-  "isCanvas": false,
-  "isLoading": false,
-  "isVisible": true,
-  "key": "f10t84z5gq",
-  "leftColumn": 1,
-  "minWidth": 450,
-  "mobileBottomRow": 12,
-  "mobileLeftColumn": 1,
-  "mobileRightColumn": 25,
-  "mobileTopRow": 8,
-  "needsErrorInfo": false,
-  "orientation": "horizontal",
-  "originalBottomRow": 13,
-  "originalTopRow": 9,
-  "parentColumnSpace": 25.109375,
-  "parentId": "0",
-  "parentRowSpace": 10,
-  "renderMode": "CANVAS",
-  "responsiveBehavior": "fill",
-  "rightColumn": 25,
-  "topRow": 9,
-  "type": "BUTTON_GROUP_WIDGET",
-  "version": 1,
-  "widgetId": "6tlhfmvijp",
-  "widgetName": "Navigation"
-}

pages/Sales/widgets/Table1.json

@@ -4,7 +4,7 @@
   "borderColor": "#E0DEDE",
   "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
   "borderWidth": "1",
-  "bottomRow": 99,
+  "bottomRow": 97,
   "boxShadow": "{{appsmith.theme.boxShadow.appBoxShadow}}",
   "cachedTableData": {},
   "canFreezeColumn": true,
@@ -97,8 +97,8 @@
   "mobileRightColumn": 35,
   "mobileTopRow": 3,
   "needsErrorInfo": false,
-  "originalBottomRow": 99,
-  "originalTopRow": 15,
+  "originalBottomRow": 98,
+  "originalTopRow": 14,
   "parentColumnSpace": 11.265625,
   "parentId": "0",
   "parentRowSpace": 10,
@@ -234,7 +234,7 @@
   "searchKey": "",
   "tableData": "{{capacity_display_all.data}}",
   "textSize": "0.875rem",
-  "topRow": 15,
+  "topRow": 13,
   "totalRecordsCount": 0,
   "type": "TABLE_WIDGET_V2",
   "version": 2,