Merge pull request #36 from back4app/revert-35-homolog

seijiakiyama · web-flow · commit 59a08778e0bc · 2017-12-06T16:04:25.000-02:00
Revert "Fix wrong url"
diff --git a/Parse-Dashboard/app.js b/Parse-Dashboard/app.js
@@ -180,7 +180,6 @@ module.exports = function(config, options) {
       res.send(`<!DOCTYPE html>
         <head>
           <link rel="shortcut icon" type="image/x-icon" href="${mountPath}favicon.ico" />
-          <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
           <base href="${mountPath}"/>
           <script>
             PARSE_DASHBOARD_PATH = "${mountPath}";
@@ -206,7 +205,6 @@ module.exports = function(config, options) {
       res.send(`<!DOCTYPE html>
         <head>
           <link rel="shortcut icon" type="image/x-icon" href="${mountPath}favicon.ico" />
-          <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
           <base href="${mountPath}"/>
           <script>
             PARSE_DASHBOARD_PATH = "${mountPath}";
diff --git a/src/components/back4App/Header/headerNavData.js b/src/components/back4App/Header/headerNavData.js
@@ -1,6 +1,6 @@
 const headerNavData = {
   items: [
-    {label: 'My Apps', url: 'https://dashboard.back4app.com/apps/#!/admin'},
+    {label: 'My Apps', pathname: '/apps'},
     {label: 'Dashboard', url: 'https://dashboard.back4app.com/'},
     {label: 'Docs', url: 'http://docs.back4app.com/'},
     {label: 'Community', url: 'https://groups.google.com/forum/#!forum/back4app'},
diff --git a/src/dashboard/Dashboard.js b/src/dashboard/Dashboard.js
@@ -196,17 +196,19 @@ class Dashboard extends React.Component {
         }
       });
       return Parse.Promise.when(appInfoPromises);
-    }).then(function() {
-      Array.prototype.slice.call(arguments).forEach(app => {
-        AppsManager.addApp(app);
-      });
+    }).then(function(resolvedApps) {
+      if(resolvedApps && resolvedApps.length) {
+        resolvedApps.forEach(app => {
+          AppsManager.addApp(app);
+        });
+      }
       this.setState({ configLoadingState: AsyncStatus.SUCCESS });
     }.bind(this)).fail(({ error }) => {
       this.setState({
         configLoadingError: error,
         configLoadingState: AsyncStatus.FAILED
       });
-    })
+    });
   }
 
   render() {
diff --git a/src/dashboard/Data/Browser/BrowserTable.react.js b/src/dashboard/Data/Browser/BrowserTable.react.js
@@ -292,6 +292,9 @@ export default class BrowserTable extends React.Component {
             {rows}
             <div style={{ height: Math.max(0, (this.props.data.length - this.state.offset - MAX_ROWS) * ROW_HEIGHT) }} />
             {addRow}
+            <div className={styles.rowsHolder} style={{ top: Math.max(0, this.state.offset * ROW_HEIGHT) }}>
+              {rows}
+            </div>
             {editor}
           </div>
         );
