console: fix migration status in hasuradb mode, ui fixes, deps update (#32)

console/cypress/plugins/index.js

@@ -11,9 +11,8 @@
 // This function is called when a project is opened or re-opened (e.g. due to
 // the project's config changing)
 
-/*
-module.exports = (on, config) => {
+// module.exports = (on, config) => {
+module.exports = () => {
   // `on` is used to hook into various events Cypress emits
   // `config` is the resolved Cypress config
 };
-*/

console/package.json

@@ -150,12 +150,12 @@
     "sinon": "^1.17.7",
     "style-loader": "^0.20.3",
     "timekeeper": "1.0.0",
-    "uglifyjs-webpack-plugin": "^1.2.4",
+    "uglifyjs-webpack-plugin": "^1.2.7",
     "unused-files-webpack-plugin": "^3.4.0",
     "url-loader": "^1.0.1",
-    "webpack": "^4.1.1",
+    "webpack": "^4.14.0",
     "webpack-bundle-analyzer": "^2.9.1",
-    "webpack-cli": "^2.0.12",
+    "webpack-cli": "^3.0.8",
     "webpack-dev-middleware": "^3.1.3",
     "webpack-hot-middleware": "^2.22.2",
     "webpack-isomorphic-tools": "^3.0.5"

console/src/components/ApiExplorer/ApiExplorer.scss

@@ -36,6 +36,10 @@
 }
 .requestInFocus {
   
+}
+.cursorNotAllowed {
+  cursor: not-allowed;
+  pointer-events: none;
 }
 .apiExplorerWrapper
 {
@@ -280,7 +284,6 @@
     .apiRequestContent
     {
       font-size: 14px;
-      // padding-bottom: 10px;
       a
       {
         color: #FEC53D;

console/src/components/ApiExplorer/ApiRequest.js

@@ -110,15 +110,8 @@ class ApiRequest extends Component {
   };
 
   getUrlBar() {
-    const dropDown = require('./Dropdown.svg');
     const { explorerData, bodyType } = this.props;
 
-    /*
-    let isDisabled = false;
-    if (bodyType === 'graphql') {
-      isDisabled = true;
-    }
-    */
     return (
       <div
         id="stickyHeader"
@@ -131,29 +124,28 @@ class ApiRequest extends Component {
         }
       >
         <div className={'col-xs-12 ' + styles.padd_remove}>
-          <div className={'input-group ' + styles.inputGroupWrapper}>
-            <div className={'input-group-btn ' + styles.inputGroupBtn}>
-              <button
-                type="button"
-                className={'btn btn-default dropdown-toggle'}
-                data-toggle="dropdown"
+          <div
+            className={
+              'input-group ' +
+              styles.inputGroupWrapper +
+              ' ' +
+              styles.cursorNotAllowed
+            }
           >
+            <div className={'input-group-btn ' + styles.inputGroupBtn}>
+              <button type="button" className={'btn btn-default'}>
                 {this.props.method}
-                <span className={styles.caret}>
-                  <img
-                    className={'img-responsive'}
-                    src={dropDown}
-                    alt={'Drop down icon'}
-                  />
-                </span>
               </button>
-              <ul className={'dropdown-menu'}>{this.getHTTPMethods()}</ul>
             </div>
             <input
               onChange={this.onUrlChanged}
               value={this.props.url}
               type="text"
-              className={styles.inputGroupInput + ' form-control'}
+              className={
+                styles.inputGroupInput +
+                ' form-control ' +
+                styles.cursorNotAllowed
+              }
             />
           </div>
         </div>

console/src/components/Main/Main.js

@@ -4,7 +4,6 @@ import { Link } from 'react-router';
 import OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger';
 
 import * as tooltip from './Tooltips';
-import globals from 'Globals';
 import 'react-toggle/style.css';
 import Spinner from '../Common/Spinner/Spinner';
 
@@ -92,19 +91,7 @@ const Main = ({ children, location, migrationModeProgress, currentSchema }) => {
               </OverlayTrigger>
             </ul>
           </div>
-          <div className={styles.clusterInfoWrapper}>
-            <div className="dropdown">
-              <button
-                className={
-                  styles.clusterBtn + ' btn btn-secondary dropdown-toggle'
-                }
-                type="button"
-                id="dropdownMenuButton"
-              >
-                {globals.dataApiUrl}
-              </button>
-            </div>
-          </div>
+          <div className={styles.clusterInfoWrapper} />
         </div>
         <div className={styles.main + ' container-fluid'}>{mainContent}</div>
       </div>

console/src/components/Services/Data/Add/AddActions.js

@@ -182,7 +182,9 @@ const createTableSql = () => {
     const customOnSuccess = () => {
       dispatch(_push('/'));
       // update migration state
+      if (globals.consoleMode === 'cli') {
         dispatch(loadMigrationStatus());
+      }
       dispatch(showSuccessNotification('Table created!'));
       dispatch({ type: REQUEST_SUCCESS });
       dispatch({ type: SET_DEFAULTS });

console/src/components/Services/Data/Add/AddExistingTableViewActions.js

@@ -57,7 +57,9 @@ const addExistingTableSql = () => {
     const successMsg = 'Existing table/view added';
     const errorMsg = 'Adding existing table/view failed';
     const customOnSuccess = () => {
+      if (globals.consoleMode === 'cli') {
         dispatch(loadMigrationStatus());
+      }
       dispatch(showSuccessNotification('Existing table/view added!'));
       dispatch({ type: REQUEST_SUCCESS });
       dispatch(loadSchema()).then(() => {
@@ -145,7 +147,9 @@ const addAllUntrackedTablesSql = tableList => {
     const successMsg = 'Existing table/view added';
     const errorMsg = 'Adding existing table/view failed';
     const customOnSuccess = () => {
+      if (globals.consoleMode === 'cli') {
         dispatch(loadMigrationStatus());
+      }
       dispatch(showSuccessNotification('Existing table/view added!'));
       dispatch({ type: REQUEST_SUCCESS });
       dispatch(loadSchema()).then(() => {

console/src/components/Services/Data/DataActions.js

@@ -252,7 +252,9 @@ const makeMigrationCall = (
   };
 
   const onSuccess = () => {
-    dispatch(loadMigrationStatus());
+    if (globals.consoleMode === 'cli') {
+      dispatch(loadMigrationStatus()); // don't call for hasuradb mode
+    }
     dispatch(loadSchema());
     customOnSuccess();
     if (successMsg) {