dbm 1.1.15 → 1.1.16

package/flow/FlowProperty.js

@@ -48,6 +48,12 @@ export default class FlowProperty extends Dbm.flow.FlowBaseObject {
         return this;
     }
 
+    delayValue(aToValue, aDelay = 0) {
+        Dbm.getInstance().repository.getItem("propertyUpdater").controller.delayUpdateProperty(this, aToValue, aDelay);
+
+        return this;
+    }
+
     getMostUpstreamProperty() {
 
         let debugCounter = 0;

package/flow/updatefunctions/thirdparty/threejs/UpdateObjectParent.js

@@ -0,0 +1,39 @@
+import Dbm from "../../../../index.js";
+
+export default class UpdateObjectParent extends Dbm.flow.FlowUpdateFunction {
+
+    _construct() {
+        super._construct();
+        
+        this.input.register("object", null);
+        this.input.register("parent", null);
+        this.input.register("added", false);
+
+        this.output.register("dynamicUpdate", 0);
+    }
+
+    _update() {
+        console.log("UpdateObjectParent::_update");
+
+        let dynamicUpdate = this.output.dynamicUpdate;
+        dynamicUpdate++;
+
+        let object = this.input.object;
+        //MENOTE: if object is changed, it doesn't remove the old one from the parent
+
+        if(object) {
+            let parent = this.input.parent;
+
+            if(parent && this.input.added) {
+                parent.add(object);
+            }
+            else {
+                if(object.parent) {
+                    object.parent.remove(object);
+                }
+            }
+        }
+
+        this.output.dynamicUpdate = dynamicUpdate;
+    }
+}

package/flow/updatefunctions/thirdparty/threejs/index.js

@@ -1,6 +1,7 @@
 import Dbm from "../../../../index.js";
 
 export {default as UpdateObjectPosition} from "./UpdateObjectPosition.js";
+export {default as UpdateObjectParent} from "./UpdateObjectParent.js";
 
 export const updateObjectPosition = function(aObject, aX = 0, aY = 0, aZ = 0, aRotationX = 0, aRotationY = 0, aRotationZ = 0, aScaleX = 1, aScaleY = 1, aScaleZ = 1) {
     let newUpdateObjectPosition = new Dbm.flow.updatefunctions.thirdparty.threejs.UpdateObjectPosition();
@@ -23,4 +24,18 @@ export const updateObjectPosition = function(aObject, aX = 0, aY = 0, aZ = 0, aR
     newUpdateObjectPosition.output.properties.dynamicUpdate.startUpdating();
 
     return newUpdateObjectPosition;
+}
+
+export const updateObjectParent = function(aObject, aParent, aAdded = false) {
+    let newUpdateFunction = new Dbm.flow.updatefunctions.thirdparty.threejs.UpdateObjectParent();
+
+    let inputProperties = newUpdateFunction.input.properties;
+    inputProperties.object.setOrConnect(aObject);
+
+    inputProperties.parent.setOrConnect(aParent);
+    inputProperties.added.setOrConnect(aAdded);
+    
+    newUpdateFunction.output.properties.dynamicUpdate.startUpdating();
+
+    return newUpdateFunction;
 }

package/package.json

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

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

@@ -0,0 +1,80 @@
+import React from "react";
+import Dbm from "../../../../index.js";
+
+export default class SelectObjectsField 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");
+
+        let returnData = editorData.data[fieldName];
+        if(!returnData) {
+            returnData = [];
+        }
+
+        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();
+    }
+
+    _add(aArrayEditor) {
+        console.log("_add");
+        console.log(aArrayEditor);
+
+        let newItemData = this.getPropValueWithDefault("newItemData", {});
+
+        aArrayEditor.push(newItemData);
+    }
+
+    _removeItem(aArrayEditor, aItem) {
+        aArrayEditor.removeItem(aItem);
+    }
+
+    _renderMainElement() {
+
+
+        return this._createMainElement(Dbm.react.form.EditArray, {value: this.item.properties.value},
+            React.createElement("div", {}, 
+                this.getPropValue("children"),
+                React.createElement(Dbm.react.interaction.CommandButton, {command: Dbm.commands.callFunction(this._removeItem, [Dbm.react.source.contextVariable("arrayEditor"), Dbm.react.source.contextVariable("item")])},
+                    React.createElement("div", {}, "Remove")
+                )
+            ),
+            React.createElement(Dbm.react.interaction.CommandButton, {"data-slot": "after", command: Dbm.commands.callFunction(this._add.bind(this), [Dbm.react.source.contextVariable("arrayEditor")])},
+                React.createElement("div", {className: "action-button action-button-padding"}, "Add")
+            )
+         );
+    }
+}

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

@@ -52,6 +52,6 @@ export default class SelectObjectField extends Dbm.react.BaseObject {
     }
 
     _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"});
+        return this._createMainElement(Dbm.react.form.GraphApiObjectSelection, {value: this.item.properties.value, objectType: this.getPropValue("objectType"), encoding: this.getPropValue("encoding"), nameField: this.getPropValue("nameField"), className: "standard-field standard-field-padding full-width"});
     }
 }

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

@@ -19,8 +19,6 @@ export default class SelectObjectsField extends Dbm.react.BaseObject {
 
         let editorData = Dbm.objectPath(this.context, "moduleData.editorData");
 
-        console.log(">>>>>", editorData);
-
         let returnData = editorData.data[fieldName];
         if(!returnData) {
             returnData = [];
@@ -31,7 +29,7 @@ export default class SelectObjectsField extends Dbm.react.BaseObject {
 
 
     _valueChanged() {
-        console.log("_valueChanged");
+        //console.log("_valueChanged");
 
         let fieldName = this.getPropValue("name");
         let newValue = this.item.value;

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

@@ -4,4 +4,5 @@ export {default as ImageField} from "./ImageField.js";
 export {default as CheckboxField} from "./CheckboxField.js";
 export {default as SelectObjectField} from "./SelectObjectField.js";
 export {default as SelectObjectsField} from "./SelectObjectsField.js";
-export {default as SelectionField} from "./SelectionField.js";
+export {default as SelectionField} from "./SelectionField.js";
+export {default as ArrayField} from "./ArrayField.js";

package/react/blocks/content/ContentBlock.js

@@ -27,7 +27,6 @@ export default class ContentBlock extends Dbm.react.BaseObject {
     _loaded(aRequest) {
       //console.log("_loaded");
       this.item.item = aRequest.items[0];
-      
     }
 
     _renderMainElement() {

package/react/blocks/index.js

@@ -214,8 +214,8 @@ export let registerAllBlocks = function() {
                 createElement(Dbm.react.admin.editor.fields.TextField, {name: "text1"})
             ),
             createElement("div", {className: "spacing medium"}),
-            createElement(Dbm.react.form.LabelledArea, {label: "Intial sections"}, 
-                createElement(Dbm.react.admin.editor.fields.SelectObjectsField, {objectType: "helpSection", name:"initialSections"})
+            createElement(Dbm.react.form.LabelledArea, {label: "Initial sections"}, 
+                createElement(Dbm.react.admin.editor.fields.SelectObjectsField, {objectType: "helpSection", name:"initialSections", "encoding": "title", "nameField": "title"})
             ),
         );
         registerBlock("faq/askAQuestion", "FAQ / Ask a question", createElement(Dbm.react.blocks.faq.AskAQuestion, {}), editor, {}, {"text1": true, "text2": true});

package/react/cookies/CookieBar.js

@@ -156,6 +156,8 @@ export default class CookieBar extends Dbm.react.BaseObject {
         Dbm.getInstance().repository.getItem("trackingController").allowStatistics = true;
         Dbm.getInstance().repository.getItem("trackingController").allowMarketing = true;
 
+        Dbm.getInstance().repository.getItem("userSettings").setValue("hideCookieBar", true);
+
         this.getDynamicProp("open").getMostUpstreamProperty().setValue(false);
     }
 
@@ -175,6 +177,8 @@ export default class CookieBar extends Dbm.react.BaseObject {
         Dbm.getInstance().repository.getItem("trackingController").allowStatistics = false;
         Dbm.getInstance().repository.getItem("trackingController").allowMarketing = false;
 
+        Dbm.getInstance().repository.getItem("userSettings").setValue("hideCookieBar", true);
+
         this.getDynamicProp("open").getMostUpstreamProperty().setValue(false);
     }
 

package/react/form/EditObjectProperty.js

@@ -0,0 +1,28 @@
+import React from "react";
+import Dbm from "../../index.js";
+
+export default class EditObjectProperty extends Dbm.react.BaseObject {
+    _construct() {
+        super._construct();
+
+        this._valueSelector = new Dbm.flow.controllers.transform.PartOfObject();
+
+        this._valueSelector.item.properties.object.connectInput(this.getDynamicPropWithoutState("value", {}));
+        this._valueSelector.item.properties.path.connectInput(this.getDynamicPropWithoutState("path", {}));
+
+        this.item.requireProperty("value", []).connectInput(this._valueSelector.item.properties.value);
+
+    }
+
+    _renderMainElement() {
+
+        let children = this.getPropValue("children");
+
+        return this._createMainElement("div", {},
+            React.createElement(Dbm.react.context.AddContextVariables, {values: {"value": this.item.properties.value}},
+                children
+            )
+        );
+    }
+}
+

package/react/form/index.js

@@ -7,4 +7,5 @@ export {default as GraphApiObjectSelection} from "./GraphApiObjectSelection.js";
 export {default as GraphApiSelectOrCreateObject} from "./GraphApiSelectOrCreateObject.js";
 export {default as GraphApiImage} from "./GraphApiImage.js";
 export {default as EditArray} from "./EditArray.js";
-export {default as TextArea} from "./TextArea.js";
+export {default as TextArea} from "./TextArea.js";
+export {default as EditObjectProperty} from "./EditObjectProperty.js";

package/tracking/Controller.js

@@ -40,6 +40,9 @@ export default class Controller extends Dbm.core.BaseObject {
     setupPermissionsFromCookies() {
 		this.item.allowStatistics = Cookies.get("cookie/allowStatistics") === "1";
 		this.item.allowMarketing = Cookies.get("cookie/allowMarketing") === "1";
+
+        let cookieBarHiddenInitialSetting = Cookies.get("cookie/hideCookieBar") === "1";
+        let showingCookieBar = Dbm.getInstance().repository.getItem("userSettings").setValue("hideCookieBar", cookieBarHiddenInitialSetting);
 		
 		return this;
 	}

package/updater/PropertyUpdater.js

@@ -108,7 +108,30 @@ export default class PropertyUpdater extends Dbm.core.BaseObject {
         if(!aEasing) {
             aEasing = Easing.Quadratic.Out;
         }
-        let tween = new Tween(tweenObject).to({"envelope": aToValue}, 1000*aTime).delay(1000*aDelay).easing(aEasing).onUpdate(function(aData) {aProperty.value = aData.envelope}).onComplete(() => {this.removeTween(tween)}).start();
+
+        let tween = new Tween(tweenObject).to({"envelope": aToValue}, 1000*aTime).delay(1000*aDelay).easing(aEasing).onUpdate(function(aData) {
+            aProperty.value = aData.envelope;
+        }).onComplete(() => {this.removeTween(tween)}).start();
+
+        let tweens = [].concat(this.item.tweens);
+        tweens.push(tween);
+        this.item.tweens = tweens;
+
+        this._currentTweens.set(aProperty, tween);
+
+        return this;
+    }
+
+    delayUpdateProperty(aProperty, aToValue, aDelay = 0) {
+        if(this._currentTweens.has(aProperty)) {
+            this._currentTweens.get(aProperty).stop();
+        }
+        
+        let tweenObject = {"envelope": aProperty.value};
+
+        let tween = new Tween(tweenObject).to({"envelope": aToValue}, 0).delay(1000*aDelay).onUpdate(function(aData) {
+            aProperty.value = aToValue;
+        }).onComplete(() => {this.removeTween(tween)}).start();
 
         let tweens = [].concat(this.item.tweens);
         tweens.push(tween);