hasura · shahidhk · Jun 26, 2019 · Jun 13, 2019 · Jun 17, 2019 · Jun 17, 2019
@@ -1,6 +1,7 @@
 package api
 
 import (
+	"fmt"
 	"net/http"
 	"net/url"
 	"strings"
@@ -130,7 +131,7 @@ func MigrateAPI(c *gin.Context) {
 			c.JSON(http.StatusInternalServerError, &Response{Code: "internal_error", Message: err.Error()})
 			return
 		}
-		c.JSON(http.StatusOK, &Response{Name: request.Name})
+		c.JSON(http.StatusOK, &Response{Name: fmt.Sprintf("%d_%s", timestamp, request.Name)})
 	default:
 		c.JSON(http.StatusMethodNotAllowed, &gin.H{"message": "Method not allowed"})
 	}

@@ -234,8 +234,7 @@ export const passRemoveUniqueKey = () => {
 };
 
 export const passMTDeleteCol = () => {
-  // cy.get(getElementFromAlias(`edit-${getColName(0)}`)).click();
-  // cy.wait(500);
+  cy.get(getElementFromAlias('modify-table-edit-column-1')).click();
   cy.get(getElementFromAlias('modify-table-column-1-remove')).click();
   cy.on('window:alert', str => {
     expect(str === 'Are you sure you want to delete?').to.be.true;

@@ -40,31 +40,8 @@ const showNotification = ({
       Notifications.show(
         {
           position,
-          autoDismiss: level === 'error' ? 0 : 5,
-          dismissible: level === 'error' ? 'click' : 'both',
-          children: json ? jsonFormat(json) : null,
-          ...options,
-        },
-        level
-      )
-    );
-  };
-};
-
-const showTempNotification = ({
-  level = 'info',
-  position = 'tr',
-  json,
-  ...options
-} = {}) => {
-  return dispatch => {
-    dispatch(Notifications.removeAll());
-    dispatch(
-      Notifications.show(
-        {
-          position,
-          autoDismiss: 2,
-          dismissible: 'both',
+          autoDismiss: ['error', 'warning'].includes(level) ? 0 : 5,
+          dismissible: ['error', 'warning'].includes(level) ? 'button' : 'both',
           children: json ? jsonFormat(json) : null,
           ...options,
         },
@@ -161,5 +138,4 @@ export {
   notifExpand,
   notifMsg,
   showNotification,
-  showTempNotification,
 };
@@ -853,6 +853,10 @@ code {
   background: #f2f2f2 !important;
 }
 
+.text_gray {
+  color: #767E96
+}
+
 .docsButton {
   background-color: #fff;
   border-radius: 5px;

@@ -1,12 +1,12 @@
 import React from 'react';
 import AceEditor from 'react-ace';
-import { showNotification, showTempNotification } from '../../App/Actions';
+import { showNotification } from '../../App/Actions';
 import { notifExpand, notifMsg } from '../../App/Actions';
 import Button from '../../Common/Button/Button';
 
 const styles = require('../../Common/TableCommon/Table.scss');
 
-const showErrorNotification = (title, message, reqBody, error) => {
+const showErrorNotification = (title, message, error) => {
   let modMessage;
   let refreshBtn;
 
@@ -36,7 +36,7 @@ const showErrorNotification = (title, message, reqBody, error) => {
     } else {
       modMessage = error.code;
     }
-  } else if (error && 'internal' in error) {
+  } else if (error && 'internal' in error && 'error' in error.internal) {
     modMessage = error.code + ' : ' + error.internal.error.message;
   } else if (error && 'custom' in error) {
     modMessage = error.custom;
@@ -146,25 +146,45 @@ const showSuccessNotification = (title, message) => {
   };
 };
 
-const showTempErrorNotification = (title, message) => {
+const showInfoNotification = title => {
   return dispatch => {
     dispatch(
-      showTempNotification({
-        level: 'error',
+      showNotification({
         title,
-        message: message ? message : null,
-        autoDismiss: 3,
+        autoDismiss: 0,
       })
     );
   };
 };
 
-const showInfoNotification = title => {
+const showWarningNotification = (title, message, dataObj) => {
+  const children = [];
+  if (dataObj) {
+    children.push(
+      <div className={styles.aceBlock}>
+        <AceEditor
+          readOnly
+          showPrintMargin={false}
+          mode="json"
+          showGutter={false}
+          theme="github"
+          name="notification-response"
+          value={JSON.stringify(dataObj, null, 4)}
+          minLines={1}
+          maxLines={15}
+          width="100%"
+        />
+      </div>
+    );
+  }
+
   return dispatch => {
     dispatch(
       showNotification({
+        level: 'warning',
         title,
-        autoDismiss: 0,
+        message,
+        children,
       })
     );
   };
@@ -174,5 +194,5 @@ export {
   showErrorNotification,
   showSuccessNotification,
   showInfoNotification,
-  showTempErrorNotification,
+  showWarningNotification,
 };
@@ -136,7 +136,6 @@ class AddTable extends Component {
         showErrorNotification(
           'Error creating table!',
           'Minimum one column required',
-          '',
           {
             custom: ATLEAST_ONE_COLUMN_MSG,
           }
@@ -155,7 +154,6 @@ class AddTable extends Component {
           showErrorNotification(
             'Error creating table!',
             'Column name cannot be empty',
-            '',
             {
               custom: 'Column name cannot be empty',
             }
@@ -167,7 +165,6 @@ class AddTable extends Component {
           showErrorNotification(
             gqlColumnErrorNotif[0],
             gqlColumnErrorNotif[1],
-            gqlColumnErrorNotif[2],
             gqlColumnErrorNotif[3]
           )
         );
@@ -192,7 +189,6 @@ class AddTable extends Component {
               showErrorNotification(
                 gqlColumnErrorNotif[0],
                 gqlColumnErrorNotif[1],
-                gqlColumnErrorNotif[2],
                 gqlColumnErrorNotif[3]
               )
             );
@@ -214,7 +210,6 @@ class AddTable extends Component {
         showErrorNotification(
           'Error creating table!',
           'Select atleast one primary key',
-          '',
           {
             custom: ATLEAST_ONE_PRIMARY_KEY_MSG,
           }
@@ -233,7 +228,6 @@ class AddTable extends Component {
         showErrorNotification(
           'Error creating table!',
           'Table name cannot be empty',
-          '',
           {
             custom: 'Table name cannot be empty. Please add a name',
           }
@@ -245,7 +239,6 @@ class AddTable extends Component {
         showErrorNotification(
           gqlTableErrorNotif[0],
           gqlTableErrorNotif[1],
-          gqlTableErrorNotif[2],
           gqlTableErrorNotif[3]
         )
       );

@@ -435,34 +435,23 @@ const setTable = tableName => ({ type: SET_TABLE, tableName });
 /* **********Shared functions between table actions********* */
 
 const handleMigrationErrors = (title, errorMsg) => dispatch => {
-  const requestMsg = title;
   if (globals.consoleMode === SERVER_CONSOLE_MODE) {
     // handle errors for run_sql based workflow
-    dispatch(showErrorNotification(title, errorMsg.code, requestMsg, errorMsg));
+    dispatch(showErrorNotification(title, errorMsg.code, errorMsg));
   } else if (errorMsg.code === 'migration_failed') {
-    dispatch(
-      showErrorNotification(title, 'Migration Failed', requestMsg, errorMsg)
-    );
+    dispatch(showErrorNotification(title, 'Migration Failed', errorMsg));
   } else if (errorMsg.code === 'data_api_error') {
     const parsedErrorMsg = errorMsg;
     parsedErrorMsg.message = JSON.parse(errorMsg.message);
     dispatch(
-      showErrorNotification(
-        title,
-        parsedErrorMsg.message.error,
-        requestMsg,
-        parsedErrorMsg
-      )
+      showErrorNotification(title, parsedErrorMsg.message.error, parsedErrorMsg)
     );
   } else {
     // any other unhandled codes
     const parsedErrorMsg = errorMsg;
     parsedErrorMsg.message = JSON.parse(errorMsg.message);
-    dispatch(
-      showErrorNotification(title, errorMsg.code, requestMsg, parsedErrorMsg)
-    );
+    dispatch(showErrorNotification(title, errorMsg.code, parsedErrorMsg));
   }
-  // dispatch(showErrorNotification(msg, firstDisplay, request, response));
 };
 
 const makeMigrationCall = (
@@ -512,7 +501,7 @@ const makeMigrationCall = (
     body: JSON.stringify(finalReqBody),
   };
 
-  const onSuccess = () => {
+  const onSuccess = data => {
     if (!shouldSkipSchemaReload) {
       if (globals.consoleMode === 'cli') {
         dispatch(loadMigrationStatus()); // don't call for server mode
@@ -522,7 +511,7 @@ const makeMigrationCall = (
     if (successMsg) {
       dispatch(showSuccessNotification(successMsg));
     }
-    customOnSuccess();
+    customOnSuccess(data, globals.consoleMode, currMigrationMode);
   };
 
   const onError = err => {
@@ -600,7 +589,6 @@ const fetchColumnTypeInfo = () => {
           showErrorNotification(
             'Error fetching column types',
             'Kindly reach out to us in case you face this issue again',
-            error,
             error
           )
         );

@@ -113,7 +113,6 @@ const executeSQL = (isMigration, migrationName) => (dispatch, getState) => {
               showErrorNotification(
                 'SQL execution failed!',
                 'Something is wrong. Data sent back an invalid response json.',
-                requestBody,
                 parsedErrorMsg
               )
             );

@@ -13,7 +13,6 @@ export const createNewSchema = (schemaName, successCb, errorCb) => {
         showErrorNotification(
           gqlSchemaErrorNotif[0],
           gqlSchemaErrorNotif[1],
-          gqlSchemaErrorNotif[2],
           gqlSchemaErrorNotif[3]
         )
       );

@@ -95,9 +95,7 @@ const editItem = (tableName, colValues) => {
         );
       },
       err => {
-        dispatch(
-          showErrorNotification('Edit failed!', err.error, reqBody, err)
-        );
+        dispatch(showErrorNotification('Edit failed!', err.error, err));
       }
     );
   };

@@ -195,9 +195,7 @@ const deleteItem = pkClause => {
         );
       },
       err => {
-        dispatch(
-          showErrorNotification('Deleting row failed!', err.error, reqBody, err)
-        );
+        dispatch(showErrorNotification('Deleting row failed!', err.error, err));
       }
     );
   };

@@ -100,9 +100,7 @@ const insertItem = (tableName, colValues) => {
         );
       },
       err => {
-        dispatch(
-          showErrorNotification('Insert failed!', err.error, reqBody, err)
-        );
+        dispatch(showErrorNotification('Insert failed!', err.error, err));
       }
     );
   };

@@ -38,7 +38,6 @@ const useColumnEditor = (dispatch, tableName) => {
         showErrorNotification(
           gqlColumnErrorNotif[0],
           gqlColumnErrorNotif[1],
-          gqlColumnErrorNotif[2],
           gqlColumnErrorNotif[3]
         )
       );
@@ -47,7 +46,6 @@ const useColumnEditor = (dispatch, tableName) => {
         showErrorNotification(
           'Error creating column!',
           'Column name/type cannot be empty',
-          '',
           {
             custom: 'Column name/type cannot be empty',
           }