Filter undefined values in pre-config to avoid current values reset

semrush · Jul 29, 2020 · b33cc3e · b33cc3e
1 parent ebb955f
commit b33cc3e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ const defaultOptions = {
     endpoint: null,             // api endpoint url
     smdUrl: null,               // smd scheme url
     headers: {},                // headers added to each request smdbox makes
-    selector: '#json-rpc-root', // element to which smdbox is inserted
+    selector: '#smdbox-root', // element to which smdbox is inserted
 };
 ```
 You can override any of this options to pre-fill project options.

diff --git a/dist/app.js b/dist/app.js
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "smdbox",
-  "version": "1.0.3",
+  "version": "1.1.1",
   "main": "src/index.jsx",
-  "repository": "https://gitlab.semrush.net/m.eremin/smdbox",
+  "repository": "https://github.com/semrush/smdbox",
   "author": "Semrush",
   "license": "MIT",
   "scripts": {

diff --git a/src/assets/html/index.dev.html b/src/assets/html/index.dev.html
@@ -8,13 +8,6 @@
 </head>
 <body>
 <!-- USE THIS BLOCK TO AUTO INIT SMDBOX WITHOUT CALLS <div id="json-rpc-root"></div>-->
-<div id="smdbox-root"></div>
-<script>
-    if (window.smdbox) {
-        window.smdbox({
-            selector: '#smdbox-root',
-        })
-    }
-</script>
+<div id="json-rpc-root"></div>
 </body>
 </html>
diff --git a/src/index.jsx b/src/index.jsx
@@ -1,6 +1,8 @@
 import React from 'react';
 import { render } from 'react-dom';
 import { Provider } from 'react-redux';
+import pickBy from 'lodash/pickBy';
+import identity from 'lodash/identity';
 import merge from 'lodash/merge';
 import Application from 'containers/Application';
 import { get as getStore } from 'helpers/session';
@@ -48,7 +50,9 @@ const init = (opts = {}) => {
 
     getStore((storeData = {}) => {
         // set preconfigured smdUrl, endpoint and headers from config
-        merge(storeData, { project: { smdUrl, endpoint, headers } });
+        // filter null values if some of settings are not defined, to avoid current values reset
+        const project = pickBy({ smdUrl, endpoint, headers }, identity);
+        merge(storeData, { project });
         const store = configureStore(storeData);
         renderApp(Application, store);
     });