dbm 1.2.6 → 1.2.7

package/commands/CommandBaseObject.js

@@ -33,4 +33,8 @@ export default class CommandBaseObject extends Dbm.core.BaseObject {
     getInput(aName) {
         return this._resolveSource(this.item[aName]);
     }
+
+    getInputFrom(aName, aFromObject = null, aData = null) {
+        return this._resolveSource(this.item[aName], aFromObject, aData);
+    }
 }

package/commands/SetProperty.js

@@ -11,8 +11,8 @@ export default class SetProperty extends CommandBaseObject {
 
     perform(aFromObject, aData) {
 		
-        let value = this.getInput("value");
+        let value = this.getInputFrom("value", aFromObject, aData);
         
-        this._resolveSourceWithoutFlow(this.item.property, aFromObject, aData).value = value;
+        this._resolveSourceWithoutFlow(this.item.property, aFromObject, aData).getMostUpstreamProperty().value = value;
     }
 }

package/flow/updatefunctions/dom/ElementPosition.js

@@ -12,6 +12,9 @@ export default class ElementPosition extends Dbm.flow.FlowUpdateFunction {
 		this.output.register("screenX", NaN);
 		this.output.register("screenY", NaN);
 
+		this.output.register("pageX", NaN);
+		this.output.register("pageY", NaN);
+
 		this.output.register("parameterX", NaN);
 		this.output.register("parameterY", NaN);
 		
@@ -22,6 +25,7 @@ export default class ElementPosition extends Dbm.flow.FlowUpdateFunction {
     }
 
     start() {
+		//console.log("start");
 		window.addEventListener("resize", this._callback_scrollBound, false);
 		window.addEventListener("scroll", this._callback_scrollBound, false);
 		this.output.properties.prepare.startUpdating();
@@ -47,7 +51,6 @@ export default class ElementPosition extends Dbm.flow.FlowUpdateFunction {
 			//console.log(theInnerWidth, theInnerHeight);
 			
 			let rect = element.getBoundingClientRect();
-			//console.log(rect);
 			
 			let prepareX = this.input.prepareX;
 			let prepareY = this.input.prepareY;
@@ -66,6 +69,9 @@ export default class ElementPosition extends Dbm.flow.FlowUpdateFunction {
 			
 			this.output.screenX = screenX;
 			this.output.screenY = screenY;
+
+			this.output.pageX = screenX-window.scrollX;
+			this.output.pageY = screenY-window.scrollY;
 			
 			this.output.parameterX = parameterX;
 			this.output.parameterY = parameterY;
@@ -116,6 +122,9 @@ export default class ElementPosition extends Dbm.flow.FlowUpdateFunction {
 			
 			this.output.properties.screenX._internal_setValueInFlowOutsideOfUpdate(screenX);
 			this.output.properties.screenY._internal_setValueInFlowOutsideOfUpdate(screenY);
+
+			this.output.properties.pageX._internal_setValueInFlowOutsideOfUpdate(screenX+window.scrollX);
+			this.output.properties.pageY._internal_setValueInFlowOutsideOfUpdate(screenY+window.scrollY);
 			
 			this.output.properties.parameterX._internal_setValueInFlowOutsideOfUpdate(parameterX);
 			this.output.properties.parameterY._internal_setValueInFlowOutsideOfUpdate(parameterY);

package/graphapi/webclient/WebSocketConnection.js

@@ -300,6 +300,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
                         item.setValue("user", null);
                     }
                     repository.getItem("site").currentUser = item.user;
+                    repository.getItem("site").checkedUser = true;
                     item.setValue("status", Dbm.loading.LoadingStatus.LOADED);
                 }
                 break;
@@ -311,6 +312,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
                     else {
                         repository.getItem("site").currentUser = null;
                     }
+                    repository.getItem("site").checkedUser = true;
                     this._connectionReady();
                 }
                 break;

package/graphapi/webclient/admin/ItemEditor.js

@@ -80,11 +80,29 @@ export default class ItemEditor extends Dbm.core.BaseObject {
         return this._addRelationEditor(name, aType, aObjectType, aInitialValue, Dbm.graphapi.webclient.admin.SaveFunctions.incomingRelation, aUpdateEncoding);
     }
 
+    getDefaultIncomingRelationEditor(aType, aObjectType) {
+        let item = this.item.editedItem;
+        
+        let relations = Dbm.utils.ArrayFunctions.filterByField(Dbm.objectPath(item, "relations/in." + aType + ".objects"), "objectTypes", aObjectType, "arrayContains");
+        let relation = (relations && relations.length) ? relations[0].id : null;
+        
+        return this.addIncomingRelationEditor(aType, aObjectType, relation, ["relations"]);     
+    }
+
     addOutgoingRelationEditor(aType, aObjectType, aInitialValue, aUpdateEncoding = null) {
         let name = "out_" + aType + "_" + aObjectType;
         return this._addRelationEditor(name, aType, aObjectType, aInitialValue, Dbm.graphapi.webclient.admin.SaveFunctions.outgoingRelation, aUpdateEncoding);
     }
 
+    getDefaultOutgoingRelationEditor(aType, aObjectType) {
+        let item = this.item.editedItem;
+        
+        let relations = Dbm.utils.ArrayFunctions.filterByField(Dbm.objectPath(item, "relations/out." + aType + ".objects"), "objectTypes", aObjectType, "arrayContains");
+        let relation = (relations && relations.length) ? relations[0].id : null;
+        
+        return this.addOutgoingRelationEditor(aType, aObjectType, relation, ["relations"]);     
+    }
+
     _addMultipleRelationsEditor(aName, aType, aObjectType, aInitialValue, aSaveFunction, aUpdateEncoding = null) {
         let valueEditor = this.item["editor_relation_" + aName];
         if(!valueEditor) {
@@ -183,6 +201,35 @@ export default class ItemEditor extends Dbm.core.BaseObject {
         return valueEditor;
     }
 
+    getUrlEditor(aInitialValue) {
+        let name = "url";
+        let valueEditor = this.item["url"];
+        if(!valueEditor) {
+            valueEditor = new Dbm.graphapi.webclient.admin.ValueEditor();
+            valueEditor.item.editValue.setInitialValue(aInitialValue);
+
+            valueEditor.item.setValue("itemEditor", this.item);
+            valueEditor.item.setValue("updateEncoding", "url");
+
+            this.item.anyChange.addCheck(valueEditor.item.properties.changed);
+            this.item.setValue(name, valueEditor); 
+            this.item.editors = [].concat(this.item.editors, valueEditor);
+            
+            valueEditor.addSaveFunction(Dbm.graphapi.webclient.admin.SaveFunctions.setUrl);
+        }
+
+        return valueEditor;
+    }
+
+    getAdminUrlEditor() {
+        let item = this.item.editedItem;
+        let value = Dbm.objectPath(item, "url");
+
+        debugger;
+        
+        return this.getUrlEditor(value);     
+    }
+
     addCommandsToSaveData(aSaveData) {
 
         let editedItemId = Dbm.objectPath(this.item, "editedItem.id");

package/package.json

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

package/react/AddProps.js

@@ -0,0 +1,127 @@
+import React from "react";
+import Dbm from "../index.js";
+
+export default class AddProps extends Dbm.react.BaseObject {
+
+	_construct() {
+		super._construct();
+		
+		this._clonedElement = null;
+	}
+	
+	_getMainElementProps() {
+		//console.log("wprr/manipulation/ManipulationBaseObject::_getMainElementProps");
+		let returnObject = {};
+
+		for(let objectName in this.props) {
+			if(objectName === "children") {
+				//MENOTE: children should not be passed on
+				continue;
+			}
+			returnObject[objectName] = this.props[objectName];
+		}
+		
+		return returnObject;
+	}
+	
+	_performCloneWithNewChildren(aChild, aProps, aChildren) {
+		var callArray = [aChild, aProps];
+		
+		callArray = callArray.concat(aChildren);
+		
+		return React.cloneElement.apply(React, callArray);
+	}
+	
+	_performClone(aChild, aProps) {
+		
+		if(aChild instanceof Array) {
+			let returnArray = [];
+			
+			let currentArray = aChild;
+			let currentArrayLength = currentArray.length;
+			for(let i = 0; i < currentArrayLength; i++) {
+				let currentChild = currentArray[i];
+				returnArray.push(this._performClone(currentChild, aProps));
+			}
+			
+			return returnArray;
+		}
+		
+		let newProps = aProps;
+		if(aChild && aChild.props && aChild.props.className) {
+			newProps = {};
+			for(let objectName in aProps) {
+				newProps[objectName] = aProps[objectName];
+			}
+			if(aProps.className) {
+				newProps.className = aProps.className + " " + aChild.props.className;
+			} 
+			else {
+				newProps.className = aChild.props.className;
+			}
+		}
+		
+		let callArray = [aChild, newProps];
+		
+		if(aChild && aChild.props) {
+			let firstChildChildren = aChild.props.children;
+			if(!firstChildChildren) {
+				callArray.push(null);
+			}
+			else if(firstChildChildren instanceof Array) {
+				callArray = callArray.concat(firstChildChildren);
+			}
+			else {
+				callArray.push(firstChildChildren);
+			}
+		}
+		
+		return React.cloneElement.apply(React, callArray);
+	}
+	
+	_cloneChildrenAndAddProps(aChildren) {
+		//console.log("wprr/manipulation/ManipulationBaseObject::_cloneChildrenAndAddProps");
+		
+		let children = aChildren;
+		
+		if(children.length === 0) {
+			return null;
+		}
+		else if(children.length === 1) {
+			return this._performClone(children[0], this.props);
+		}
+		
+		let returnArray = new Array();
+		
+		let mainElementProps = this.props;
+		
+		let currentArray = children;
+		let currentArrayLength = currentArray.length;
+		for(let i = 0; i < currentArrayLength; i++) {
+			let currentChild = currentArray[i];
+			
+			if(currentChild !== null) {
+				let newChild = this._performClone(currentChild, mainElementProps);
+				returnArray.push(newChild);
+			}
+		}
+		
+		let callArray = [Fragment, {}].concat(returnArray);
+		return React.createElement.apply(React, callArray);
+	}
+	
+	_renderClonedElement() {
+		return this._cloneChildrenAndAddProps(this.getPropValue("children"));
+	}
+	
+	_createClonedElement() {
+		//console.log("wprr/manipulation/ManipulationBaseObject::_createClonedElement");
+		
+		this._clonedElement = this._renderClonedElement();
+	}
+	
+	_renderMainElement() {
+		this._createClonedElement();
+		return this._clonedElement;
+	}
+}

package/react/BaseObject.js

@@ -145,7 +145,7 @@ export default class BaseObject extends Component {
     }
 
     _renderMainElement() {
-        return this._createMainElement("div", {}, this.props.children);
+        return this._createMainElement("div", {ref: this.createRef("mainElement")}, this.props.children);
     }
 
     _mainElement(aReactElement) {

package/react/admin/EditLanguage.js

@@ -0,0 +1,91 @@
+import React from "react";
+import Dbm from "../../index.js";
+
+export default class EditLanguage extends Dbm.react.BaseObject {
+    _construct() {
+        super._construct();
+
+        this.item.requireProperty("availableLanguages", []);
+        
+        {
+            let request = Dbm.getGraphApi().requestRange([{"type": "byObjectType", "objectType": "language"}], ["type"]);
+            this.item.propertyInput("languages", request.properties.items);
+            Dbm.flow.runWhenMatched(request.properties.status, Dbm.loading.LoadingStatus.LOADED, Dbm.commands.callFunction(this._languagesLoaded.bind(this), []));
+        }
+    }
+
+    _languagesLoaded() {
+        //console.log("_languagesLoaded");
+        //console.log(this.item.languages);
+
+        let availableLanguageCodes = Dbm.utils.ArrayFunctions.mapField(Dbm.getRepositoryItem("site").availableLanguages, "code");
+
+        let filteredLanguages = Dbm.utils.ArrayFunctions.filterByField(this.item.languages, "identifier", availableLanguageCodes, "inArray");
+        this.item.availableLanguages = filteredLanguages;
+    }
+
+    getFlagUrl(aLanguageCode) {
+
+        let countryCode = aLanguageCode;
+        if(aLanguageCode === "en") {
+            countryCode = "gb";
+        }
+
+        return "https://flagcdn.com/" + countryCode + ".svg";
+    }
+
+    _renderMainElement() {
+
+        return React.createElement("div", {},
+            React.createElement(Dbm.react.admin.editorsgroup.EditRelation, {direction: "in", relationType: "for", objectType: "language"},
+                React.createElement(Dbm.react.context.AddItemByIdToContext, {"id": Dbm.react.source.contextVariable("valueEditor.editValue.value"), "as": "language"},
+                    
+                            React.createElement(Dbm.react.form.Dropdown, {},
+                                React.createElement("div", {"data-slot": "button", "className": "standard-field standard-field-padding"},
+                                    React.createElement("div", {className: "flex-row micro-item-spacing vertically-center-items"},
+                                        React.createElement("div", {className: "flex-row-item flex-no-resize"},
+                                            React.createElement(Dbm.react.area.HasData, {check: Dbm.react.source.contextVariable("language.id")},
+                                                React.createElement("div", {className: "language-circle centered-cell-holder overflow-hidden"},
+                                                    React.createElement(Dbm.react.image.Image, {"src": Dbm.core.source.command(Dbm.commands.callFunction(this.getFlagUrl, [Dbm.react.source.contextVariable("language.identifier")])), "className": "background-cover full-size"})
+                                                )
+                                            ),
+                                            React.createElement(Dbm.react.area.HasData, {check: Dbm.react.source.contextVariable("language.id"), checkType: "invert/default"},
+                                                React.createElement("div", {className: "language-circle centered-cell-holder"},
+
+                                                )
+                                            )
+                                            
+                                        ),
+                                        React.createElement("div", {className: "flex-row-item flex-resize"},
+                                            React.createElement(Dbm.react.area.HasData, {check: Dbm.react.source.contextVariable("language.id")},
+                                                Dbm.react.text.text(Dbm.react.source.contextVariable("language.name"))
+                                            ),
+                                            React.createElement(Dbm.react.area.HasData, {check: Dbm.react.source.contextVariable("language.id"), checkType: "invert/default"},
+                                                "Language"
+                                            )
+                                        ),
+                                        React.createElement("div", {className: "flex-row-item flex-no-resize"},
+                                            "v"
+                                        )
+                                    )
+                                ),
+                                React.createElement("div", {"className": "dropdown-menu-max-height standard-dropdown"},
+                                    React.createElement(Dbm.react.area.List, {items: this.item.properties.availableLanguages, "as": "availableLanguage"},
+                                        React.createElement(Dbm.react.interaction.CommandButton, {"commands": [
+                                            Dbm.commands.setProperty(Dbm.react.source.contextVariable("valueEditor.editValue.value"), Dbm.react.source.contextVariable("availableLanguage.id")),
+                                            Dbm.commands.setProperty(Dbm.react.source.contextVariable("open"), false)
+                                        ]},
+                                            React.createElement("div", {className: "standard-dropdown-row standard-dropdown-row-padding hover-row cursor-pointer"},
+                                                Dbm.react.text.text(Dbm.react.source.contextVariable("availableLanguage.name"))
+                                            )
+                                        ),
+                                    )
+                                )
+                            )
+                        
+                )
+            ),
+        );
+    }
+}
+

package/react/admin/EditObject.js

@@ -26,7 +26,7 @@ export default class EditObject extends Dbm.react.BaseObject {
                     {"type": "includeDraft"},
                     {"type": "idSelection", "ids": [item.id]},
                 ],
-                ["admin_fields", "admin_fieldTranslations", "relations"]
+                ["admin_fields", "admin_fieldTranslations", "relations", "url", "identifier", "visibility"]
             );
             allLoaded.addCheck(request.properties.status);
         }

package/react/admin/EditObjectById.js

@@ -26,7 +26,7 @@ export default class EditObjectById extends Dbm.react.BaseObject {
                     {"type": "includeDraft"},
                     {"type": "idSelection", "ids": [id]},
                 ],
-                ["admin_fields", "admin_fieldTranslations", "relations"]
+                ["admin_fields", "admin_fieldTranslations", "relations", "url", "identifier", "visibility"]
             );
             allLoaded.addCheck(request.properties.status);
         }

package/react/admin/EditPage.js

@@ -19,8 +19,8 @@ export default class EditPage extends Dbm.react.BaseObject {
         itemEditor.addFieldEditor("content", page.content, "content");
         itemEditor.addFieldEditor("publishDate", page.publishDate, "urlRequest");
         itemEditor.addOutgoingRelationEditor("in", "group/pageCategory", page.category ? page.category.id : 0, "urlRequest");
-        itemEditor.addIncomingRelationEditor("for", "language", page.language ? page.language.id : 0, "urlRequest");
-        itemEditor.addOutgoingRelationEditor("in", "group/translationGroup", page.translations ? page.translations.id : 0, "urlRequest");
+        //itemEditor.addIncomingRelationEditor("for", "language", page.language ? page.language.id : 0, "urlRequest");
+        //itemEditor.addOutgoingRelationEditor("in", "group/translationGroup", page.translations ? page.translations.id : 0, "urlRequest");
         itemEditor.addEditor("url", page.url, Dbm.graphapi.webclient.admin.SaveFunctions.setUrl, "url");
 
         let descriptionEditor = itemEditor.addFieldEditor("meta/description", page["meta/description"], "meta/description");
@@ -50,7 +50,7 @@ export default class EditPage extends Dbm.react.BaseObject {
         let preloadImages = [];
 
         let pageEditorItem = Dbm.getInstance().repository.getItem("admin/editor/pageEditor");
-        if(pageEditorItem.generateContentPreload) {
+        if(pageEditorItem.generateContentPreload && content) {
             preloadImages = pageEditorItem.generateContentPreload(content);
         }
 
@@ -184,32 +184,36 @@ export default class EditPage extends Dbm.react.BaseObject {
             React.createElement(Dbm.react.context.AddContextVariables, {values: {"editorGroup": editorGroup, "itemEditor": itemEditor}},
                 React.createElement(Dbm.react.admin.EditObjectById, {id: page.id},
                     React.createElement("div", {"className": "dbm-admin-box dbm-admin-box-padding"},
-                        React.createElement("div", {},
-                            React.createElement("label", {className: "standard-field-label"},
-                                "Page title"
+                        React.createElement("div", {"className": "flex-row small-item-spacing"},
+                            React.createElement("div", {"className": "flex-row-item flex-resize"},
+                                React.createElement(Dbm.react.form.FormField, {"value": itemEditor.getEditor("title").item.editValue.value, className: "standard-field standard-field-padding full-width page-title-form-field", placeholder: "Title"})
                             ),
-                            React.createElement(Dbm.react.form.FormField, {"value": itemEditor.getEditor("title").item.editValue.value, 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("div", {"className": "flex-row-item flex-no-resize"},
+                                React.createElement(Dbm.react.form.FormField, {"value": itemEditor.getEditor("publishDate").item.editValue.value, className: "standard-field standard-field-padding full-width", placeholder: "YYYY-MM-DD", "type": "date"})
                             ),
-                            React.createElement(Dbm.react.form.FormField, {"value": itemEditor.getEditor("navigationName").item.editValue.value, className: "standard-field standard-field-padding full-width", placeholder: "Name showed in menues and breadcrumbs"}),
+                            React.createElement(Dbm.react.area.HasData, {check: Dbm.getRepositoryItem("site").properties.availableLanguages, checkType:"notEmpty"},
+                                React.createElement("div", {"className": "flex-row-item flex-no-resize"},
+                                    React.createElement(Dbm.react.admin.EditLanguage, {})
+                                )
+                            )
                         ),
-                        React.createElement("div", {className: "spacing standard"}),
-                        React.createElement("div", {},
-                            React.createElement("label", {className: "standard-field-label"},
-                                "Url"
+                        React.createElement("div", {className: "spacing small"}),
+                        React.createElement("div", {"className": "flex-row small-item-spacing vertically-center-items"},
+                            React.createElement("div", {"className": "flex-row-item flex-resize"},
+                                React.createElement(Dbm.react.form.FormField, {"value": itemEditor.getEditor("url").item.editValue.value, className: "standard-field standard-field-padding full-width", placeholder: "Url"})
                             ),
-                            React.createElement(Dbm.react.form.FormField, {"value": itemEditor.getEditor("url").item.editValue.value, className: "standard-field standard-field-padding full-width", placeholder: "Url"}),
+                            React.createElement(Dbm.react.area.HasData, {check: Dbm.getRepositoryItem("site").properties.availableLanguages, checkType:"notEmpty"},
+                                React.createElement("div", {"className": "flex-row-item flex-no-resize"},
+                                    React.createElement(Dbm.react.admin.PageTranslations, {})
+                                )
+                            )
                         ),
                         React.createElement("div", {className: "spacing standard"}),
                         React.createElement("div", {},
                             React.createElement("label", {className: "standard-field-label"},
-                                "Publish date"
+                                "Navigation name"
                             ),
-                            React.createElement(Dbm.react.form.FormField, {"value": itemEditor.getEditor("publishDate").item.editValue.value, className: "standard-field standard-field-padding full-width", placeholder: "YYYY-MM-DD", "type": "date"}),
+                            React.createElement(Dbm.react.form.FormField, {"value": itemEditor.getEditor("navigationName").item.editValue.value, className: "standard-field standard-field-padding full-width", placeholder: "Name showed in menues and breadcrumbs"}),
                         ),
                         React.createElement("div", {className: "spacing standard"}),
                         React.createElement("div", {},
@@ -217,21 +221,7 @@ export default class EditPage extends Dbm.react.BaseObject {
                                 "Category"
                             ),
                             React.createElement(Dbm.react.form.GraphApiObjectSelection, {"value": itemEditor.getEditor("relation_out_in_group/pageCategory").item.editValue.value, objectType: "group/pageCategory", className: "standard-field standard-field-padding full-width"}),
-                        ),
-                        React.createElement("div", {className: "spacing standard"}),
-                        React.createElement("div", {},
-                            React.createElement("label", {className: "standard-field-label"},
-                                "Language"
-                            ),
-                            React.createElement(Dbm.react.form.GraphApiObjectSelection, {"value": itemEditor.getEditor("relation_in_for_language").item.editValue.value, objectType: "language", className: "standard-field standard-field-padding full-width"}),
-                        ),
-                        React.createElement("div", {className: "spacing standard"}),
-                        React.createElement("div", {},
-                            React.createElement("label", {className: "standard-field-label"},
-                                "Translations"
-                            ),
-                            React.createElement(Dbm.react.form.GraphApiObjectSelection, {"value": itemEditor.getEditor("relation_out_in_group/translationGroup").item.editValue.value, objectType: "group/translationGroup", className: "standard-field standard-field-padding full-width"}),
-                        ),
+                        )
                     ),
                     React.createElement("div", {className: "spacing standard"}),
                     React.createElement("div", {"className": "dbm-admin-box dbm-admin-box-padding"},