dbm 1.0.6 → 1.1.1

package/flow/controllers/index.js

@@ -0,0 +1 @@
+export * as select from "./select/index.js";

package/flow/controllers/select/SingleSelection.js

@@ -0,0 +1,65 @@
+import Dbm from "../../../index.js";
+
+export default class SingleSelection extends Dbm.core.BaseObject {
+    _construct() {
+        super._construct();
+
+        let valueUpdatedCommand = Dbm.commands.callFunction(this._valueUpdated.bind(this));
+
+        this._selectionChangedBound = this._selectionChanged.bind(this);
+
+        Dbm.flow.addUpdateCommand(this.item.requireProperty("value", null), valueUpdatedCommand);
+        Dbm.flow.addUpdateCommand(this.item.requireProperty("selections", []), valueUpdatedCommand);
+
+        this.item.requireProperty("matched", false);
+    }
+
+    addSelectionValue(aValue) {
+        let selections = [].concat(this.item.selections);
+
+        let property = new Dbm.flow.FlowProperty();
+        property.setValue(false);
+        Dbm.flow.addUpdateCommand(property, Dbm.commands.callFunction(this._selectionChangedBound, [property, aValue]));
+
+        selections.push({"value": aValue, "property": property});
+        this.item.selections = selections;
+
+        return property;
+    }
+
+    _selectionChanged(aSelected, aValue) {
+        //console.log("_selectionChanged");
+        //console.log(aSelected, aValue);
+
+        if(aSelected) {
+            this.item.properties.value.getMostUpstreamProperty().setValue(aValue);
+        }
+        else {
+            if(this.item.properties.value === aValue) {
+                this.item.properties.value.getMostUpstreamProperty().setValue(null);
+            }
+        }
+    }
+
+    _valueUpdated() {
+        //console.log("_valueUpdated");
+        let value = this.item.value;
+
+        let matched = false;
+
+        let currentArray = this.item.selections;
+        let currentArrayLength = currentArray.length;
+        for(let i = 0; i < currentArrayLength; i++) {
+            let currentSelection = currentArray[i];
+            if(currentSelection.value === value) {
+                currentSelection.property.value = true;
+                matched = true;
+            }
+            else {
+                currentSelection.property.value = false;
+            }
+        }
+
+        this.item.matched = matched;
+    }
+}

package/flow/controllers/select/index.js

@@ -0,0 +1 @@
+export {default as SingleSelection} from "./SingleSelection.js";

package/flow/index.js

@@ -9,6 +9,7 @@ export {default as DirtyCommands} from "./DirtyCommands.js";
 export {default as FlowPropertyWithExternalInput} from "./FlowPropertyWithExternalInput.js";
 
 export * as updatefunctions from "./updatefunctions/index.js";
+export * as controllers from "./controllers/index.js";
 
 export let addUpdateCommand = function(aProperty, aCommand) {
     let updateFunction = new Dbm.flow.updatefunctions.basic.RunCommand();

package/flow/updatefunctions/basic/Length.js

@@ -0,0 +1,20 @@
+import Dbm from "../../../index.js";
+
+export default class Length extends Dbm.flow.FlowUpdateFunction {
+
+    _construct() {
+        super._construct();
+        
+        this.input.register("value", "");
+
+        this.output.register("length", 0);
+    }
+
+    _update() {
+        //console.log("_update");
+
+        let value = this.input.value;
+        
+        this.output.length = value ? value.length : 0;
+    }
+}

package/flow/updatefunctions/basic/PropertyOf.js

@@ -0,0 +1,21 @@
+import Dbm from "../../../index.js";
+
+export default class Length extends Dbm.flow.FlowUpdateFunction {
+
+    _construct() {
+        super._construct();
+        
+        this.input.register("value", "");
+        this.input.register("propertyName", "");
+
+        this.output.register("value", null);
+    }
+
+    _update() {
+        //console.log("_update");
+
+        let value = this.input.value;
+        
+        this.output.value = Dbm.objectPath(value, this.input.propertyName);
+    }
+}

package/flow/updatefunctions/basic/index.js

@@ -2,6 +2,8 @@ import Dbm from "../../../index.js";
 
 export {default as RunCommand} from "./RunCommand.js";
 export {default as CombineString} from "./CombineString.js";
+export {default as Length} from "./Length.js";
+export {default as PropertyOf} from "./PropertyOf.js";
 
 export const runCommand = function(aValue, aCommand) {
 	let updateFunction = new Dbm.flow.updatefunctions.basic.RunCommand();
@@ -15,4 +17,19 @@ export const transformValue = function(aValue, aFunction) {
 	let command = Dbm.commands.callFunction(aFunction, [Dbm.core.source.event()]);
 	
 	return Dbm.flow.updatefunctions.basic.runCommand(aValue, command);
+}
+
+export const length = function(aValue) {
+	let updateFunction = new Dbm.flow.updatefunctions.basic.Length();
+	updateFunction.input.properties.value.setOrConnect(aValue);
+	
+	return updateFunction;
+}
+
+export const propertyOf = function(aValue, aPropertyName) {
+	let updateFunction = new Dbm.flow.updatefunctions.basic.PropertyOf();
+	updateFunction.input.properties.value.setOrConnect(aValue);
+	updateFunction.input.properties.propertyName.setOrConnect(aPropertyName);
+	
+	return updateFunction;
 }

package/flow/updatefunctions/dom/ElementPosition.js

@@ -49,7 +49,7 @@ export default class ElementPosition extends Dbm.flow.FlowUpdateFunction {
     }
 
     _callback_scroll(aEvent) {
-        console.log("_callback_scroll");
+        //console.log("_callback_scroll");
 
         let element = this.input.element;
 

package/flow/updatefunctions/dom/HorizontalFlip.js

@@ -6,11 +6,10 @@ export default class HorizontalFlip extends Dbm.flow.FlowUpdateFunction {
         super._construct();
         
         this.input.register("envelope", 0);
-        console.log(this.input.properties.envelope);
         this.input.register("perspective", "3000px");
 
         this.output.register("style1", {});
-        this.output.register("style2", {"opacity": 0, "position": "absolute", "top": 0, "left": 0, "width": "100%", "dispaly": "none"});
+        this.output.register("style2", {"opacity": 0, "position": "absolute", "top": 0, "left": 0, "width": "100%", "display": "none"});
         this.output.register("inDom1", true);
         this.output.register("inDom2", false);
     }
@@ -28,12 +27,12 @@ export default class HorizontalFlip extends Dbm.flow.FlowUpdateFunction {
         this.output.inDom2 = inDom2;
 
         if(!inDom1) {
-            this.output.style1 = {"opacity": 0, "position": "absolute", "top": 0, "left": 0, "width": "100%", "dispaly": "none"};
+            this.output.style1 = {"opacity": 0, "position": "absolute", "top": 0, "left": 0, "width": "100%", "display": "none"};
             this.output.style2 = {};
         }
         else if(!inDom2) {
             this.output.style1 = {};
-            this.output.style2 = {"opacity": 0, "position": "absolute", "top": 0, "left": 0, "width": "100%", "dispaly": "none"};
+            this.output.style2 = {"opacity": 0, "position": "absolute", "top": 0, "left": 0, "width": "100%", "display": "none"};
         }
         else {
             let angle1 = 180*envelope;
@@ -49,7 +48,7 @@ export default class HorizontalFlip extends Dbm.flow.FlowUpdateFunction {
                 styleObject2["position"] = "absolute";
                 styleObject2["top"] = 0;
                 styleObject2["left"] = 0;
-                styleObject2["width"] = 0;
+                styleObject2["width"] = "100%";
             }
             else {
                 styleObject1["opacity"] = 0;
@@ -57,7 +56,7 @@ export default class HorizontalFlip extends Dbm.flow.FlowUpdateFunction {
                 styleObject1["position"] = "absolute";
                 styleObject1["top"] = 0;
                 styleObject1["left"] = 0;
-                styleObject1["width"] = 0;
+                styleObject1["width"] = "100%";
             }
 
             this.output.style1 = styleObject1;

package/flow/updatefunctions/dom/StyleObject.js

@@ -33,7 +33,7 @@ export default class StyleObject extends Dbm.flow.FlowUpdateFunction {
             let unit = this.input.units[objectName].value;
 
             if(unit) {
-                value += " " + unit;
+                value += "" + unit;
             }
             styleObject[objectName] = value;
         }

package/flow/updatefunctions/logic/Condition.js

@@ -15,6 +15,17 @@ export default class Condition extends Dbm.flow.FlowUpdateFunction {
     _update() {
         //console.log("_update");
 
-        this.output.result = this.input.operation.call(this, this.input.input1, this.input.input2);
+        let operation = this.input.operation;
+        if(typeof(operation) === "string") {
+            if(operation === "!==") {
+                operation = function(aA, aB) {return aA !== aB;}
+            }
+            else {
+                //METODO: add more operations
+                operation = function(aA, aB) {return aA === aB;}
+            }
+        }
+
+        this.output.result = operation.call(this, this.input.input1, this.input.input2);
     }
 }

package/flow/updatefunctions/logic/Invert.js

@@ -0,0 +1,18 @@
+import Dbm from "../../../index.js";
+
+export default class Invert extends Dbm.flow.FlowUpdateFunction {
+
+    _construct() {
+        super._construct();
+        
+        this.input.register("input", false);
+
+        this.output.register("result", true);
+    }
+
+    _update() {
+        //console.log("_update");
+
+        this.output.result = !this.input.input;
+    }
+}

package/flow/updatefunctions/logic/Switch.js

@@ -12,6 +12,12 @@ export default class Switch extends Dbm.flow.FlowUpdateFunction {
         this.output.register("value", null);
     }
 
+    setDefaultValue(aValue) {
+        this.input.properties.defaultValue.setOrConnect(aValue);
+
+        return this;
+    }
+
     addCase(aKey, aOutputValue) {
 
         let newCase = {key: aKey, value: aOutputValue};

package/flow/updatefunctions/logic/index.js

@@ -10,6 +10,7 @@ export {default as All} from "./All.js";
 export {default as Any} from "./Any.js";
 export {default as AllAtValue} from "./AllAtValue.js";
 export {default as WhenMatched} from "./WhenMatched.js";
+export {default as Invert} from "./Invert.js";
 
 export let subtract = function(aInput1 = 0, aInput2 = 0) {
     let updateFunction = new Dbm.flow.updatefunctions.logic.Subtraction();
@@ -19,6 +20,13 @@ export let subtract = function(aInput1 = 0, aInput2 = 0) {
     return updateFunction;
 }
 
+export let invert = function(aValue = false) {
+    let updateFunction = new Dbm.flow.updatefunctions.logic.Invert();
+    updateFunction.input.properties.input.setValue(aValue);
+
+    return updateFunction;
+}
+
 export let invertP = function(aP = 0) {
     let updateFunction = new Dbm.flow.updatefunctions.logic.Subtraction();
     updateFunction.input.properties.input1.setValue(1);

package/graphapi/webclient/GraphApi.js

@@ -32,6 +32,10 @@ export default class GraphApi extends Dbm.core.BaseObject {
         return this._websocketConnection.requestData(aFunctionName, aData);
     }
 
+    performAction(aFunctionName, aData) {
+        return this._websocketConnection.performAction(aFunctionName, aData);
+    }
+
     createItem(aTypes, aVisibility = "draft", aChanges = [], aEncode = []) {
         return this._websocketConnection.createItem(aTypes, aVisibility, aChanges, aEncode);
     }

package/graphapi/webclient/WebSocketConnection.js

@@ -50,14 +50,16 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
     }
 
     _runRequest(aRequestItem) {
-        let newRequests = [].concat(this.item.requests);
-        newRequests.push(aRequestItem);
-        this.item.setValue("requests", newRequests);
-
+        
         if(this.item.status === 1) {
             aRequestItem.setValue("status", Dbm.loading.LoadingStatus.LOADING);
             this._webSocket.send(JSON.stringify(aRequestItem.requestData));
         }
+        else {
+            let newRequests = [].concat(this.item.requests);
+            newRequests.push(aRequestItem);
+            this.item.setValue("requests", newRequests);
+        }
     }
 
     requestRange(aSelect, aEncode) {
@@ -85,6 +87,15 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
         return item;
     }
 
+    performAction(aFunctionName, aData) {
+        //console.log("performAction");
+        let item = this._getRequestItem();
+        item.setValue("requestData", {"type": "action", "functionName": aFunctionName, "data": aData, "requestId": item.id});
+        this._runRequest(item);
+        
+        return item;
+    }
+
     createItem(aTypes, aVisibility = "draft", aChanges = [], aEncode = []) {
         let item = this._getRequestItem();
         item.setValue("requestData", {"type": "admin/createObject", "types": aTypes, "visibility": aVisibility, "changes": aChanges, "encode": aEncode, "requestId": item.id});
@@ -111,7 +122,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
     }
 
     _callback_onOpen(aEvent) {
-        console.log("_callback_onOpen");
+        //console.log("_callback_onOpen");
 
 		if(this._intervalId === -1) {
 			this._intervalId = setInterval(this._callback_sendHeartbeatBound, 20*1000);
@@ -119,8 +130,8 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
     }
 	
     _callback_onClose(aEvent) {
-        console.log("_callback_onClose");
-		console.log(aEvent);
+        //console.log("_callback_onClose");
+		//console.log(aEvent);
 		
 		if(this._intervalId !== -1) {
 			clearInterval(this._intervalId);
@@ -148,13 +159,14 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
     }
 	
 	_callback_sendHeartbeat() {
-		console.log("_callback_sendHeartbeat");
+		//console.log("_callback_sendHeartbeat");
 		
 		this._webSocket.send(JSON.stringify({"type": "heartbeat"}));
 	}
 
     _connectionReady() {
         this.item.setValue("status", 1);
+
         let currentArray = this.item.requests;
         let currentArrayLength = currentArray.length;
         for(let i = 0; i < currentArrayLength; i++) {
@@ -162,6 +174,8 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
             currentItem.setValue("status", Dbm.loading.LoadingStatus.LOADING);
             this._webSocket.send(JSON.stringify(currentItem.requestData));
         }
+
+        this.item.requests = [];
     }
 
     _callback_onMessage(aEvent) {
@@ -207,6 +221,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
                 }
                 break;
             case "data/response":
+            case "action/response":
                 {
                     let item = repository.getItem(data["requestId"]);
                     item.setValue("data", data["data"]);

package/graphapi/webclient/decode/index.js

@@ -62,6 +62,22 @@ let fullSetup = function() {
         currentDecoder.item.setValue("encodingType", name);
         currentDecoder.item.register(decodePrefix + name);
     }
+
+    {
+        let name = "navigationName";
+        let currentDecoder = new Dbm.graphapi.webclient.decode.DecodeBaseObject();
+        currentDecoder.item.setValue("copyFields", ["navigationName"]);
+        currentDecoder.item.setValue("encodingType", name);
+        currentDecoder.item.register(decodePrefix + name);
+    }
+
+    {
+        let name = "breadcrumb";
+        let currentDecoder = new Dbm.graphapi.webclient.decode.DecodeBaseObject();
+        currentDecoder.item.setValue("copyLinks", ["breadcrumbs"]);
+        currentDecoder.item.setValue("encodingType", name);
+        currentDecoder.item.register(decodePrefix + name);
+    }
 }
 
 export {fullSetup};

package/package.json

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

package/react/BaseObject.js

@@ -25,7 +25,7 @@ export default class BaseObject extends Component {
             if(currentProp && currentProp.isSource) {
                 currentProp = currentProp.getSource(this);
                 let currentDynamicProperty = this.getDynamicProp(objectName);
-                currentDynamicProperty.setValue(currentProp);
+                currentDynamicProperty.setOrConnect(currentProp);
             }
             else if(currentProp && currentProp.isFlowProperty) {
                 let currentDynamicProperty = this.getDynamicProp(objectName);
@@ -129,15 +129,13 @@ export default class BaseObject extends Component {
         return this._performCreateMainElement(aType, aProps, children);
     }
 
-    _performCreateMainElement(aType, aProps, children) {
+    _removedUsedProps(aProps) {
+        
+    }
 
+    _copyProps(aProps) {
         let newProps = {...aProps};
 
-        let elementType = this.getProp("elementType");
-        if(elementType) {
-            aType = elementType;
-        }
-
         for(let objectName in this.props) {
             let currentValue = this.getPropValue(objectName);
             switch(objectName) {
@@ -178,6 +176,19 @@ export default class BaseObject extends Component {
             }
         }
 
+        this._removedUsedProps(newProps);
+        return newProps;
+    }
+
+    _performCreateMainElement(aType, aProps, children) {
+
+        let newProps = this._copyProps(aProps);
+
+        let elementType = this.getProp("elementType");
+        if(elementType) {
+            aType = elementType;
+        }
+
         if(!children || !children.length) {
             return createElement(aType, newProps);
         }

package/react/ChildFunctions.js

@@ -0,0 +1,27 @@
+import Dbm from "../index.js";
+
+export const splitIntoSlots = function(aChildren) {
+    let returnObject = {};
+
+    aChildren = Dbm.utils.ArrayFunctions.singleOrArray(aChildren);
+
+    if(aChildren) {
+        let currentArray = aChildren;
+        let currentArrayLength = currentArray.length;
+        for(let i = 0; i < currentArrayLength; i++) {
+            let currentElement = currentArray[i];
+            let currentSlot = Dbm.objectPath(currentElement, "props.data-slot");
+            if(!currentSlot) {
+                currentSlot = "main";
+            }
+            let currentArea = returnObject[currentSlot];
+            if(!currentArea) {
+                returnObject[currentSlot] = currentArea = [];
+            }
+            currentArea.push(currentElement);
+        }
+    }
+    
+
+    return returnObject;
+}

package/react/admin/EditPage.js

@@ -8,10 +8,15 @@ export default class EditPage extends Dbm.react.BaseObject {
         let page = this.context.page;
 
         this.item.setValue("title", page.title);
+        this.item.setValue("navigationName", page.navigationName);
         this.item.setValue("content", page.content);
         this.item.setValue("description", page["meta/description"]);
         this.item.setValue("url", page.url);
 
+        let descriptionLength = Dbm.flow.updatefunctions.basic.length(this.item.properties.description);
+
+        this.item.requireProperty("descriptionLength", 0).connectInput(descriptionLength.output.properties.length);
+
         //METODO: add editors
     }
 
@@ -21,16 +26,33 @@ export default class EditPage extends Dbm.react.BaseObject {
         let page = this.context.page;
         let id = page.id;
         let graphApi = Dbm.getInstance().repository.getItem("graphApi").controller;
+        //console.log(this.item.content);
+        //console.log(this.item.content.blocks[1].data.text);
 
         graphApi.editItem(id, [
             {"type": "setField", "data": {"value": this.item.content, "field": "content"}},
             {"type": "setField", "data": {"value": this.item.title, "field": "title"}},
+            {"type": "setField", "data": {"value": this.item.navigationName, "field": "navigationName"}},
             {"type": "setField", "data": {"value": this.item.description, "field": "meta/description"}},
 			{"type": "setField", "data": {"value": (new Date()).toISOString(), "field": "lastModified"}},
             {"type": "setUrl", "data": {"value": this.item.url}}
         ], ["content", "title", "url", "meta/description"]);
     }
 
+    _generateSeoSummary() {
+        let graphApi = Dbm.getInstance().repository.getItem("graphApi").controller;
+
+        let request = graphApi.requestData("admin/seoSummary", {"value": {"title": this.item.title, "content": this.item.content}});
+        Dbm.flow.addUpdateCommandWhenMatched(request.properties.status, Dbm.loading.LoadingStatus.LOADED, Dbm.commands.callFunction(this._dataLoaded.bind(this), [request]));
+
+    }
+
+    _dataLoaded(aRequest) {
+        let summary = Dbm.objectPath(aRequest, "data.seoSummary");
+
+        this.item.description = summary;
+    }
+
     _renderMainElement() {
 
         return React.createElement("div", {},
@@ -42,6 +64,13 @@ export default class EditPage extends Dbm.react.BaseObject {
                     React.createElement(Dbm.react.form.FormField, {"value": this.item.properties.title, className: "standard-field standard-field-padding full-width page-title-form-field", placeholder: "Title"}),
                 ),
                 React.createElement("div", {className: "spacing standard"}),
+                React.createElement("div", {},
+                    React.createElement("label", {className: "standard-field-label"},
+                        "Navigation name"
+                    ),
+                    React.createElement(Dbm.react.form.FormField, {"value": this.item.properties.navigationName, className: "standard-field standard-field-padding full-width", placeholder: "Name showed in menues and breadcrumbs"}),
+                ),
+                React.createElement("div", {className: "spacing standard"}),
                 React.createElement("div", {},
                     React.createElement("label", {className: "standard-field-label"},
                         "Url"
@@ -55,6 +84,17 @@ export default class EditPage extends Dbm.react.BaseObject {
                     "Seo description"
                 ),
                 React.createElement(Dbm.react.form.FormField, {"value": this.item.properties.description, className: "standard-field standard-field-padding full-width", placeholder: "Description"}),
+                React.createElement("div", {className: "spacing micro"}),
+                React.createElement("div", {className: "flex-row justify-between"},
+                    React.createElement("div", {className: "flex-row-item"},
+                        React.createElement("div", {onClick: () => {this._generateSeoSummary()}}, "Generate"),
+                    ),
+                    React.createElement("div", {className: "flex-row-item"},
+                        Dbm.react.text.text(this.item.properties.descriptionLength),
+                        " / ",
+                        "155"
+                    )
+                )
             ),
             React.createElement("div", {className: "spacing standard"}),
             React.createElement("div", {"className": "dbm-admin-box dbm-admin-box-padding"},
@@ -62,7 +102,7 @@ export default class EditPage extends Dbm.react.BaseObject {
                     "Content"
                 ),
                 React.createElement("div", {},
-                    React.createElement(Dbm.react.admin.Editor, {"value": this.item.properties.content}),
+                    React.createElement(Dbm.react.admin.editor.Editor, {"value": this.item.properties.content}),
                 )
             ),
             React.createElement("div", {className: "spacing standard"}),