Merge pull request #10 from CovenantSQL/dev

Dev

Author: foreseaz

src/pages/project/$db/db.js

@@ -171,13 +171,16 @@ class DatabaseDetail extends PureComponent {
     const { projectDetail } = this.props
     const { table_names, tables } = projectDetail
 
+    const number_of_tables =
+      (Object.keys(tables) && Object.keys(tables).length) || 0
+
     return (
       <Page inner>
         <div className={styles.tables}>
           <div className={styles.title}>
             <Trans>Table Details:</Trans>
           </div>
-          {Object.keys(tables).length !== 0 ? (
+          {number_of_tables !== 0 ? (
             table_names.map(name => (
               <div key={name} className={styles.table}>
                 <div className={styles.tableName}>

src/pages/project/$db/models/detail.js

@@ -113,7 +113,7 @@ export default {
         yield put({
           type: 'updateState',
           payload: {
-            userList: data.users,
+            userList: data.users || [],
             pagination: {
               current: Number(p.current),
               pageSize: Number(p.pageSize),
@@ -147,6 +147,7 @@ export default {
 
       const { data, success } = yield call(queryProjectTables, _payload)
       if (success) {
+        if (!data.tables) return
         yield put({
           type: 'updateState',
           payload: {

src/pages/project/$db/request.js

@@ -73,12 +73,12 @@ class RequestPage extends React.Component {
   }
 
   constructAPIDomain = () => {
-    const alias = _get(this.props.config, ['misc', 'alias'], '')
-    return '//' + alias + '.stg-api.covenantsql.io:15153'
+    const api_domain = _get(this.props.config, ['client_api_domains', 0])
+    return '//' + api_domain
   }
 
   constructTableSelection = () => {
-    const tables = _get(this.props.config, ['tables'], [])
+    const tables = _get(this.props.config, ['tables']) || []
     return (
       <Select placeholder="Select a table" style={{ minWidth: '160px' }}>
         {tables.map(t => {