fix: allow urls with query strings

closes #92
graasp · Jun 12, 2019 · c2ef55f · c2ef55f
1 parent d187018
commit c2ef55f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/src/components/developer/DatabaseEditor.js b/src/components/developer/DatabaseEditor.js
@@ -60,6 +60,7 @@ class DatabaseEditor extends Component {
           onAdd={this.handleEdit}
           onDelete={this.handleEdit}
         />
+        <br />
         <Button
           variant="contained"
           className={classes.button}

diff --git a/src/components/developer/DeveloperScreen.js b/src/components/developer/DeveloperScreen.js
@@ -97,11 +97,13 @@ class DeveloperScreen extends Component {
           <Typography variant="h4" className={classes.screenTitle}>
             {t('Developer')}
           </Typography>
+          <br />
           <Typography variant="h6" className={classes.alert}>
             {t(
               'Danger Zone! Proceed with caution as changes to this section might lead to data loss.'
             )}
           </Typography>
+          <br />
           <DatabaseEditor />
         </main>
       </div>

diff --git a/src/components/phase/PhaseApp.js b/src/components/phase/PhaseApp.js
@@ -100,7 +100,15 @@ class PhaseApp extends Component {
       ? SMART_GATEWAY_QUERY_STRING_DIVIDER
       : '?';
 
+    // handle existing query strings
+    let existingParams = {};
+    const existingQueryString = uri.split('?')[1];
+    if (existingQueryString) {
+      existingParams = Qs.parse(existingQueryString);
+    }
+
     const params = {
+      ...existingParams,
       spaceId,
       userId,
       lang,