dbm 1.1.12 → 1.1.14

package/graphapi/webclient/CachedRequests.js

@@ -42,10 +42,9 @@ export default class CachedRequests extends Dbm.core.BaseObject {
     }
 	
 	requestRange(aSelect, aEncode) {
-        console.log("requestRange");
+        //console.log("requestRange");
 
         let id = this._getRangeIdentifier(aSelect, aEncode);
-        console.log(id);
 
         if(this._ranges[id]) {
             return this._ranges[id];
@@ -59,10 +58,9 @@ export default class CachedRequests extends Dbm.core.BaseObject {
     }
 
     requestItem(aId, aEncode) {
-        console.log("requestItem");
+        //console.log("requestItem");
 
         let id = aId + "/" + this._getEncodeIdentifier(aEncode);
-        console.log(id);
 
         if(this._items[id]) {
             return this._items[id];

package/graphapi/webclient/decode/index.js

@@ -149,4 +149,28 @@ export const fullSetup = function() {
         currentDecoder.item.setValue("encodingType", name);
         currentDecoder.item.register(decodePrefix + name);
     }
+
+    {
+        let name = "atLocation";
+        let currentDecoder = new Dbm.graphapi.webclient.decode.DecodeBaseObject();
+        currentDecoder.item.setValue("copyLink", ["location"]);
+        currentDecoder.item.setValue("encodingType", name);
+        currentDecoder.item.register(decodePrefix + name);
+    }
+
+    {
+        let name = "mainImage";
+        let currentDecoder = new Dbm.graphapi.webclient.decode.DecodeBaseObject();
+        currentDecoder.item.setValue("copyLink", ["image"]);
+        currentDecoder.item.setValue("encodingType", name);
+        currentDecoder.item.register(decodePrefix + name);
+    }
+
+    {
+        let name = "location";
+        let currentDecoder = new Dbm.graphapi.webclient.decode.DecodeBaseObject();
+        currentDecoder.item.setValue("copyFields", ["street", "postCode", "city", "country", "coordinates"]);
+        currentDecoder.item.setValue("encodingType", name);
+        currentDecoder.item.register(decodePrefix + name);
+    }
 }

package/package.json

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

package/react/admin/editorsgroup/EditRelation.js

@@ -0,0 +1,44 @@
+import React from "react";
+import Dbm from "../../../index.js";
+
+export default class EditRelation extends Dbm.react.BaseObject {
+    _construct() {
+        super._construct();
+
+        let item = this.context.item;
+        let itemEditor = this.context.itemEditor;
+        let editor;
+
+
+        let direction = this.getPropValue("direction");
+        let relationType = this.getPropValue("relationType");
+        let objectType = this.getPropValue("objectType");
+
+        let relations = Dbm.utils.ArrayFunctions.filterByField(Dbm.objectPath(item, "relations/" + direction + "." + relationType + ".objects"), "objectTypes", objectType, "arrayContains");
+        let relation = (relations && relations.length) ? relations[0].id : null;
+
+        if(direction == "in") {
+            editor = itemEditor.addIncomingRelationEditor(relationType, objectType, relation, ["relations"]);
+        }
+        else if(direction == "out") {
+            editor = itemEditor.addOutgoingRelationEditor(relationType, objectType, relation, ["relations"]);
+        }
+        else  {
+            console.error("Unknown direction", direction, this);
+            editor = null;
+        }
+        
+        if(editor) {
+            this.item.setValue("editor", editor.item);
+        }
+    }
+
+    _renderMainElement() {
+
+        let children = this.getPropValue("children")
+
+        return React.createElement("div", {},
+            React.createElement(Dbm.react.context.AddContextVariables, {"values": {"valueEditor": this.item.editor}}, children)
+        );
+    }
+}

package/react/admin/editorsgroup/index.js

@@ -1,2 +1,3 @@
 export {default as EditField} from "./EditField.js";
-export {default as EditItem} from "./EditItem.js";
+export {default as EditItem} from "./EditItem.js";
+export {default as EditRelation} from "./EditRelation.js";

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

@@ -0,0 +1,51 @@
+import React from "react";
+import Dbm from "../../../../index.js";
+
+export default class LinkedPage extends Dbm.react.BaseObject {
+    _construct() {
+        super._construct();
+
+        let graphApi = Dbm.getInstance().repository.getItem("graphApi").controller;
+
+        let id = this.context.item.id;
+
+        let allLoaded = Dbm.flow.updatefunctions.logic.allAtValue(Dbm.loading.LoadingStatus.LOADED);
+        this.item.requireProperty("loaded", false);
+
+        {
+            let request = graphApi.requestRange(
+                [
+                    {"type": "includePrivate"},
+                    {"type": "includeDraft"},
+                    {"type": "idSelection", "ids": [id]},
+                ],
+                ["admin_fields", "relations"]
+            );
+            allLoaded.addCheck(request.properties.status);
+        }
+
+        this.item.properties.loaded.connectInput(allLoaded.output.properties.value);
+    }
+
+    _renderMainElement() {
+
+        let id = this.context.item.id;
+
+        return React.createElement("div", {},
+            
+            React.createElement(Dbm.react.area.HasData, {check: this.item.properties.loaded},
+                React.createElement(Dbm.react.form.LabelledArea, {label: "Link text"}, 
+                    React.createElement(Dbm.react.admin.editorsgroup.EditField, {"fieldName": "linkText"},
+                        React.createElement(Dbm.react.form.FormField, {value: Dbm.react.source.contextVariable("valueEditor.editValue.value"), className: "standard-field standard-field-padding full-width"})
+                    )
+                ),
+                React.createElement(Dbm.react.form.LabelledArea, {label: "Linked page"}, 
+                    React.createElement(Dbm.react.admin.editorsgroup.EditRelation, {"direction": "out", "relationType": "for", "objectType": "page"},
+                        React.createElement(Dbm.react.form.GraphApiObjectSelection, {value: Dbm.react.source.contextVariable("valueEditor.editValue.value"), "objectType": "page", "encoding": "title", nameField: "title", className: "standard-field standard-field-padding full-width"})
+                    )
+                )
+            )
+            
+        )
+    }
+}

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

@@ -0,0 +1,46 @@
+import React from "react";
+import Dbm from "../../../../index.js";
+
+export default class Question extends Dbm.react.BaseObject {
+    _construct() {
+        super._construct();
+
+        let graphApi = Dbm.getInstance().repository.getItem("graphApi").controller;
+
+        let id = this.context.item.id;
+
+        let allLoaded = Dbm.flow.updatefunctions.logic.allAtValue(Dbm.loading.LoadingStatus.LOADED);
+        this.item.requireProperty("loaded", false);
+
+        {
+            let request = graphApi.requestRange(
+                [
+                    {"type": "includePrivate"},
+                    {"type": "includeDraft"},
+                    {"type": "idSelection", "ids": [id]},
+                ],
+                ["admin_fields"]
+            );
+            allLoaded.addCheck(request.properties.status);
+        }
+
+        this.item.properties.loaded.connectInput(allLoaded.output.properties.value);
+    }
+
+    _renderMainElement() {
+
+        let id = this.context.item.id;
+
+        return React.createElement("div", {},
+            
+            React.createElement(Dbm.react.area.HasData, {check: this.item.properties.loaded},
+                React.createElement(Dbm.react.form.LabelledArea, {label: "Question"}, 
+                    React.createElement(Dbm.react.admin.editorsgroup.EditField, {"fieldName": "question"},
+                        React.createElement(Dbm.react.form.FormField, {value: Dbm.react.source.contextVariable("valueEditor.editValue.value"), className: "standard-field standard-field-padding full-width"})
+                    )
+                )
+            )
+            
+        )
+    }
+}

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

@@ -2,4 +2,6 @@ export {default as Title} from "./Title.js";
 export {default as Content} from "./Content.js";
 export {default as Name} from "./Name.js";
 export {default as Link} from "./Link.js";
-export {default as Visibility} from "./Visibility.js";
+export {default as Visibility} from "./Visibility.js";
+export {default as LinkedPage} from "./LinkedPage.js";
+export {default as Question} from "./Question.js";

package/react/admin/website/EditWebsite.js

@@ -189,7 +189,7 @@ export default class EditWebsite extends Dbm.react.BaseObject {
                                 React.createElement("div", {},
                                     React.createElement("h3", {}, "Local business"),
                                     React.createElement(Dbm.react.interaction.CommandButton, {command: Dbm.commands.callFunction(this._removeArrayRow, [Dbm.react.source.contextVariable("arrayEditor"), Dbm.react.source.contextVariable("item")])},
-                                        React.createElement("div", {}, "Remove2"),
+                                        React.createElement("div", {}, "Remove"),
                                     ),
                                     React.createElement(Dbm.react.form.GraphApiSelectOrCreateObject, {"value": Dbm.react.source.contextVariable("item.properties.value"), objectType: "localBusiness"}),
                                     React.createElement(Dbm.react.area.HasData, {check: Dbm.react.source.contextVariable("item.properties.value")},

package/react/blocks/content/ContentBlock.js

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

package/react/blocks/index.js

@@ -253,6 +253,16 @@ export let registerAllBlocks = function() {
         let itemEditor = Dbm.getInstance().repository.getItem("admin/itemEditors/visibility");
         itemEditor.setValue("element", createElement(Dbm.react.admin.objects.itemeditors.Visibility, {}));
     }
+
+    {
+        let itemEditor = Dbm.getInstance().repository.getItem("admin/itemEditors/linkedPage");
+        itemEditor.setValue("element", createElement(Dbm.react.admin.objects.itemeditors.LinkedPage, {}));
+    }
+
+    {
+        let itemEditor = Dbm.getInstance().repository.getItem("admin/itemEditors/question");
+        itemEditor.setValue("element", createElement(Dbm.react.admin.objects.itemeditors.Question, {}));
+    }
     
     {
         let objectTypeEditor = Dbm.getInstance().repository.getItem("admin/objectTypeEditors/page");
@@ -285,7 +295,10 @@ export let registerAllBlocks = function() {
         }
 
         let newArray = [].concat(objectTypeEditor.editors);
+        newArray.push(Dbm.getInstance().repository.getItem("admin/itemEditors/question"));
         newArray.push(Dbm.getInstance().repository.getItem("admin/itemEditors/title"));
+        newArray.push(Dbm.getInstance().repository.getItem("admin/itemEditors/content"));
+        newArray.push(Dbm.getInstance().repository.getItem("admin/itemEditors/linkedPage"));
         newArray.push(Dbm.getInstance().repository.getItem("admin/itemEditors/link"));
         newArray.push(Dbm.getInstance().repository.getItem("admin/itemEditors/visibility"));
         objectTypeEditor.editors = newArray;