dbm 1.4.3 → 1.4.4

package/flow/controllers/transform/PartOfObject.js

@@ -25,7 +25,7 @@ export default class PartOfObject extends Dbm.core.BaseObject {
             
             if(stringValue !== this._lastUpdatedValue) {
                 this._lastUpdatedValue = stringValue;
-                let newValue = JSON.parse(stringValue);
+                let newValue = stringValue ? JSON.parse(stringValue) : null;
                 this.item.value = newValue;
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "main": "index.js",
   "type": "module",
   "exports": {

package/react/admin/objects/itemeditors/DraggableHierarchyDisplay.js

@@ -6,6 +6,15 @@ export default class DraggableHierarchyDisplay extends Dbm.react.BaseObject {
         super._construct();
     }
 
+    _remove() {
+        console.log("_remove");
+        let hierarchyItem = this.context.hierarchyItem;
+
+        console.log(hierarchyItem);
+
+        this.context.hierarchyController.removeHierarchyItem(hierarchyItem);
+    }
+
     _renderMainElement() {
 
         let children = this.getPropValue("children");
@@ -20,7 +29,19 @@ export default class DraggableHierarchyDisplay extends Dbm.react.BaseObject {
                         ),
                         React.createElement("div", {className: "flex-row-item flex-resize"},
                             children
-                        )
+                        ),
+                        React.createElement("div", {className: "flex-row-item flex-no-resize"},
+                            React.createElement("div", {className: "spacing small"}),
+                            React.createElement(Dbm.react.interaction.ConfirmButton, {"command": Dbm.commands.callFunction(this._remove.bind(this))},
+                                React.createElement(Dbm.react.image.Image, {"src": "/assets/img/icons/delete.svg", "className": "background-contain text-row-icon action-icon-color cursor-pointer"}),
+                                React.createElement("div", {"data-slot": "confirm", className: "absolute-container cursor-pointer", title: "Click to remove"},
+                                    React.createElement(Dbm.react.image.Image, {"src": "/assets/img/icons/delete.svg", "className": "background-contain text-row-icon hover-icon remove-action-icon-color cursor-pointer"}),
+                                    React.createElement("div", {className:"centered-tip-text no-pointer-events"},
+                                        "Remove?"
+                                    )
+                                )
+                            )
+                        ),
                     )
                     
                 )      

package/react/admin/objects/itemeditors/HierarchyOrderedRelationsList.js

@@ -46,6 +46,7 @@ export default class HierarchyOrderedRelationsList extends Dbm.react.BaseObject
     _removeMissingPartsOfHierarchy(aHierarchy, aMustBeInArray) {
         //console.log("_removeMissingPartsOfHierarchy");
         //console.log(aHierarchy, aMustBeInArray);
+
         let currentArray = aHierarchy;
         let currentArrayLength = currentArray.length;
 
@@ -54,6 +55,11 @@ export default class HierarchyOrderedRelationsList extends Dbm.react.BaseObject
             if(aMustBeInArray.indexOf(currentItem.id) !== -1) {
                 this._removeMissingPartsOfHierarchy(currentItem.children, aMustBeInArray);
             }
+            else {
+                currentArray.splice(i, 1);
+                i--;
+                currentArrayLength--;
+            }
         }
     }
 
@@ -68,6 +74,17 @@ export default class HierarchyOrderedRelationsList extends Dbm.react.BaseObject
         }
     }
 
+    _getAllLinkedIdsFromHierarchy(aItems, aReturnArray) {
+        let currentArray = aItems;
+        let currentArrayLength = currentArray.length;
+        for(let i = 0; i < currentArrayLength; i++) {
+            let currentItem = currentArray[i];
+
+            aReturnArray.push(currentItem.linkedItem.id);
+            this._getAllLinkedIdsFromHierarchy(currentItem.children, aReturnArray);
+        }
+    }
+
     _getFullHierarchy() {
         let relations = this._relationsEditor.value;
         let hierarchyValue = this._orderEditor.value;
@@ -257,6 +274,28 @@ export default class HierarchyOrderedRelationsList extends Dbm.react.BaseObject
         this._orderEditor.value = hierarchyValue;
     }
 
+    removeHierarchyItem(aHierarchyItem) {
+        console.log("removeHierarchyItem");
+        let position = this._findPosition(aHierarchyItem, this.item.hierarchy.children);
+
+        let idsToRemove = [];
+        this._getAllLinkedIdsFromHierarchy([aHierarchyItem], idsToRemove);
+
+        console.log(position, idsToRemove);
+
+        let editor = this._getEditor();
+        let newValues = [].concat(editor.value);
+        
+        console.log(JSON.stringify(newValues), idsToRemove);
+        newValues = Dbm.utils.ArrayFunctions.removeValues(newValues, idsToRemove);
+        console.log(JSON.stringify(newValues), idsToRemove);
+
+        editor.value = newValues;
+
+        let hierarchyValue = this._getFullHierarchy();
+        this._orderEditor.value = hierarchyValue;
+    }
+
     _create() {
         console.log("_create");
         let objectType = this.getPropValue("objectType");
@@ -270,10 +309,7 @@ export default class HierarchyOrderedRelationsList extends Dbm.react.BaseObject
         Dbm.flow.addUpdateCommand(request.properties.status, Dbm.commands.callFunction(this._created.bind(this), [Dbm.core.source.staticObject(request, "item")]));
     }
 
-    _created(aItem) {
-        console.log("_created");
-        console.log(aItem);
-
+    _getEditor() {
         let itemEditor = this.context.itemEditor;
 
         let direction = this.getPropValue("direction");
@@ -291,9 +327,21 @@ export default class HierarchyOrderedRelationsList extends Dbm.react.BaseObject
             console.error("Unknown direction", direction, this);
         }
 
+        return editor;
+    }
+
+    _created(aItem) {
+        console.log("_created");
+        console.log(aItem);
+
+        let editor = this._getEditor();
+
         let newValues = [].concat(editor.value);
         newValues.push(aItem.id);
         editor.value = newValues;
+
+        let hierarchyValue = this._getFullHierarchy();
+        this._orderEditor.value = hierarchyValue;
     }
 
     _renderMainElement() {
@@ -302,7 +350,7 @@ export default class HierarchyOrderedRelationsList extends Dbm.react.BaseObject
         let children = this.getPropValue("children");
 
         return React.createElement("div", {},
-            React.createElement(Dbm.react.context.AddContextVariables, {"values": {"dragController": this}},
+            React.createElement(Dbm.react.context.AddContextVariables, {"values": {"dragController": this, "hierarchyController": this}},
                 React.createElement(Dbm.react.form.LabelledArea, {label: label}), 
                 React.createElement("div", {"className": ""},
                     React.createElement(Dbm.react.area.List, {items: this.item.hierarchy.properties.children, as: "hierarchyItem"},