⚡ passes path to Dashboard component for AJAX

flovilmart · flovilmart · commit 7a7185faadcb · 2016-04-01T21:41:09.000-04:00
diff --git a/Parse-Dashboard/app.js b/Parse-Dashboard/app.js
@@ -15,6 +15,17 @@ packageJson('parse-dashboard', 'latest').then(latestPackage => {
   }
 });
 
+function getMount(req) {
+  let url = req.url;
+  let originalUrl = req.originalUrl;
+  var mountPathLength = req.originalUrl.length - req.url.length;
+  var mountPath = req.originalUrl.slice(0, mountPathLength);
+  if (!mountPath.endsWith('/')) {
+    mountPath += '/';
+  }
+  return mountPath;
+}
+
 module.exports = function(config, allowInsecureHTTP) {
   var app = express();
   // Serve public files.
@@ -83,18 +94,12 @@ module.exports = function(config, allowInsecureHTTP) {
 
   // For every other request, go to index.html. Let client-side handle the rest.
   app.get('/*', function(req, res) {
-    let url = req.url;
-    let originalUrl = req.originalUrl;
-    var mountPathLength = req.originalUrl.length - req.url.length;
-    var mountPath = req.originalUrl.slice(0, mountPathLength);
-    if (!mountPath.endsWith('/')) {
-      mountPath += '/';
-    }
+    let mountPath = getMount(req);
     res.send(`<!DOCTYPE html>
       <head>
         <base href="${mountPath}"/>
         <script>
-          PARSE_DASHBOARD_CONFIG_URI = "${mountPath}parse-dashboard-config.json";
+          PARSE_DASHBOARD_PATH = "${mountPath}";
         </script>
       </head>
       <html>
diff --git a/Parse-Dashboard/index.html b/Parse-Dashboard/index.html
diff --git a/src/dashboard/Dashboard.js b/src/dashboard/Dashboard.js
@@ -48,6 +48,7 @@ import Webhooks           from './Data/Webhooks/Webhooks.react';
 import { AsyncStatus }    from 'lib/Constants';
 import { center }         from 'stylesheets/base.scss';
 import { get }            from 'lib/AJAX';
+import { setBasePath }    from 'lib/AJAX';
 import {
   Router,
   Route,
@@ -113,10 +114,11 @@ class Dashboard extends React.Component {
       configLoadingState: AsyncStatus.PROGRESS,
       newFeaturesInLatestVersion: [],
     };
+    setBasePath(props.path);
   }
 
   componentDidMount() {
-    get(this.props.configURI).then(({ apps, newFeaturesInLatestVersion = [] }) => {
+    get('/parse-dashboard-config.json').then(({ apps, newFeaturesInLatestVersion = [] }) => {
       this.setState({ newFeaturesInLatestVersion });
       let appInfoPromises = apps.map(app => {
         if (app.serverURL.startsWith('https://api.parse.com/1')) {
diff --git a/src/dashboard/index.js b/src/dashboard/index.js
@@ -17,5 +17,5 @@ import 'babel-polyfill';
 require('stylesheets/fonts.scss');
 installDevTools(Immutable);
 
-var configURI = window.PARSE_DASHBOARD_CONFIG_URI || '/parse-dashboard-config.json';
-ReactDOM.render(<Dashboard configURI={configURI}/>, document.getElementById('browser_mount'));
+var path = window.PARSE_DASHBOARD_PATH || '/';
+ReactDOM.render(<Dashboard path={path}/>, document.getElementById('browser_mount'));
diff --git a/src/lib/AJAX.js b/src/lib/AJAX.js
@@ -9,8 +9,22 @@ import * as CSRFManager from 'lib/CSRFManager';
 import encodeFormData   from 'lib/encodeFormData';
 import { Promise }      from 'parse';
 
+let basePath = '';
+export function setBasePath(newBasePath) {
+  basePath = newBasePath || '';
+  if (basePath.endsWith('/')) {
+    basePath = basePath.slice(0, basePath.length-1);
+  }
+}
+
 // abortable flag used to pass xhr reference so user can abort accordingly
 export function request(method, url, body, abortable = false, withCredentials = true, useRequestedWith = true) {
+  if (!url.startsWith('http://')
+      && !url.startsWith('https://')
+      && basePath.length
+      && !url.startsWith(basePath)) {
+    url = basePath + url;
+  }
   let xhr = new XMLHttpRequest();
   xhr.open(method, url, true);
   if (method === 'POST' || method === 'PUT' || method === 'DELETE') {
