Fixes according to Code Review

ezsystems · Feb 28, 2019 · 435e76b · 435e76b
1 parent 247093b
commit 435e76b
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 29 deletions.
diff --git a/Resources/public/js/ContentTree.module.js b/Resources/public/js/ContentTree.module.js
diff --git a/Resources/public/js/ContentTree.module.js.map b/Resources/public/js/ContentTree.module.js.map
diff --git a/Resources/public/js/MultiFileUpload.module.js.map b/Resources/public/js/MultiFileUpload.module.js.map
diff --git a/Resources/public/js/SubItems.module.js.map b/Resources/public/js/SubItems.module.js.map
diff --git a/Resources/public/js/UniversalDiscovery.module.js.map b/Resources/public/js/UniversalDiscovery.module.js.map
diff --git a/src/modules/content-tree/content.tree.module.js b/src/modules/content-tree/content.tree.module.js
@@ -16,12 +16,7 @@ export default class ContentTreeModule extends Component {
         const savedSubtree = localStorage.getItem(KEY_CONTENT_TREE_SUBTREE);
 
         this.items = props.preloadedLocations;
-
-        try {
-            this.subtree = savedSubtree ? JSON.parse(savedSubtree) : null;
-        } catch (e) {
-            this.subtree = null;
-        }
+        this.subtree = savedSubtree ? JSON.parse(savedSubtree) : null;
     }
 
     componentDidMount() {
@@ -90,7 +85,7 @@ export default class ContentTreeModule extends Component {
     }
 
     addItemToSubtree(subtree, item, path) {
-        const parentSubtree = this.findParentSubtree(subtree, item, path);
+        const parentSubtree = this.findParentSubtree(subtree, path);
 
         if (!parentSubtree) {
             return;
@@ -108,21 +103,21 @@ export default class ContentTreeModule extends Component {
     }
 
     removeItemFromSubtree(subtree, item, path) {
-        const parentSubtree = this.findParentSubtree(subtree, item, path);
+        const parentSubtree = this.findParentSubtree(subtree, path);
 
         if (!parentSubtree) {
             return;
         }
 
-        const index = parentSubtree.children.findIndex((element) => parseInt(element.locationId, 10) === parseInt(path[1], 10));
+        const index = parentSubtree.children.findIndex((element) => element.locationId === parseInt(path[1], 10));
 
         if (index > -1) {
             parentSubtree.children.splice(index, 1);
         }
     }
 
     updateItemInSubtree(subtree, item, path) {
-        const parentSubtree = this.findParentSubtree(subtree, item, path);
+        const parentSubtree = this.findParentSubtree(subtree, path);
 
         if (!parentSubtree) {
             return;
@@ -139,7 +134,7 @@ export default class ContentTreeModule extends Component {
         localStorage.setItem(KEY_CONTENT_TREE_SUBTREE, JSON.stringify(this.subtree));
     }
 
-    findParentSubtree(subtree, item, path) {
+    findParentSubtree(subtree, path) {
         if (path.length < 2) {
             return;
         }
@@ -154,7 +149,7 @@ export default class ContentTreeModule extends Component {
 
         path.shift();
 
-        return this.findParentSubtree(subtreeSubtree, item, path);
+        return this.findParentSubtree(subtreeSubtree, path);
     }
 
     generateSubtree(items) {

diff --git a/src/modules/content-tree/services/content.tree.service.js b/src/modules/content-tree/services/content.tree.service.js
@@ -34,11 +34,10 @@ export const loadSubtree = ({ token, siteaccess }, subtree, callback) => {
         credentials: 'same-origin',
         body: JSON.stringify({
             LoadSubtreeRequest: {
-                "_media-type": "application/vnd.ez.api.ContentTreeLoadSubtreeRequest",
+                '_media-type': 'application/vnd.ez.api.ContentTreeLoadSubtreeRequest',
                 nodes: subtree,
             },
         }),
-
         headers: {
             Accept: 'application/vnd.ez.api.ContentTreeRoot+json',
             'Content-Type': 'application/vnd.ez.api.ContentTreeLoadSubtreeRequest+json',
@@ -58,23 +57,17 @@ export const loadSubtree = ({ token, siteaccess }, subtree, callback) => {
         .catch(showErrorNotification);
 };
 
-const mapChildrenToSubitemsDeep = (tree) => {
-    const parsedSubtree = [];
-
-    for (const subtree of tree) {
+const mapChildrenToSubitemsDeep = (tree) =>
+    tree.map((subtree) => {
         mapChildrenToSubitems(subtree);
         subtree.subitems = mapChildrenToSubitemsDeep(subtree.subitems);
 
-        parsedSubtree.push(subtree);
-    }
-
-    return parsedSubtree;
-};
+        return subtree;
+    });
 
 const mapChildrenToSubitems = (location) => {
     location.totalSubitemsCount = location.totalChildrenCount;
     location.subitems = location.children;
-    location.totalSubitemsCount = location.totalChildrenCount;
 
     delete location.totalChildrenCount;
     delete location.children;