dbm 1.1.6 → 1.1.7

package/flow/controllers/interaction/MoveElement.js

@@ -118,11 +118,8 @@ export default class MoveElement extends Dbm.core.BaseObject {
 		let minY = this.item.minY;
 		let maxY = this.item.maxY;
 		
-		this.item.xParameter = Math.max(minX, Math.min(x, maxX));
-        this.item.yParameter = Math.max(minY, Math.min(y, maxY));
-		
-        console.log(this.item.xParameter);
-        console.log(this.item.yParameter);
+		this.item.properties.xParameter.getMostUpstreamProperty().value = Math.max(minX, Math.min(x, maxX));
+        this.item.properties.yParameter.getMostUpstreamProperty().value = Math.max(minY, Math.min(y, maxY));
 	}
 	
 	_callback_mouseUp(aEvent) {
@@ -146,7 +143,7 @@ export default class MoveElement extends Dbm.core.BaseObject {
 	}
 	
 	_callback_mouseMove(aEvent) {
-		console.log("_callback_mouseMove");
+		//console.log("_callback_mouseMove");
 		//console.log(aEvent);
 		
 		if(aEvent.type === "touchmove") {
@@ -158,7 +155,7 @@ export default class MoveElement extends Dbm.core.BaseObject {
 	}
 	
 	_callback_startDrag(aEvent) {
-		console.log("_callback_startDrag");
+		//console.log("_callback_startDrag");
 		//console.log(aEvent, aEvent.type);
 		
 		if(aEvent.type === "touchstart") {

package/graphapi/webclient/WebSocketConnection.js

@@ -65,6 +65,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
     requestRange(aSelect, aEncode) {
         let item = this._getRequestItem();
         item.setValue("requestData", {"type": "range", "select": aSelect, "encode": aEncode, "requestId": item.id});
+        item.requireProperty("items", []);
         this._runRequest(item);
         
         return item;

package/graphapi/webclient/decode/DecodeBaseObject.js

@@ -41,7 +41,12 @@ export default class DecodeBaseObject extends Dbm.core.BaseObject {
             for(let i = 0; i < currentArrayLength; i++) {
                 let currentField = currentArray[i];
                 let currentIds = aData[currentField];
-                aItem.setValue(currentField, Dbm.getInstance().repository.getItems(currentIds));
+                if(currentIds) {
+                    aItem.setValue(currentField, Dbm.getInstance().repository.getItems(currentIds));
+                }
+                else {
+                    aItem.setValue(currentField, []);
+                }
             }
         }
     }

package/graphapi/webclient/decode/index.js

@@ -63,6 +63,14 @@ export const fullSetup = function() {
         currentDecoder.item.register(decodePrefix + name);
     }
 
+    {
+        let name = "pageRepresentation";
+        let currentDecoder = new Dbm.graphapi.webclient.decode.DecodeBaseObject();
+        currentDecoder.item.setValue("copyLink", ["representing"]);
+        currentDecoder.item.setValue("encodingType", name);
+        currentDecoder.item.register(decodePrefix + name);
+    }
+
     {
         let name = "navigationName";
         let currentDecoder = new Dbm.graphapi.webclient.decode.DecodeBaseObject();
@@ -101,4 +109,12 @@ export const fullSetup = function() {
         currentDecoder.item.setValue("encodingType", name);
         currentDecoder.item.register(decodePrefix + name);
     }
+
+    {
+        let name = "representingPage";
+        let currentDecoder = new Dbm.graphapi.webclient.decode.DecodeBaseObject();
+        currentDecoder.item.setValue("copyLink", ["representingPage"]);
+        currentDecoder.item.setValue("encodingType", name);
+        currentDecoder.item.register(decodePrefix + name);
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "main": "index.js",
   "type": "module",
   "scripts": {},

package/react/admin/EditPage.js

@@ -22,6 +22,8 @@ export default class EditPage extends Dbm.react.BaseObject {
         let descriptionEditor = itemEditor.addFieldEditor("meta/description", page["meta/description"], "meta/description");
         let descriptionLength = Dbm.flow.updatefunctions.basic.length(descriptionEditor.item.editValue.value);
         this.item.requireProperty("descriptionLength", 0).connectInput(descriptionLength.output.properties.length);
+
+        this.item.requireProperty("importText", "");
     }
 
     _save() {
@@ -37,11 +39,64 @@ export default class EditPage extends Dbm.react.BaseObject {
         itemSaveData.setField("lastModified", (new Date()).toISOString());
         itemSaveData.createChange("clearCache", {});
 
-        console.log(editorGroup, saveData);
-
         saveData.save();
     }
 
+    _export() {
+        let editorGroup = this.item.editorGroup;
+
+        let page = this.context.page;
+        let id = page.id;
+        let itemEditor = editorGroup.getItemEditor(id);
+        let url = itemEditor.addFieldEditor("url").item.editValue.value.value;   
+        let content = itemEditor.addFieldEditor("content").item.editValue.value.value;
+
+        let blob = new Blob([JSON.stringify(content, null, 2)], { type: 'application/json' });
+        let downloadUrl = URL.createObjectURL(blob);
+
+        let fileName = id  + Dbm.utils.StringFunctions.createNiceFilePath(url) + ".json";
+        let a = document.createElement('a');
+        a.href = downloadUrl;
+        a.download = fileName;
+        document.body.appendChild(a);
+        a.click();
+
+        document.body.removeChild(a);
+        URL.revokeObjectURL(downloadUrl);
+    }
+
+    _import() {
+
+        let editorGroup = this.item.editorGroup;
+
+        let page = this.context.page;
+        let id = page.id;
+        let itemEditor = editorGroup.getItemEditor(id); 
+        
+
+        let data = JSON.parse(this.item.importText);
+        console.log(data);
+
+        let newContent = {...itemEditor.addFieldEditor("content").item.editValue.value.value};
+        if(!newContent) {
+            newContent = {};
+        }
+        if(!newContent.blocks) {
+            newContent.blocks = [];
+        }
+
+        let currentArray = data.blocks;
+        let currentArrayLength = currentArray.length;
+        for(let i = 0; i < currentArrayLength; i++) {
+            let currentBlock = currentArray[i];
+            delete currentBlock["id"];
+            newContent.blocks.push(currentBlock);
+        }
+        
+        itemEditor.addFieldEditor("content").item.editValue.value.value = newContent;
+        this.item.editor.contentUpdatedExternally();
+    }
+
     _generateSeoSummary() {
 
         let page = this.context.page;
@@ -122,7 +177,15 @@ export default class EditPage extends Dbm.react.BaseObject {
                         "Content"
                     ),
                     React.createElement("div", {},
-                        React.createElement(Dbm.react.admin.editor.Editor, {"value": itemEditor.getEditor("content").item.editValue.value}),
+                        React.createElement(Dbm.react.admin.editor.Editor, {"value": itemEditor.getEditor("content").item.editValue.value, "ref": this.createRef("editor")}),
+                    ),
+                    React.createElement("div", {className: "spacing small"}),
+                    React.createElement("div", {"className": "standard-button standard-button-padding", "onClick": () => {this._export()}},
+                        "Export"
+                    ),
+                    React.createElement(Dbm.react.form.FormField, {value: this.item.properties.importText}),
+                    React.createElement("div", {"className": "standard-button standard-button-padding", "onClick": () => {this._import()}},
+                        "Import"
                     )
                 ),
                 React.createElement("div", {className: "spacing standard"}),

package/react/admin/editor/Editor.js

@@ -153,6 +153,14 @@ export default class Editor extends Dbm.react.BaseObject {
         }
     }
 
+    contentUpdatedExternally() {
+
+        let data = this.getDynamicProp("value").value;
+        this.item.editor.render(data);
+
+        return this;
+    }
+
     /*
     _save() {
         this.item.editor.save().then((aOutputData) => {

package/react/admin/editor/fields/SelectObjectField.js

@@ -0,0 +1,57 @@
+import React from "react";
+import Dbm from "../../../../index.js";
+
+export default class SelectObjectField extends Dbm.react.BaseObject {
+    _construct() {
+        super._construct();
+
+        this._valueChangedBound = this._valueChanged.bind(this);
+        this._objectChangedBound = this._objectChanged.bind(this);
+
+        Dbm.flow.addUpdateCommand(this.item.requireProperty("value", this._getObjectData()), Dbm.commands.callFunction(this._valueChangedBound));
+
+        let editorData = Dbm.objectPath(this.context, "moduleData.editorData");
+        Dbm.flow.addUpdateCommand(editorData.properties.data, Dbm.commands.callFunction(this._objectChangedBound));
+    }
+
+    _getObjectData() {
+        let fieldName = this.getPropValue("name");
+
+        let editorData = Dbm.objectPath(this.context, "moduleData.editorData");
+
+        console.log(">>>>>", editorData);
+
+        let returnData = editorData.data[fieldName];
+        if(!returnData) {
+            returnData = 0;
+        }
+
+        return returnData;
+    }
+
+
+    _valueChanged() {
+        //console.log("_valueChanged");
+
+        let fieldName = this.getPropValue("name");
+        let newValue = this.item.value;
+        let editorData = Dbm.objectPath(this.context, "moduleData.editorData");
+
+        let newData = {...editorData.data};
+        newData[fieldName] = newValue;
+
+        editorData.data = newData;
+
+        this.context.moduleData.editorData.editorBlock.dataUpdated();
+    }
+
+    _objectChanged() {
+        //console.log("_objectChanged");
+
+        this.item.value = this._getObjectData();
+    }
+
+    _renderMainElement() {
+        return this._createMainElement(Dbm.react.form.GraphApiObjectSelection, {value: this.item.properties.value, objectType: this.getPropValue("objectType"), className: "standard-field standard-field-padding full-width"});
+    }
+}

package/react/admin/editor/fields/index.js

@@ -1,4 +1,5 @@
 export {default as TextField} from "./TextField.js";
 export {default as RichTextField} from "./RichTextField.js";
 export {default as ImageField} from "./ImageField.js";
-export {default as CheckboxField} from "./CheckboxField.js";
+export {default as CheckboxField} from "./CheckboxField.js";
+export {default as SelectObjectField} from "./SelectObjectField.js";

package/react/area/List.js

@@ -27,6 +27,10 @@ export default class List extends Dbm.react.BaseObject {
         let mainChildren = slots.main;
 
         let currentArray = items;
+        if(!currentArray || isNaN(currentArray.length)) {
+            console.error("Items is not an array", this);
+            return null;
+        }
         let currentArrayLength = currentArray.length;
         let newChildren = [];
         for(let i = 0; i < currentArrayLength; i++) {

package/react/context/AddItemToContext.js

@@ -0,0 +1,24 @@
+import React from "react";
+import Dbm from "../../index.js";
+
+export default class AddItemToContext extends Dbm.react.BaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    render() {
+        
+        let item = this.getPropValue("item");
+        let id = Dbm.objectPath(item, "id");
+
+        let as = this.getPropValue("as");
+        if(!as) {
+            as = "item";
+        }
+
+        let values = {};
+        values[as] = item;
+
+        return React.createElement(Dbm.react.context.AddContextVariables, {"values": values, "key": id}, this.props.children);
+    }
+}

package/react/context/index.js

@@ -1,2 +1,3 @@
 export {default as Context} from "./Context.js";
-export {default as AddContextVariables} from "./AddContextVariables.js";
+export {default as AddContextVariables} from "./AddContextVariables.js";
+export {default as AddItemToContext} from "./AddItemToContext.js";

package/react/form/GraphApiObjectSelection.js

@@ -0,0 +1,53 @@
+import React from "react";
+import Dbm from "../../index.js";
+
+export default class GraphApiObjectSelection extends Dbm.react.form.Selection {
+    _construct() {
+        super._construct();
+
+        this.getDynamicProp("value", "");
+        this.item.requireProperty("items", []);
+
+        let objectType = this.getPropValue("objectType")
+
+        let graphApi = Dbm.getInstance().repository.getItem("graphApi").controller;
+        {
+            let request = graphApi.requestRange(
+                [
+                    {"type": "byObjectType", "objectType": objectType},
+                    {"type": "includeDraft"},
+                    {"type": "includePrivate"}
+                ],
+                ["name"]
+            );
+
+    
+           Dbm.flow.addUpdateCommandWhenMatched(request.properties.status, Dbm.loading.LoadingStatus.LOADED, Dbm.commands.callFunction(this._itemsLoaded.bind(this), [request]));
+        }
+    }
+
+    _itemsLoaded(aRequest) {
+        let options = [];
+
+        options.push(React.createElement("option", {key: 0, value: 0}, "None"));
+
+        let currentArray = [].concat(aRequest.items);
+        Dbm.utils.ArrayFunctions.sortOnField(currentArray, "name");
+
+        let currentArrayLength = currentArray.length;
+        for(let i = 0; i < currentArrayLength; i++) {
+            let currentItem = currentArray[i];
+            options.push(React.createElement("option", {key: currentItem["id"], value: currentItem["id"]}, currentItem["name"] + " (id: " + currentItem["id"] + ")"));
+        }
+
+        this.item.items = options;
+    }
+
+    _renderMainElement() {
+
+        let value = this.getDynamicProp("value");
+
+        return this._createMainElement(Dbm.react.form.Selection, {"value": value}, this.item.properties.items);
+    }
+}
+

package/react/form/Selection.js

@@ -0,0 +1,29 @@
+import React from "react";
+import Dbm from "../../index.js";
+
+export default class Selection extends Dbm.react.BaseObject {
+    _construct() {
+        super._construct();
+
+        this.getDynamicProp("value", "");
+
+        this._callback_changeBound = this._callback_change.bind(this);
+    }
+
+    _callback_change(aEvent) {
+        //console.log("_callback_change");
+        //console.log(aEvent);
+
+        let value = aEvent.target.value;
+
+        this.getDynamicProp("value").getMostUpstreamProperty().setValue(value);
+    }
+
+    _renderMainElement() {
+
+        let value = this.getDynamicProp("value").value;
+
+        return this._createMainElement("select", {"value": value, onChange: this._callback_changeBound}, this.getPropValue("children"));
+    }
+}
+

package/react/form/index.js

@@ -1,4 +1,6 @@
 export {default as Checkbox} from "./Checkbox.js";
 export {default as FormField} from "./FormField.js";
 export {default as LabelledArea} from "./LabelledArea.js";
-export {default as FileDropArea} from "./FileDropArea.js";
+export {default as FileDropArea} from "./FileDropArea.js";
+export {default as Selection} from "./Selection.js";
+export {default as GraphApiObjectSelection} from "./GraphApiObjectSelection.js";

package/utils/ArrayFunctions.js

@@ -117,6 +117,17 @@ export const arrayOrSeparatedString = function(aData, aSeparator = ",", aTrim =
     return [];
 }
 
+export const numericArrayOrSeparatedString = function(aData, aSeparator = ",", aTrim = 3) {
+    let returnArray = new Array();
+    let currentArray = arrayOrSeparatedString(aData, aSeparator, aTrim);
+    let currentarrayLength = currentArray.length;
+    for(let i = 0; i < currentarrayLength; i++) {
+        returnArray.push(parseFloat(currentArray[i]));
+    }
+    
+    return returnArray;
+}
+
 export const filterByField = function(aArray, aField, aValue) {
     let returnArray = [];
 
@@ -144,4 +155,117 @@ export const mapField = function(aArray, aField) {
     }
 
     return returnArray;
+}
+
+export const group = function(aArray, aField) {
+   
+    let groups = new Map();
+
+    let currentArray = aArray;
+    let currentArrayLength = currentArray.length;
+    for(let i = 0; i < currentArrayLength; i++) {
+        let currentObject = aArray[i];
+        let groupValue = Dbm.objectPath(aArray[i], aField);
+
+        if(!groups.has(groupValue)) {
+            groups.set(groupValue, []);
+        }
+
+        groups.get(groupValue).push(currentObject);
+    }
+
+    let returnArray = [];
+
+    for (const value of groups.entries()) {
+        returnArray.push({"key": value[0], "value": value[1]});
+    }
+
+    return returnArray;
+}
+
+export const makeFlat = function(aArray) {
+    let returnArray = [];
+
+    let currentArray = aArray;
+    let currentArrayLength = currentArray.length;
+    for(let i = 0; i < currentArrayLength; i++) {
+        returnArray = returnArray.concat(currentArray[i]);
+    }
+
+    return returnArray;
+}
+
+export const getUnselectedItems = function(aSelectedItems, aAllItems) {
+    let returnItems = new Array();
+    
+    let currentArray = aAllItems;
+    let currentArrayLength = currentArray.length;
+    for(let i = 0; i < currentArrayLength; i++) {
+        let currentItem = currentArray[i];
+        if(aSelectedItems.indexOf(currentItem) === -1) {
+            returnItems.push(currentItem);
+        }
+    }
+    
+    return returnItems;
+}
+
+export const sortOnField = function(aArray, aField) {
+    let sortFunction = function(aA, aB) {
+        let aValue = Dbm.objectPath(aA, aField);
+        let bValue = Dbm.objectPath(aB, aField);
+
+        if(aValue < bValue) {
+            return -1;
+        }
+        else if(aValue > bValue) {
+            return 1;
+        }
+
+        return 0;
+    }
+
+    aArray.sort(sortFunction);
+    
+    return aArray;
+}
+
+export const sortOnNumericField = function(aArray, aField) {
+    let sortFunction = function(aA, aB) {
+        let aValue = 1*Dbm.objectPath(aA, aField);
+        let bValue = 1*Dbm.objectPath(aB, aField);
+
+        if(aValue < bValue) {
+            return -1;
+        }
+        else if(aValue > bValue) {
+            return 1;
+        }
+
+        return 0;
+    }
+
+    aArray.sort(sortFunction);
+    
+    return aArray;
+}
+
+export const getItemIndexByIfExists = function(aArray, aField, aIdentifier) {
+		
+    if(!Array.isArray(aArray)) {
+        console.warn("No array provided", aArray);
+        return -1;
+    }
+    
+    let currentArray = aArray;
+    let currentArrayLength = currentArray.length;
+    for(let i = 0; i < currentArrayLength; i++) {
+        let currentItem = currentArray[i];
+        let currentValue = Dbm.objectPath(currentItem, aField);
+        if(currentValue == aIdentifier) {
+            return i;
+        }
+    }
+    
+    return -1;
 }