dbm 1.4.13 → 1.4.15

package/graphapi/webclient/admin/ItemEditor.js

@@ -134,6 +134,7 @@ export default class ItemEditor extends Dbm.core.BaseObject {
     }
 
     addMultipleIncomingRelationsEditor(aType, aObjectType, aInitialValue, aUpdateEncoding = null) {
+        //console.log("addMultipleIncomingRelationsEditor");
         let name = "in_" + aType + "_" + aObjectType;
         return this._addMultipleRelationsEditor(name, aType, aObjectType, aInitialValue, Dbm.graphapi.webclient.admin.SaveFunctions.multipleIncomingRelations, aUpdateEncoding);
     }
@@ -144,6 +145,7 @@ export default class ItemEditor extends Dbm.core.BaseObject {
     }
 
     getAdminMultipleIncomingRelationsEditor(aType, aObjectType) {
+        //console.log("getAdminMultipleIncomingRelationsEditor");
         let name = "in_" + aType + "_" + aObjectType;
         let valueEditor = this.item["editor_multipleRelations_" + name];
         if(!valueEditor) {

package/graphapi/webclient/decode/Relations.js

@@ -39,7 +39,12 @@ export default class Relations extends Dbm.graphapi.webclient.decode.DecodeBaseO
                 let relation = Dbm.getRepositoryItem(currentRelationData["relationId"]);
                 if(typeItem.relations.indexOf(relation) === -1) {
                     let linkedItem = Dbm.getRepositoryItem(currentRelationData["id"]);
-                    //METODO: add data to relation
+
+                    relation.setValue("from", linkedItem);
+                    relation.setValue("to", aItem);
+                    relation.setValue("startAt", currentRelationData["startAt"]);
+                    relation.setValue("endAt", currentRelationData["endAt"]);
+
                     if(this._isRelationValid(currentRelationData["startAt"], currentRelationData["endAt"])) {
                         typeItem.addToArray("objects", linkedItem);
                         typeItem.addToArray("relations", relation);
@@ -72,7 +77,12 @@ export default class Relations extends Dbm.graphapi.webclient.decode.DecodeBaseO
                 let relation = Dbm.getRepositoryItem(currentRelationData["relationId"]);
                 if(typeItem.relations.indexOf(relation) === -1) {
                     let linkedItem = Dbm.getRepositoryItem(currentRelationData["id"]);
-                    //METODO: add data to relation
+                    
+                    relation.setValue("from", aItem);
+                    relation.setValue("to", linkedItem);
+                    relation.setValue("startAt", currentRelationData["startAt"]);
+                    relation.setValue("endAt", currentRelationData["endAt"]);
+
                     if(this._isRelationValid(currentRelationData["startAt"], currentRelationData["endAt"])) {
                         typeItem.addToArray("objects", linkedItem);
                         typeItem.addToArray("relations", relation);

package/graphapi/webclient/decode/index.js

@@ -225,4 +225,7 @@ export const fullSetup = function() {
     setupDefaultDecoder("menuLocation", ["identifier"], ["menu"], []);
     setupDefaultDecoder("menu", ["order"], [], ["menuItems"], [Dbm.commands.callFunction(linkUpMenu, [Dbm.core.source.event("item")])]);
     setupDefaultDecoder("menuItem", ["label", "link"], [], []);
+
+    setupDefaultDecoder("review", ["rating", "from", "description", "date"], ["source"], []);
+    setupDefaultDecoder("reviewSource", ["imageUrl", "link"], ["type"], []);
 }

package/node/googlemaps/index.js

@@ -0,0 +1,53 @@
+import Dbm from "../../index.js";
+
+export const findPlace = async function(aName) {
+    let response = await fetch("https://places.googleapis.com/v1/places:searchText", {
+        method: "POST",
+        headers: {
+            "Content-Type": "application/json",
+            "X-Goog-Api-Key": Dbm.getRepositoryItem("googleMapsApi").apiKey,
+            "X-Goog-FieldMask": "*"
+        },
+        body: JSON.stringify({
+            textQuery: aName,
+            maxResultCount: 1
+        })
+    });
+
+    let repsonseText = await response.text();
+
+    let place = null;
+    try {
+        let responseData = JSON.parse(repsonseText);
+        place = Dbm.objectPath(responseData, "places.0");
+    }
+    catch(theError) {
+
+    }
+
+    return place;
+}
+
+export const getReviews = async function(aPlaceId) {
+    let response = await fetch("https://places.googleapis.com/v1/places/" + aPlaceId, {
+        headers: {
+            "X-Goog-Api-Key": Dbm.getRepositoryItem("googleMapsApi").apiKey,
+            "X-Goog-FieldMask": "*"
+        }
+    });
+
+    let repsonseText = await response.text();
+    let reviews = [];
+
+    try {
+        let responseData = JSON.parse(repsonseText);
+        console.log(responseData);
+        reviews = Dbm.objectPath(responseData, "reviews");
+    }
+    catch(theError) {
+
+    }
+
+    return reviews;
+}
+

package/node/index.js

@@ -1,5 +1,6 @@
 import Dbm from "../index.js";
 export * as communication from "./communication/index.js";
+export * as googlemaps from "./googlemaps/index.js";
 
 export const getDatabase = function() {
     return Dbm.getRepositoryItem("graphDatabase").controller;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm",
-  "version": "1.4.13",
+  "version": "1.4.15",
   "main": "index.js",
   "type": "module",
   "exports": {

package/react/BaseObject.js

@@ -111,6 +111,16 @@ export default class BaseObject extends Component {
         return value;
     }
 
+    getPropValueWithoutNull(aName, aDefaultValue) {
+        let value = this.getPropValue(aName);
+
+        if(value === null || value === undefined) {
+            value = aDefaultValue;
+        }
+
+        return value;
+    }
+
     createRef(aName) {
         let refToProperty = this.item["ref/" + aName];
 

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

@@ -18,6 +18,12 @@ export default class DraggableHierarchyDisplay extends Dbm.react.BaseObject {
     _renderMainElement() {
 
         let children = this.getPropValue("children");
+        let depthLimit = this.getPropValueWithoutNull("depthLimit", -1);
+        let newDepthLimit = depthLimit;
+        if(depthLimit > 0) {
+            newDepthLimit = depthLimit-1;
+        }
+        let canAddChilds = (depthLimit !== 0);
 
         return React.createElement("div", {},
             React.createElement(Dbm.react.context.AddItemToContext, {"item": Dbm.react.source.contextVariable("hierarchyItem.linkedItem")},
@@ -50,14 +56,16 @@ export default class DraggableHierarchyDisplay extends Dbm.react.BaseObject {
                 React.createElement("div", {className: "spacing small"}),
                 React.createElement(Dbm.react.area.HasData, {check: Dbm.react.source.contextVariable("hierarchyItem.properties.children"), checkType: "notEmpty"},
                     React.createElement(Dbm.react.area.List, {items: Dbm.react.source.contextVariable("hierarchyItem.properties.children"), as: "hierarchyItem"},
-                        React.createElement(Dbm.react.admin.objects.itemeditors.DraggableHierarchyDisplay, {}, children),
+                        React.createElement(Dbm.react.admin.objects.itemeditors.DraggableHierarchyDisplay, {depthLimit: newDepthLimit}, children),
                         React.createElement("div", {"data-slot": "spacing", className: "spacing small"}),
                     ),
                     React.createElement("div", {className: "spacing small"})
                 ),
-                React.createElement(Dbm.react.interaction.drag.DraggableItem, {skipDraggable: true, moveMode: "appendChild"},
-                    React.createElement("div", {className: "append-drop-position centered-cell-holder"},
-                        React.createElement("div", {})
+                React.createElement(Dbm.react.area.HasData, {check: canAddChilds},
+                    React.createElement(Dbm.react.interaction.drag.DraggableItem, {skipDraggable: true, moveMode: "appendChild"},
+                        React.createElement("div", {className: "append-drop-position centered-cell-holder"},
+                            React.createElement("div", {})
+                        )
                     )
                 )
             )

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

@@ -348,6 +348,7 @@ export default class HierarchyOrderedRelationsList extends Dbm.react.BaseObject
 
         let label = this.getPropValue("label");
         let children = this.getPropValue("children");
+        let depthLimit = this.getPropValueWithoutNull("depthLimit", -1);
 
         return React.createElement("div", {},
             React.createElement(Dbm.react.context.AddContextVariables, {"values": {"dragController": this, "hierarchyController": this}},
@@ -355,7 +356,7 @@ export default class HierarchyOrderedRelationsList extends Dbm.react.BaseObject
                 React.createElement("div", {"className": ""},
                     React.createElement(Dbm.react.area.List, {items: this.item.hierarchy.properties.children, as: "hierarchyItem"},
                         React.createElement(Dbm.react.context.AddItemToContext, {"item": Dbm.react.source.contextVariable("hierarchyItem.linkedItem")},
-                            React.createElement(Dbm.react.admin.objects.itemeditors.DraggableHierarchyDisplay, {},
+                            React.createElement(Dbm.react.admin.objects.itemeditors.DraggableHierarchyDisplay, {depthLimit: depthLimit},
                                 children
                             )
                         ),

package/react/blocks/index.js

@@ -591,7 +591,7 @@ export let registerAllBlocks = function() {
         pageEditors.push(newEditor);
     }
 
-{
+    {
         let objectTypeEditor = Dbm.getInstance().repository.getItem("admin/objectTypeEditors/emailTemplate");
         if(!objectTypeEditor.editors) {
             objectTypeEditor.setValue("editors", []);
@@ -611,6 +611,47 @@ export let registerAllBlocks = function() {
         objectTypeEditor.editors = newArray;
     }
 
+    {
+        let objectTypeEditor = Dbm.getInstance().repository.getItem("admin/objectTypeEditors/group/reviewGroup");
+        if(!objectTypeEditor.editors) {
+            objectTypeEditor.setValue("editors", []);
+        }
+
+        let newArray = [].concat(objectTypeEditor.editors);
+
+        {
+            let itemEditor = new Dbm.repository.Item();
+            itemEditor.setValue("element", createElement(Dbm.react.admin.objects.itemeditors.HierarchyOrderedRelationsList, {
+            "label": "Reviews",
+            "direction": "in",
+            "relationType": "in",
+            "objectType": "groupItem",
+            "orderFieldName": "order",
+            "depthLimit": 0
+        },
+        createElement("div", {"className": ""}, 
+            createElement(Dbm.react.admin.EditObject, {"item": Dbm.react.source.item()},
+                createElement("div", {"className": "flex-row small-item-spacing"},
+                    createElement("div", {"className": "flex-row-item flex-resize"},
+                        createElement(Dbm.react.admin.objects.itemeditors.SingleRelation, {
+                            "direction": "out",
+                            "relationType": "for",
+                            "objectType": "review",
+                            encoding: "name",
+                            nameField: "name"
+                        })
+                    )
+                )
+                
+            )
+        )
+        ));
+            newArray.push(itemEditor);
+        }
+        
+        objectTypeEditor.editors = newArray;
+    }
+
     admin.pageEditors = pageEditors;
 
     {

package/react/svg/AddGlobalFilterClasses.js

@@ -0,0 +1,34 @@
+import Dbm from "../../index.js";
+import React from "react";
+
+export default class GlobalFilters extends Dbm.core.BaseObject {
+    _construct() {
+        super._construct();
+
+        this._styleTag = null;
+
+        let colorFilters = Dbm.getRepositoryItem("globalSvg");
+        let filtersProperty = colorFilters.requireProperty("filters", []);
+
+        filtersProperty.addUpdate(this._getScopedCallFunctionCommand(this._updateStyles));
+        this._updateStyles();
+    }
+
+    _updateStyles() {
+        console.log("_updateStyles");
+
+        let colorFilters = Dbm.getRepositoryItem("globalSvg");
+        console.log(colorFilters.filters.length);
+
+        if(colorFilters.filters.length) {
+            if(!this._styleTag) {
+                this._styleTag = document.createElement("style");
+                document.head.appendChild(this._styleTag);
+            }
+
+            let declarations = Dbm.utils.ArrayFunctions.mapField(colorFilters.filters, "classDeclaration");
+            this._styleTag.innerHTML = declarations.join("\n");
+            console.log(declarations);
+        }
+    }
+}

package/react/svg/index.js

@@ -3,6 +3,7 @@ import React from "react";
 
 export {default as GlobalFilters} from "./GlobalFilters.js";
 export {default as MatrixFilter} from "./MatrixFilter.js";
+export {default as AddGlobalFilterClasses} from "./AddGlobalFilterClasses.js";
 
 export const addGlobalRgbColorFilter = function(aName, aR, aG, aB) {
 
@@ -11,6 +12,7 @@ export const addGlobalRgbColorFilter = function(aName, aR, aG, aB) {
 
     let item = Dbm.getRepositoryItem("globalSvg/filters/" + aName);
     item.setValue("element", React.createElement(Dbm.react.svg.MatrixFilter, {"id": aName, "matrix": Dbm.utils.svg.ColorMatrixFunctions.floodColor(aR, aG, aB)}));
+    item.setValue("classDeclaration", "." + aName + "{filter:url(\"#" + aName + "\")}");
 
     let filters = [].concat(colorFilters.filters);
     filters.push(item);