Merge branch 'release/2.1.2'

frontend · Jun 19, 2018 · 6adf0db · 6adf0db
2 parents f1ca6a2 + be23789
commit 6adf0db
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+*2.1.2* (2018-06-19)
+  - ✨ get sourcesOrder and use it (957856c)
+
 *2.1.1* (2018-06-15)
   - Fix component meta call
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.1.1
+2.1.2
diff --git a/build/asset-manifest.json b/build/asset-manifest.json
@@ -1,6 +1,6 @@
 {
   "main.css": "static/css/main.b3d6cd5e.css",
   "main.css.map": "static/css/main.b3d6cd5e.css.map",
-  "main.js": "static/js/main.1b1c5da1.js",
-  "main.js.map": "static/js/main.1b1c5da1.js.map"
+  "main.js": "static/js/main.412936c2.js",
+  "main.js.map": "static/js/main.412936c2.js.map"
 }
diff --git a/build/service-worker.js b/build/service-worker.js
diff --git a/build/static/js/main.js b/build/static/js/main.js
diff --git a/build/static/js/main.js.map b/build/static/js/main.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "toolbox-reader",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "private": true,
   "eslintConfig": {
     "parser": "babel-eslint",

diff --git a/src/components/Sidebar/Sidebar.js b/src/components/Sidebar/Sidebar.js
@@ -32,7 +32,7 @@ const Sidebar = (props) => {
 
       <SidebarDocs location={props.location} />
 
-      {Object.keys(props.atomic.sources).map((group) => {
+      {Object.keys(props.atomic.sourcesOrder || props.atomic.sources).map((group) => {
         return <SidebarItem key={group} group={group} location={props.location} />;
       })}
     </div>

diff --git a/src/reducers/atomic.js b/src/reducers/atomic.js
@@ -15,6 +15,7 @@ const atomicReducer = p((state = defaultState, action) => {
     case SET_COMPONENTS:
       state.sources = action.payload;
       state.types = Object.keys(action.payload);
+      state.sourcesOrder = window.sourcesOrder || null;
       break;
 
     // Update a specific component