From 1d96e30bd086222ecd0c18c27cd029ff4e8be29f Mon Sep 17 00:00:00 2001
From: rikinsk <rikin.kachhia@gmail.com>
Date: Tue, 7 May 2019 16:22:06 +0530
Subject: [PATCH 1/8] add schema create/delete options in console (WIP)

---
 .../components/Services/Data/Schema/Schema.js | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/console/src/components/Services/Data/Schema/Schema.js b/console/src/components/Services/Data/Schema/Schema.js
index e12c6902c432e..6adb23f69e8d2 100644
--- a/console/src/components/Services/Data/Schema/Schema.js
+++ b/console/src/components/Services/Data/Schema/Schema.js
@@ -45,6 +45,7 @@ class Schema extends Component {
 
     this.state = {
       isExporting: false,
+      createSchemaOpen: false,
     };
 
     // Initialize this table
@@ -182,6 +183,46 @@ class Schema extends Component {
         return <option key={s.schema_name}>{s.schema_name}</option>;
       });
 
+      const getCreateSchemaSection = () => {
+        const { createSchemaOpen } = this.state;
+
+        const handleCreateNewClick = () => {
+          this.setState({ createSchemaOpen: true });
+        };
+
+        const handleCreateClick = () => {}; // TODO
+
+        const closedCreateSection = (
+          <Button
+            color="white"
+            className={styles.add_mar_left}
+            size="xs"
+            onClick={handleCreateNewClick}
+          >
+            + Create new schema
+          </Button>
+        );
+
+        const openCreateSection = (
+          <div className={styles.inline_block + ' ' + styles.add_mar_left}>
+            <div className={styles.inline_block}>
+              <input
+                type="text"
+                placeholder="schema_name"
+                className={'form-control input-sm ' + styles.inline_block}
+              />
+            </div>
+            <Button color="white" size="xs" onClick={handleCreateClick}>
+              Create
+            </Button>
+          </div>
+        );
+
+        return createSchemaOpen ? openCreateSection : closedCreateSection;
+      };
+
+      const handleDelete = () => {}; // TODO
+
       return (
         <div className={styles.add_mar_top}>
           <div className={styles.display_inline}>Current Postgres schema</div>
@@ -194,6 +235,18 @@ class Schema extends Component {
               {schemaOptions}
             </select>
           </div>
+          <div className={styles.display_inline + ' ' + styles.add_mar_left}>
+            <div
+              className={styles.display_inline + ' ' + styles.cursorPointer}
+              title="Delete current schema"
+              onClick={handleDelete}
+            >
+              <i className="fa fa-trash" aria-hidden="true" />
+            </div>
+            <div className={styles.display_inline + ' ' + styles.add_mar_left}>
+              {getCreateSchemaSection()}
+            </div>
+          </div>
         </div>
       );
     };

From 2fdea20a89494807fa67c0e33c06b67dab13267c Mon Sep 17 00:00:00 2001
From: wawhal <rishichandra.wawhal@gmail.com>
Date: Tue, 14 May 2019 16:57:34 +0530
Subject: [PATCH 2/8] wire up functionality schema drop/create UI

---
 console/src/components/Common/Common.scss     |   8 ++
 .../Services/Data/Common/GraphQLValidation.js |  11 ++
 .../components/Services/Data/DataActions.js   |  11 ++
 .../Services/Data/Schema/Actions.js           | 122 ++++++++++++++++++
 .../components/Services/Data/Schema/Schema.js |  86 +++++++++---
 5 files changed, 218 insertions(+), 20 deletions(-)
 create mode 100644 console/src/components/Services/Data/Schema/Actions.js

diff --git a/console/src/components/Common/Common.scss b/console/src/components/Common/Common.scss
index c1efec5780076..7d5934662255a 100644
--- a/console/src/components/Common/Common.scss
+++ b/console/src/components/Common/Common.scss
@@ -496,6 +496,10 @@ input {
   margin-right: 20px !important;
 }
 
+.add_mar_right_mid {
+  margin-right: 10px !important;
+}
+
 .add_mar_right_small {
   margin-right: 5px !important;
 }
@@ -508,6 +512,10 @@ input {
   margin-left: 5px;
 }
 
+.add_mar_left_mid {
+  margin-left: 10px;
+}
+
 .add_mar_small {
   margin-right: 10px !important;
 }
diff --git a/console/src/components/Services/Data/Common/GraphQLValidation.js b/console/src/components/Services/Data/Common/GraphQLValidation.js
index 8ef982381fa69..200fccc0c757c 100644
--- a/console/src/components/Services/Data/Common/GraphQLValidation.js
+++ b/console/src/components/Services/Data/Common/GraphQLValidation.js
@@ -44,10 +44,21 @@ const gqlRelErrorNotif = [
   'Error renaming relationship!',
 ];
 
+const gqlSchemaErrorNotif = [
+  'Error creating schema!',
+  'Schema name cannot contain special characters',
+  '',
+  {
+    custom:
+      'Schema name cannot contain special characters. It can have alphabets, numbers (cannot start with numbers) and _ (can start with _)',
+  },
+];
+
 export default gqlPattern;
 export {
   gqlTableErrorNotif,
   gqlViewErrorNotif,
   gqlColumnErrorNotif,
   gqlRelErrorNotif,
+  gqlSchemaErrorNotif,
 };
diff --git a/console/src/components/Services/Data/DataActions.js b/console/src/components/Services/Data/DataActions.js
index 4dd35135940f0..32f4c6b7937ad 100644
--- a/console/src/components/Services/Data/DataActions.js
+++ b/console/src/components/Services/Data/DataActions.js
@@ -329,11 +329,22 @@ const fetchSchemaList = () => (dispatch, getState) => {
     headers: dataHeaders(getState),
     body: JSON.stringify(initQueries.schemaList),
   };
+  console.log('****************************');
+  console.log('Fetching schema list');
+  console.log('****************************');
   return dispatch(requestAction(url, options)).then(
     data => {
+      console.log('-----------------------------------========---');
+      console.log('Fetched schema');
+      console.log(data);
+      console.log('-------------------==========-------------------');
       dispatch({ type: FETCH_SCHEMA_LIST, schemaList: data });
     },
     error => {
+      console.log('---------------============----------------------');
+      console.log('Fetched errored schema');
+      console.log(error);
+      console.log('--------------------------============------------');
       console.error('Failed to fetch schema ' + JSON.stringify(error));
     }
   );
diff --git a/console/src/components/Services/Data/Schema/Actions.js b/console/src/components/Services/Data/Schema/Actions.js
new file mode 100644
index 0000000000000..c950342d286a2
--- /dev/null
+++ b/console/src/components/Services/Data/Schema/Actions.js
@@ -0,0 +1,122 @@
+import gqlPattern, { gqlSchemaErrorNotif } from '../Common/GraphQLValidation';
+import { showErrorNotification } from '../../Common/Notification';
+import { makeMigrationCall, fetchSchemaList } from '../DataActions';
+
+const getDropSchemaSql = schemaName => `drop schema "${schemaName}";`;
+
+const getCreateSchemaSql = schemaName => `create schema "${schemaName}";`;
+
+export const createNewSchema = (schemaName, successCb, errorCb) => {
+  return (dispatch, getState) => {
+    if (!gqlPattern.test(schemaName)) {
+      return dispatch(
+        showErrorNotification(
+          gqlSchemaErrorNotif[0],
+          gqlSchemaErrorNotif[1],
+          gqlSchemaErrorNotif[2],
+          gqlSchemaErrorNotif[3]
+        )
+      );
+    }
+
+    const migrationUp = [
+      {
+        type: 'run_sql',
+        args: {
+          sql: getCreateSchemaSql(schemaName),
+        },
+      },
+    ];
+
+    const migrationDown = [
+      {
+        type: 'run_sql',
+        args: {
+          sql: getDropSchemaSql(schemaName),
+        },
+      },
+    ];
+
+    const migrationName = `create_schema_${schemaName}`;
+    const requestMsg = 'Creating schema';
+    const successMsg = 'Successfully created schema';
+    const errorMsg = 'Error creating schema';
+
+    const customOnSuccess = () => {
+      dispatch(fetchSchemaList());
+      if (successCb) {
+        successCb();
+      }
+    };
+    const customOnError = () => {
+      if (errorCb) {
+        errorCb();
+      }
+    };
+
+    makeMigrationCall(
+      dispatch,
+      getState,
+      migrationUp,
+      migrationDown,
+      migrationName,
+      customOnSuccess,
+      customOnError,
+      requestMsg,
+      successMsg,
+      errorMsg
+    );
+  };
+};
+
+export const deleteCurrentSchema = (successCb, errorCb) => {
+  return (dispatch, getState) => {
+    const { currentSchema } = getState().tables;
+    if (currentSchema === 'public') {
+      return dispatch(showErrorNotification('Cannot drop schema public'));
+    }
+    const isOk = window.confirm(
+      `Are you sure you want the current postgres schema: "${currentSchema}"`
+    );
+    if (!isOk) {
+      return;
+    }
+    const migrationUp = [
+      {
+        type: 'run_sql',
+        args: {
+          sql: getDropSchemaSql(currentSchema),
+        },
+      },
+    ];
+    const migrationName = `drop_schema_${currentSchema}`;
+    const requestMsg = 'Dropping schema';
+    const successMsg = 'Successfully dropped schema';
+    const errorMsg = 'Error dropping schema';
+
+    const customOnSuccess = () => {
+      dispatch(fetchSchemaList());
+      if (successCb) {
+        successCb();
+      }
+    };
+    const customOnError = () => {
+      if (errorCb) {
+        errorCb();
+      }
+    };
+
+    makeMigrationCall(
+      dispatch,
+      getState,
+      migrationUp,
+      [],
+      migrationName,
+      customOnSuccess,
+      customOnError,
+      requestMsg,
+      successMsg,
+      errorMsg
+    );
+  };
+};
diff --git a/console/src/components/Services/Data/Schema/Schema.js b/console/src/components/Services/Data/Schema/Schema.js
index 6adb23f69e8d2..5d12f99b99546 100644
--- a/console/src/components/Services/Data/Schema/Schema.js
+++ b/console/src/components/Services/Data/Schema/Schema.js
@@ -35,6 +35,7 @@ import {
 } from '../TableRelationships/Actions';
 import globals from '../../../../Globals';
 import { getRelDef } from '../TableRelationships/utils';
+import { createNewSchema, deleteCurrentSchema } from './Actions';
 import CollapsibleToggle from '../../../Common/CollapsibleToggle/CollapsibleToggle';
 
 const appPrefix = globals.urlPrefix + '/data';
@@ -46,6 +47,7 @@ class Schema extends Component {
     this.state = {
       isExporting: false,
       createSchemaOpen: false,
+      schemaNameEdit: '',
     };
 
     // Initialize this table
@@ -91,19 +93,21 @@ class Schema extends Component {
 
     const styles = require('../../../Common/Layout/LeftSubSidebar/LeftSubSidebar.scss');
 
-    const handleSchemaChange = e => {
-      const updatedSchema = e.target.value;
-
-      dispatch(push(`${appPrefix}/schema/${updatedSchema}`));
+    const updateCurrentSchema = schemaName => {
+      dispatch(push(`${appPrefix}/schema/${schemaName}`));
 
       Promise.all([
-        dispatch({ type: UPDATE_CURRENT_SCHEMA, currentSchema: updatedSchema }),
+        dispatch({ type: UPDATE_CURRENT_SCHEMA, currentSchema: schemaName }),
         dispatch(fetchDataInit()),
         dispatch(fetchFunctionInit()),
         dispatch(loadUntrackedRelations()),
       ]);
     };
 
+    const handleSchemaChange = e => {
+      updateCurrentSchema(e.target.value);
+    };
+
     /***********/
 
     const getTrackableFunctions = () => {
@@ -158,7 +162,6 @@ class Schema extends Component {
       if (migrationMode) {
         const handleClick = e => {
           e.preventDefault();
-
           dispatch(push(`${appPrefix}/schema/${currentSchema}/table/add`));
         };
 
@@ -184,44 +187,81 @@ class Schema extends Component {
       });
 
       const getCreateSchemaSection = () => {
-        const { createSchemaOpen } = this.state;
+        const { createSchemaOpen, schemaNameEdit } = this.state;
 
         const handleCreateNewClick = () => {
           this.setState({ createSchemaOpen: true });
         };
 
-        const handleCreateClick = () => {}; // TODO
+        const handleSchemaNameChange = e => {
+          this.setState({ schemaNameEdit: e.target.value });
+        };
+
+        const handleCreateClick = () => {
+          const successCb = () => {
+            updateCurrentSchema(schemaNameEdit.trim());
+            this.setState({
+              schemaNameEdit: '',
+              createSchemaOpen: false,
+            });
+          };
+          dispatch(createNewSchema(schemaNameEdit.trim(), successCb));
+        };
 
         const closedCreateSection = (
-          <Button
-            color="white"
-            className={styles.add_mar_left}
-            size="xs"
-            onClick={handleCreateNewClick}
-          >
+          <Button color="white" size="xs" onClick={handleCreateNewClick}>
             + Create new schema
           </Button>
         );
 
+        const handleCancelCreateNewSchema = () => {
+          this.setState({
+            createSchemaOpen: false,
+          });
+        };
+
         const openCreateSection = (
-          <div className={styles.inline_block + ' ' + styles.add_mar_left}>
-            <div className={styles.inline_block}>
+          <div className={styles.inline_block}>
+            <div
+              className={`${styles.inline_block} ${styles.remove_pad_right} ${
+                styles.add_mar_right_mid
+              }`}
+            >
               <input
                 type="text"
+                value={schemaNameEdit}
+                onChange={handleSchemaNameChange}
                 placeholder="schema_name"
                 className={'form-control input-sm ' + styles.inline_block}
               />
             </div>
-            <Button color="white" size="xs" onClick={handleCreateClick}>
+            <Button
+              color="white"
+              size="xs"
+              onClick={handleCreateClick}
+              className={styles.add_mar_right_mid}
+            >
               Create
             </Button>
+            <Button
+              color="white"
+              size="xs"
+              onClick={handleCancelCreateNewSchema}
+            >
+              Cancel
+            </Button>
           </div>
         );
 
         return createSchemaOpen ? openCreateSection : closedCreateSection;
       };
 
-      const handleDelete = () => {}; // TODO
+      const handleDelete = () => {
+        const successCb = () => {
+          updateCurrentSchema('public');
+        };
+        dispatch(deleteCurrentSchema(successCb));
+      };
 
       return (
         <div className={styles.add_mar_top}>
@@ -235,7 +275,9 @@ class Schema extends Component {
               {schemaOptions}
             </select>
           </div>
-          <div className={styles.display_inline + ' ' + styles.add_mar_left}>
+          <div
+            className={styles.display_inline + ' ' + styles.add_mar_left_mid}
+          >
             <div
               className={styles.display_inline + ' ' + styles.cursorPointer}
               title="Delete current schema"
@@ -243,7 +285,11 @@ class Schema extends Component {
             >
               <i className="fa fa-trash" aria-hidden="true" />
             </div>
-            <div className={styles.display_inline + ' ' + styles.add_mar_left}>
+            <div
+              className={`${styles.display_inline} ${styles.add_mar_left} ${
+                styles.remove_pad_right
+              } ${styles.add_mar_right_mid}`}
+            >
               {getCreateSchemaSection()}
             </div>
           </div>

From 492e35ced10042c7a217b7d14945545efcbc5eb5 Mon Sep 17 00:00:00 2001
From: rikinsk <rikin.kachhia@gmail.com>
Date: Wed, 15 May 2019 18:35:36 +0530
Subject: [PATCH 3/8] changes

---
 .../Services/Common/Notification.js           |  2 +-
 .../components/Services/Data/DataActions.js   | 11 ------
 .../Services/Data/Schema/Actions.js           | 10 ++++--
 .../components/Services/Data/Schema/Schema.js | 34 +++++++++++--------
 4 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/console/src/components/Services/Common/Notification.js b/console/src/components/Services/Common/Notification.js
index 2e001492e4a4c..16625f52c091a 100644
--- a/console/src/components/Services/Common/Notification.js
+++ b/console/src/components/Services/Common/Notification.js
@@ -47,7 +47,7 @@ const showErrorNotification = (title, message, reqBody, error) => {
     modMessage = error ? error : message;
   }
 
-  let finalJson = error ? error.message : '{}';
+  let finalJson = error ? error.message : null;
 
   if (error && 'action' in error) {
     refreshBtn = (
diff --git a/console/src/components/Services/Data/DataActions.js b/console/src/components/Services/Data/DataActions.js
index 32f4c6b7937ad..4dd35135940f0 100644
--- a/console/src/components/Services/Data/DataActions.js
+++ b/console/src/components/Services/Data/DataActions.js
@@ -329,22 +329,11 @@ const fetchSchemaList = () => (dispatch, getState) => {
     headers: dataHeaders(getState),
     body: JSON.stringify(initQueries.schemaList),
   };
-  console.log('****************************');
-  console.log('Fetching schema list');
-  console.log('****************************');
   return dispatch(requestAction(url, options)).then(
     data => {
-      console.log('-----------------------------------========---');
-      console.log('Fetched schema');
-      console.log(data);
-      console.log('-------------------==========-------------------');
       dispatch({ type: FETCH_SCHEMA_LIST, schemaList: data });
     },
     error => {
-      console.log('---------------============----------------------');
-      console.log('Fetched errored schema');
-      console.log(error);
-      console.log('--------------------------============------------');
       console.error('Failed to fetch schema ' + JSON.stringify(error));
     }
   );
diff --git a/console/src/components/Services/Data/Schema/Actions.js b/console/src/components/Services/Data/Schema/Actions.js
index c950342d286a2..5e610220f3a8e 100644
--- a/console/src/components/Services/Data/Schema/Actions.js
+++ b/console/src/components/Services/Data/Schema/Actions.js
@@ -72,15 +72,21 @@ export const createNewSchema = (schemaName, successCb, errorCb) => {
 export const deleteCurrentSchema = (successCb, errorCb) => {
   return (dispatch, getState) => {
     const { currentSchema } = getState().tables;
+
     if (currentSchema === 'public') {
-      return dispatch(showErrorNotification('Cannot drop schema public'));
+      return dispatch(
+        showErrorNotification('Dropping public schema is not supported')
+      );
     }
+
     const isOk = window.confirm(
-      `Are you sure you want the current postgres schema: "${currentSchema}"`
+      `Are you sure you want to delete the postgres schema: "${currentSchema}"`
     );
+
     if (!isOk) {
       return;
     }
+
     const migrationUp = [
       {
         type: 'run_sql',
diff --git a/console/src/components/Services/Data/Schema/Schema.js b/console/src/components/Services/Data/Schema/Schema.js
index 5d12f99b99546..9cf3fe32a3e5f 100644
--- a/console/src/components/Services/Data/Schema/Schema.js
+++ b/console/src/components/Services/Data/Schema/Schema.js
@@ -209,8 +209,13 @@ class Schema extends Component {
         };
 
         const closedCreateSection = (
-          <Button color="white" size="xs" onClick={handleCreateNewClick}>
-            + Create new schema
+          <Button
+            color="white"
+            size="xs"
+            onClick={handleCreateNewClick}
+            title="Create new schema"
+          >
+            <i className="fa fa-plus" aria-hidden="true" />
           </Button>
         );
 
@@ -221,7 +226,7 @@ class Schema extends Component {
         };
 
         const openCreateSection = (
-          <div className={styles.inline_block}>
+          <div className={styles.inline_block + ' ' + styles.add_mar_left}>
             <div
               className={`${styles.inline_block} ${styles.remove_pad_right} ${
                 styles.add_mar_right_mid
@@ -275,20 +280,19 @@ class Schema extends Component {
               {schemaOptions}
             </select>
           </div>
-          <div
-            className={styles.display_inline + ' ' + styles.add_mar_left_mid}
-          >
-            <div
-              className={styles.display_inline + ' ' + styles.cursorPointer}
-              title="Delete current schema"
-              onClick={handleDelete}
-            >
-              <i className="fa fa-trash" aria-hidden="true" />
+          <div className={styles.display_inline + ' ' + styles.add_mar_left}>
+            <div className={styles.display_inline}>
+              <Button
+                color="white"
+                size="xs"
+                onClick={handleDelete}
+                title="Delete current schema"
+              >
+                <i className="fa fa-trash" aria-hidden="true" />
+              </Button>
             </div>
             <div
-              className={`${styles.display_inline} ${styles.add_mar_left} ${
-                styles.remove_pad_right
-              } ${styles.add_mar_right_mid}`}
+              className={`${styles.display_inline} ${styles.add_mar_left_mid}`}
             >
               {getCreateSchemaSection()}
             </div>

From 758dec2b49fdb23f82d6371d8bd6fa77bf1ca171 Mon Sep 17 00:00:00 2001
From: rikinsk <rikin.kachhia@gmail.com>
Date: Wed, 15 May 2019 18:42:19 +0530
Subject: [PATCH 4/8] changes

---
 .../Services/Data/Common/GraphQLValidation.js | 10 +++---
 .../EventTrigger/Common/GraphQLValidation.js  | 34 -------------------
 2 files changed, 5 insertions(+), 39 deletions(-)
 delete mode 100644 console/src/components/Services/EventTrigger/Common/GraphQLValidation.js

diff --git a/console/src/components/Services/Data/Common/GraphQLValidation.js b/console/src/components/Services/Data/Common/GraphQLValidation.js
index 200fccc0c757c..f1b79799c3d9c 100644
--- a/console/src/components/Services/Data/Common/GraphQLValidation.js
+++ b/console/src/components/Services/Data/Common/GraphQLValidation.js
@@ -6,7 +6,7 @@ const gqlTableErrorNotif = [
   '',
   {
     custom:
-      'Table name cannot contain special characters. It can have alphabets, numbers (cannot start with numbers) and _ (can start with _)',
+      'Table name cannot contain special characters. It can have alphabets, numbers and _ (cannot start with numbers)',
   },
   'Error renaming table!',
 ];
@@ -17,7 +17,7 @@ const gqlColumnErrorNotif = [
   '',
   {
     custom:
-      'Column name cannot contain special characters. It can have alphabets, numbers (cannot start with numbers) and _ (can start with _)',
+      'Column name cannot contain special characters. It can have alphabets, numbers and _ (cannot start with numbers)',
   },
   'Error renaming column!',
 ];
@@ -28,7 +28,7 @@ const gqlViewErrorNotif = [
   '',
   {
     custom:
-      'View name cannot contain special characters. It can have alphabets, numbers (cannot start with numbers) and _ (can start with _)',
+      'View name cannot contain special characters. It can have alphabets, numbers and _ (cannot start with numbers)',
   },
   'Error renaming view!',
 ];
@@ -39,7 +39,7 @@ const gqlRelErrorNotif = [
   '',
   {
     custom:
-      'Relationship name cannot contain special characters. It can have alphabets, numbers (cannot start with numbers) and _ (can start with _)',
+      'Relationship name cannot contain special characters. It can have alphabets, numbers and _ (cannot start with numbers)',
   },
   'Error renaming relationship!',
 ];
@@ -50,7 +50,7 @@ const gqlSchemaErrorNotif = [
   '',
   {
     custom:
-      'Schema name cannot contain special characters. It can have alphabets, numbers (cannot start with numbers) and _ (can start with _)',
+      'Schema name cannot contain special characters. It can have alphabets, numbers and _ (cannot start with numbers)',
   },
 ];
 
diff --git a/console/src/components/Services/EventTrigger/Common/GraphQLValidation.js b/console/src/components/Services/EventTrigger/Common/GraphQLValidation.js
deleted file mode 100644
index 0d31466a6599f..0000000000000
--- a/console/src/components/Services/EventTrigger/Common/GraphQLValidation.js
+++ /dev/null
@@ -1,34 +0,0 @@
-const gqlPattern = /^[_A-Za-z][_0-9A-Za-z]*$/;
-
-const gqlTableErrorNotif = [
-  'Error creating table!',
-  'Table name cannot contain special characters',
-  '',
-  {
-    custom:
-      'Table name cannot contain special characters. It can have alphabets, numbers (cannot start with numbers) and _ (can start with _)',
-  },
-];
-
-const gqlColumnErrorNotif = [
-  'Error adding column!',
-  'Column name cannot contain special characters',
-  '',
-  {
-    custom:
-      'Column name cannot contain special characters. It can have alphabets, numbers (cannot start with numbers) and _ (can start with _)',
-  },
-];
-
-const gqlRelErrorNotif = [
-  'Error adding relationship!',
-  'Relationship name cannot contain special characters',
-  '',
-  {
-    custom:
-      'Relationship name cannot contain special characters. It can have alphabets, numbers (cannot start with numbers) and _ (can start with _)',
-  },
-];
-
-export default gqlPattern;
-export { gqlTableErrorNotif, gqlColumnErrorNotif, gqlRelErrorNotif };

From 14a3287209b18828edca3d629f6e47fb1397b906 Mon Sep 17 00:00:00 2001
From: rikinsk <rikin.kachhia@gmail.com>
Date: Wed, 15 May 2019 18:45:49 +0530
Subject: [PATCH 5/8] changes

---
 .../components/Services/Data/Schema/Schema.js | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/console/src/components/Services/Data/Schema/Schema.js b/console/src/components/Services/Data/Schema/Schema.js
index 9cf3fe32a3e5f..f675032bfd361 100644
--- a/console/src/components/Services/Data/Schema/Schema.js
+++ b/console/src/components/Services/Data/Schema/Schema.js
@@ -208,6 +208,12 @@ class Schema extends Component {
           dispatch(createNewSchema(schemaNameEdit.trim(), successCb));
         };
 
+        const handleCancelCreateNewSchema = () => {
+          this.setState({
+            createSchemaOpen: false,
+          });
+        };
+
         const closedCreateSection = (
           <Button
             color="white"
@@ -219,19 +225,9 @@ class Schema extends Component {
           </Button>
         );
 
-        const handleCancelCreateNewSchema = () => {
-          this.setState({
-            createSchemaOpen: false,
-          });
-        };
-
         const openCreateSection = (
           <div className={styles.inline_block + ' ' + styles.add_mar_left}>
-            <div
-              className={`${styles.inline_block} ${styles.remove_pad_right} ${
-                styles.add_mar_right_mid
-              }`}
-            >
+            <div className={styles.inline_block}>
               <input
                 type="text"
                 value={schemaNameEdit}
@@ -240,18 +236,14 @@ class Schema extends Component {
                 className={'form-control input-sm ' + styles.inline_block}
               />
             </div>
-            <Button
-              color="white"
-              size="xs"
-              onClick={handleCreateClick}
-              className={styles.add_mar_right_mid}
-            >
+            <Button color="white" size="xs" onClick={handleCreateClick}>
               Create
             </Button>
             <Button
               color="white"
               size="xs"
               onClick={handleCancelCreateNewSchema}
+              className={styles.add_mar_left_mid}
             >
               Cancel
             </Button>

From d41eff092e369dc7cdaa62c52094460ab218c180 Mon Sep 17 00:00:00 2001
From: rikinsk <rikin.kachhia@gmail.com>
Date: Wed, 15 May 2019 18:53:51 +0530
Subject: [PATCH 6/8] changes

---
 .../Services/Data/Schema/Actions.js           |  2 +-
 .../components/Services/Data/Schema/Schema.js | 29 ++++++++++++-------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/console/src/components/Services/Data/Schema/Actions.js b/console/src/components/Services/Data/Schema/Actions.js
index 5e610220f3a8e..04cdf1da3594b 100644
--- a/console/src/components/Services/Data/Schema/Actions.js
+++ b/console/src/components/Services/Data/Schema/Actions.js
@@ -2,7 +2,7 @@ import gqlPattern, { gqlSchemaErrorNotif } from '../Common/GraphQLValidation';
 import { showErrorNotification } from '../../Common/Notification';
 import { makeMigrationCall, fetchSchemaList } from '../DataActions';
 
-const getDropSchemaSql = schemaName => `drop schema "${schemaName}";`;
+const getDropSchemaSql = schemaName => `drop schema "${schemaName}" cascade;`;
 
 const getCreateSchemaSql = schemaName => `create schema "${schemaName}";`;
 
diff --git a/console/src/components/Services/Data/Schema/Schema.js b/console/src/components/Services/Data/Schema/Schema.js
index f675032bfd361..bec4225849678 100644
--- a/console/src/components/Services/Data/Schema/Schema.js
+++ b/console/src/components/Services/Data/Schema/Schema.js
@@ -226,17 +226,22 @@ class Schema extends Component {
         );
 
         const openCreateSection = (
-          <div className={styles.inline_block + ' ' + styles.add_mar_left}>
-            <div className={styles.inline_block}>
+          <div className={styles.display_inline + ' ' + styles.add_mar_left}>
+            <div className={styles.display_inline}>
               <input
                 type="text"
                 value={schemaNameEdit}
                 onChange={handleSchemaNameChange}
                 placeholder="schema_name"
-                className={'form-control input-sm ' + styles.inline_block}
+                className={'form-control input-sm ' + styles.display_inline}
               />
             </div>
-            <Button color="white" size="xs" onClick={handleCreateClick}>
+            <Button
+              color="white"
+              size="xs"
+              onClick={handleCreateClick}
+              className={styles.add_mar_left_mid}
+            >
               Create
             </Button>
             <Button
@@ -333,7 +338,7 @@ class Schema extends Component {
 
           untrackedTablesList.push(
             <div className={styles.padd_bottom} key={`untracked-${i}`}>
-              <div className={styles.inline_block}>
+              <div className={styles.display_inline}>
                 <Button
                   data-test={`add-track-table-${table.table_name}`}
                   className={`${styles.display_inline}`}
@@ -344,7 +349,7 @@ class Schema extends Component {
                   Track
                 </Button>
               </div>
-              <div className={styles.inline_block}>{table.table_name}</div>
+              <div className={styles.display_inline}>{table.table_name}</div>
             </div>
           );
         });
@@ -432,7 +437,7 @@ class Schema extends Component {
 
           untrackedRelList.push(
             <div className={styles.padd_bottom} key={`untracked-rel-${i}`}>
-              <div className={styles.inline_block}>
+              <div className={styles.display_inline}>
                 <Button
                   className={styles.display_inline}
                   color="white"
@@ -442,7 +447,7 @@ class Schema extends Component {
                   Track
                 </Button>
               </div>
-              <div className={styles.inline_block}>
+              <div className={styles.display_inline}>
                 <span>
                   {relFrom} &rarr; {relTo}
                 </span>
@@ -539,7 +544,9 @@ class Schema extends Component {
                       </Button>
                     </div>
                     <div
-                      className={`${styles.padd_right} ${styles.inline_block}`}
+                      className={`${styles.padd_right} ${
+                        styles.display_inline
+                      }`}
                     >
                       {p.function_name}
                     </div>
@@ -587,7 +594,7 @@ class Schema extends Component {
       //           >
       //             <div
       //               className={`${styles.padd_right} ${
-      //                 styles.inline_block
+      //                 styles.display_inline
       //               }`}
       //             >
       //               {p.function_name}
@@ -612,7 +619,7 @@ class Schema extends Component {
         <div className={styles.padd_left}>
           <Helmet title="Schema - Data | Hasura" />
           <div className={styles.display_flex}>
-            <h2 className={`${styles.headerText} ${styles.inline_block}`}>
+            <h2 className={`${styles.headerText} ${styles.display_inline}`}>
               Schema
             </h2>
             {getCreateBtn()}

From cb0533cc409dae956474a46b9bd760925faceca0 Mon Sep 17 00:00:00 2001
From: rikinsk <rikin.kachhia@gmail.com>
Date: Wed, 15 May 2019 19:05:16 +0530
Subject: [PATCH 7/8] t

---
 console/src/components/Services/Data/Schema/Schema.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/console/src/components/Services/Data/Schema/Schema.js b/console/src/components/Services/Data/Schema/Schema.js
index bec4225849678..a40bbae5d2a9d 100644
--- a/console/src/components/Services/Data/Schema/Schema.js
+++ b/console/src/components/Services/Data/Schema/Schema.js
@@ -162,6 +162,7 @@ class Schema extends Component {
       if (migrationMode) {
         const handleClick = e => {
           e.preventDefault();
+
           dispatch(push(`${appPrefix}/schema/${currentSchema}/table/add`));
         };
 
@@ -537,6 +538,7 @@ class Schema extends Component {
                         } btn btn-xs btn-default`}
                         onClick={e => {
                           e.preventDefault();
+
                           dispatch(addExistingFunction(p.function_name));
                         }}
                       >

From 3a6b3653dfc10022e5427447da69a41de2733553 Mon Sep 17 00:00:00 2001
From: rikinsk <rikin.kachhia@gmail.com>
Date: Wed, 15 May 2019 19:22:46 +0530
Subject: [PATCH 8/8] t

---
 .../components/Services/Data/Schema/Schema.js  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/console/src/components/Services/Data/Schema/Schema.js b/console/src/components/Services/Data/Schema/Schema.js
index a40bbae5d2a9d..7ef3060b58713 100644
--- a/console/src/components/Services/Data/Schema/Schema.js
+++ b/console/src/components/Services/Data/Schema/Schema.js
@@ -339,7 +339,9 @@ class Schema extends Component {
 
           untrackedTablesList.push(
             <div className={styles.padd_bottom} key={`untracked-${i}`}>
-              <div className={styles.display_inline}>
+              <div
+                className={`${styles.display_inline} ${styles.add_mar_right}`}
+              >
                 <Button
                   data-test={`add-track-table-${table.table_name}`}
                   className={`${styles.display_inline}`}
@@ -438,7 +440,9 @@ class Schema extends Component {
 
           untrackedRelList.push(
             <div className={styles.padd_bottom} key={`untracked-rel-${i}`}>
-              <div className={styles.display_inline}>
+              <div
+                className={`${styles.display_inline} ${styles.add_mar_right}`}
+              >
                 <Button
                   className={styles.display_inline}
                   color="white"
@@ -528,7 +532,7 @@ class Schema extends Component {
                   >
                     <div
                       className={`${styles.display_inline} ${
-                        styles.padd_right
+                        styles.add_mar_right
                       }`}
                     >
                       <Button
@@ -545,12 +549,8 @@ class Schema extends Component {
                         Track
                       </Button>
                     </div>
-                    <div
-                      className={`${styles.padd_right} ${
-                        styles.display_inline
-                      }`}
-                    >
-                      {p.function_name}
+                    <div className={styles.display_inline}>
+                      <span>{p.function_name}</span>
                     </div>
                   </div>
                 ))}