From 3c4b8611e94a5a36a3fd71a9f1a00ff275edbc46 Mon Sep 17 00:00:00 2001
From: Surendran <surendran@hasura.io>
Date: Wed, 23 Jan 2019 14:53:10 +0530
Subject: [PATCH 1/6] Ui fixes for console

---
 .../Services/Data/TableBrowseRows/ReactTableFix.css       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/console/src/components/Services/Data/TableBrowseRows/ReactTableFix.css b/console/src/components/Services/Data/TableBrowseRows/ReactTableFix.css
index 8e698cbb4fb60..781e41deb3c37 100644
--- a/console/src/components/Services/Data/TableBrowseRows/ReactTableFix.css
+++ b/console/src/components/Services/Data/TableBrowseRows/ReactTableFix.css
@@ -1,3 +1,7 @@
+.ReactTable
+{
+  border: 0;
+}
 .ReactTable .-pagination .-btn {
   height: 35px !important;
   width: 40%;
@@ -53,12 +57,14 @@
 .ReactTable .rt-table .rt-tbody
 {
   margin-bottom: 10px;
+  border: solid 1px rgba(0,0,0,0.05);
 }
 
 .ReactTable .rt-tbody .rt-tr-group:last-child
 {
-  border-bottom: solid 1px rgba(0,0,0,0.05);
+    border-bottom: solid 1px rgba(0,0,0,0.05);
 }
+
 .ReactTable .rt-table .rt-tbody .rt-tr-group .rt-tr.-even:hover {
   background-color: #ebf7de;
 }

From 84033e479a04035c440510a7d4166bcba55a1208 Mon Sep 17 00:00:00 2001
From: Surendran <surendran@hasura.io>
Date: Wed, 23 Jan 2019 16:12:27 +0530
Subject: [PATCH 2/6] UI fixes for sidebar scroll, table and api explorer page
 text box read only

---
 .../src/components/ApiExplorer/ApiExplorer.scss  |  7 ++++---
 console/src/components/ApiExplorer/ApiRequest.js |  4 ++--
 console/src/components/Common/Common.scss        | 16 ++++++++++++++++
 .../Services/Data/PageContainer/PageContainer.js |  3 +--
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/console/src/components/ApiExplorer/ApiExplorer.scss b/console/src/components/ApiExplorer/ApiExplorer.scss
index e8e273b0f3613..4655c952133d8 100644
--- a/console/src/components/ApiExplorer/ApiExplorer.scss
+++ b/console/src/components/ApiExplorer/ApiExplorer.scss
@@ -32,10 +32,10 @@
   opacity: 0.1;
 }
 .panelInFocus {
-  
+
 }
 .requestInFocus {
-  
+
 }
 .cursorNotAllowed {
   cursor: not-allowed;
@@ -348,6 +348,8 @@
           border: 0;
           box-shadow: none;
           padding: 10px 12px;
+          height: auto;
+          background-color: #fff;
         }
       }
       .sendBtn
@@ -770,4 +772,3 @@ label
 
 
 }
-
diff --git a/console/src/components/ApiExplorer/ApiRequest.js b/console/src/components/ApiExplorer/ApiRequest.js
index 69122260b3404..516219f6f010b 100644
--- a/console/src/components/ApiExplorer/ApiRequest.js
+++ b/console/src/components/ApiExplorer/ApiRequest.js
@@ -143,10 +143,10 @@ class ApiRequest extends Component {
               onChange={this.onUrlChanged}
               value={this.props.url}
               type="text"
+              readonly="readonly"
               className={
                 styles.inputGroupInput +
-                ' form-control ' +
-                styles.cursorNotAllowed
+                ' form-control '
               }
             />
           </div>
diff --git a/console/src/components/Common/Common.scss b/console/src/components/Common/Common.scss
index fcd625170d96f..574de3ac5b4eb 100644
--- a/console/src/components/Common/Common.scss
+++ b/console/src/components/Common/Common.scss
@@ -14,6 +14,22 @@ h1, .h1, h2, .h2, h3, .h3, h4, .h4, h5, .h5, h6, .h6
   font-size: 40px;
   text-align: center;
 }
+input::-moz-focus-inner {
+ outline: 0;
+ -moz-outline: none;
+ border:0;
+}
+select:-moz-focusring
+{
+  color: transparent;
+  text-shadow: 0 0 0 #000;
+}
+select::-moz-focus-inner {
+ outline: 0;
+ -moz-outline: none;
+ border: 0;
+}
+option::-moz-focus-inner { border: 0; outline: 0 }
 table thead tr th
 {
   background-color: #F2F2F2 !important;
diff --git a/console/src/components/Services/Data/PageContainer/PageContainer.js b/console/src/components/Services/Data/PageContainer/PageContainer.js
index 101acb69f2c9c..7c44d15c91517 100644
--- a/console/src/components/Services/Data/PageContainer/PageContainer.js
+++ b/console/src/components/Services/Data/PageContainer/PageContainer.js
@@ -137,7 +137,7 @@ const PageContainer = ({
             <div
               className={
                 'col-xs-4 text-center ' +
-                styles.padd_remove +
+                styles.padd_left_remove +
                 ' ' +
                 styles.sidebarCreateTable
               }
@@ -147,7 +147,6 @@ const PageContainer = ({
                 to={'/data/schema/' + schemaName + '/table/add'}
               >
                 <Button
-                  className={styles.add_mar_right}
                   size="xs"
                   color="white"
                   data-test="sidebar-add-table"

From a0a42edeeadb953669f4fe527b122d09aee43f1d Mon Sep 17 00:00:00 2001
From: Surendran <surendran@hasura.io>
Date: Thu, 24 Jan 2019 12:03:25 +0530
Subject: [PATCH 3/6] Api explorer input box readonly

---
 console/src/components/ApiExplorer/ApiRequest.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/console/src/components/ApiExplorer/ApiRequest.js b/console/src/components/ApiExplorer/ApiRequest.js
index 516219f6f010b..846b33b59c8c1 100644
--- a/console/src/components/ApiExplorer/ApiRequest.js
+++ b/console/src/components/ApiExplorer/ApiRequest.js
@@ -143,7 +143,7 @@ class ApiRequest extends Component {
               onChange={this.onUrlChanged}
               value={this.props.url}
               type="text"
-              readonly="readonly"
+              readOnly
               className={
                 styles.inputGroupInput +
                 ' form-control '

From 935b6ade606c265f48bfcefc1df392625110afb1 Mon Sep 17 00:00:00 2001
From: Surendran <surendran@hasura.io>
Date: Thu, 24 Jan 2019 15:37:45 +0530
Subject: [PATCH 4/6] No rows found fix

---
 .../src/components/Services/Data/TableBrowseRows/ViewRows.js    | 2 +-
 .../components/Services/EventTrigger/PendingEvents/ViewRows.js  | 2 +-
 .../Services/EventTrigger/ProcessedEvents/ViewRows.js           | 2 +-
 .../components/Services/EventTrigger/RunningEvents/ViewRows.js  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/console/src/components/Services/Data/TableBrowseRows/ViewRows.js b/console/src/components/Services/Data/TableBrowseRows/ViewRows.js
index 021dea6a321f0..27de6c6caf06e 100644
--- a/console/src/components/Services/Data/TableBrowseRows/ViewRows.js
+++ b/console/src/components/Services/Data/TableBrowseRows/ViewRows.js
@@ -478,7 +478,7 @@ const ViewRows = ({
           <Spinner />{' '}
         </div>
       );
-    } else if (count === 0) {
+    } else if (newCurRows.length === 0) {
       return <div> No rows found. </div>;
     }
     let shouldSortColumn = true;
diff --git a/console/src/components/Services/EventTrigger/PendingEvents/ViewRows.js b/console/src/components/Services/EventTrigger/PendingEvents/ViewRows.js
index 1f89243ec31df..267e951c91281 100644
--- a/console/src/components/Services/EventTrigger/PendingEvents/ViewRows.js
+++ b/console/src/components/Services/EventTrigger/PendingEvents/ViewRows.js
@@ -205,7 +205,7 @@ const ViewRows = ({
   };
 
   const renderTableBody = () => {
-    if (count === 0) {
+    if (newCurRows.length === 0) {
       return <div> No rows found. </div>;
     }
     let shouldSortColumn = true;
diff --git a/console/src/components/Services/EventTrigger/ProcessedEvents/ViewRows.js b/console/src/components/Services/EventTrigger/ProcessedEvents/ViewRows.js
index 8cebdc552ef12..b3c7c55df0197 100644
--- a/console/src/components/Services/EventTrigger/ProcessedEvents/ViewRows.js
+++ b/console/src/components/Services/EventTrigger/ProcessedEvents/ViewRows.js
@@ -223,7 +223,7 @@ const ViewRows = ({
   };
 
   const renderTableBody = () => {
-    if (count === 0) {
+    if (newCurRows.length === 0) {
       return <div> No rows found. </div>;
     }
     let shouldSortColumn = true;
diff --git a/console/src/components/Services/EventTrigger/RunningEvents/ViewRows.js b/console/src/components/Services/EventTrigger/RunningEvents/ViewRows.js
index 2a8a1914cfcdf..fcb3a1d9b663f 100644
--- a/console/src/components/Services/EventTrigger/RunningEvents/ViewRows.js
+++ b/console/src/components/Services/EventTrigger/RunningEvents/ViewRows.js
@@ -211,7 +211,7 @@ const ViewRows = ({
           <Spinner />{' '}
         </div>
       );
-    } else if (count === 0) {
+    } else if (newCurRows.length === 0) {
       return <div> No rows found. </div>;
     }
     let shouldSortColumn = true;

From 02be5320234466e88b91c9e7a0a24bd86a4ce6b1 Mon Sep 17 00:00:00 2001
From: Surendran <surendran@hasura.io>
Date: Thu, 24 Jan 2019 17:29:10 +0530
Subject: [PATCH 5/6] Table scroll fix in firefox

---
 .../Services/Data/TableBrowseRows/ReactTableFix.css    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/console/src/components/Services/Data/TableBrowseRows/ReactTableFix.css b/console/src/components/Services/Data/TableBrowseRows/ReactTableFix.css
index 781e41deb3c37..0948a315fd62f 100644
--- a/console/src/components/Services/Data/TableBrowseRows/ReactTableFix.css
+++ b/console/src/components/Services/Data/TableBrowseRows/ReactTableFix.css
@@ -58,8 +58,14 @@
 {
   margin-bottom: 10px;
   border: solid 1px rgba(0,0,0,0.05);
+  min-width: fit-content !important;
+  min-width: -moz-fit-content !important;
+  min-width: -webkit-fit-content !important;
+  min-width: -o-fit-content !important;
+}
+.ReactTable .rt-table .rt-thead {
+  /* min-width: 1150px !important; */
 }
-
 .ReactTable .rt-tbody .rt-tr-group:last-child
 {
     border-bottom: solid 1px rgba(0,0,0,0.05);
@@ -69,7 +75,7 @@
   background-color: #ebf7de;
 }
 
-.ReactTable .rt-tbody {
+.ReactTable .rt-table .rt-tbody {
   overflow-x: hidden !important;
   min-width: fit-content !important;
 }

From 3e47bcd4d23ff4e51af1413e3d2e70d4ba9aaee8 Mon Sep 17 00:00:00 2001
From: Surendran <surendran@hasura.io>
Date: Thu, 24 Jan 2019 21:36:03 +0530
Subject: [PATCH 6/6] Event trigger page sidebar scroll and table head fix

---
 .../Services/Data/TableBrowseRows/ReactTableFix.css        | 7 ++++++-
 .../Services/EventTrigger/PageContainer/PageContainer.js   | 5 ++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/console/src/components/Services/Data/TableBrowseRows/ReactTableFix.css b/console/src/components/Services/Data/TableBrowseRows/ReactTableFix.css
index 0948a315fd62f..faa0651a0f855 100644
--- a/console/src/components/Services/Data/TableBrowseRows/ReactTableFix.css
+++ b/console/src/components/Services/Data/TableBrowseRows/ReactTableFix.css
@@ -64,7 +64,12 @@
   min-width: -o-fit-content !important;
 }
 .ReactTable .rt-table .rt-thead {
-  /* min-width: 1150px !important; */
+  min-width: fit-content !important;
+  min-width: -moz-fit-content !important;
+  min-width: -webkit-fit-content !important;
+  min-width: -o-fit-content !important;
+  border-right: solid 1px #f2f2f2;
+  border-left: solid 1px #f2f2f2;
 }
 .ReactTable .rt-tbody .rt-tr-group:last-child
 {
diff --git a/console/src/components/Services/EventTrigger/PageContainer/PageContainer.js b/console/src/components/Services/EventTrigger/PageContainer/PageContainer.js
index cc504f82fc3e0..3e5c95d0b8922 100644
--- a/console/src/components/Services/EventTrigger/PageContainer/PageContainer.js
+++ b/console/src/components/Services/EventTrigger/PageContainer/PageContainer.js
@@ -94,7 +94,7 @@ const PageContainer = ({
         <div className={styles.sidebarHeadingWrapper}>
           <div
             className={
-              'col-xs-8 ' +
+              'col-xs-7 ' +
               styles.sidebarHeading +
               ' ' +
               styles.padd_left_remove
@@ -105,7 +105,7 @@ const PageContainer = ({
           {migrationMode ? (
             <div
               className={
-                'col-xs-4 text-center ' +
+                'col-xs-5 text-center ' +
                 styles.padd_remove +
                 ' ' +
                 styles.sidebarCreateTable
@@ -116,7 +116,6 @@ const PageContainer = ({
                 to={'/events/manage/triggers/add'}
               >
                 <Button
-                  className={styles.add_mar_right}
                   color="white"
                   size="xs"
                   data-test="sidebar-add-table"