dbm 1.1.18 → 1.1.19

package/flow/updatefunctions/basic/index.js

@@ -31,5 +31,19 @@ export const propertyOf = function(aValue, aPropertyName) {
 	updateFunction.input.properties.value.setOrConnect(aValue);
 	updateFunction.input.properties.propertyName.setOrConnect(aPropertyName);
 	
+	return updateFunction;
+}
+
+export const combine = function(...aValues) {
+	let updateFunction = new Dbm.flow.updatefunctions.basic.CombineString();
+	
+	let currentArray = aValues;
+	let currentArrayLength = currentArray.length;
+	for(let i = 0; i < currentArrayLength; i++) {
+		let currentData = currentArray[i];
+		updateFunction.addPart(currentData);
+	}
+	
+	
 	return updateFunction;
 }

package/graphapi/webclient/ApiConnection.js

@@ -60,6 +60,7 @@ export default class ApiConnection extends Dbm.core.BaseObject {
 
     requestItem(aId, aEncode) {
         let item = this._getRequestItem();
+        item.requireProperty("item", null);
         
         let encodeString = aEncode.join(",");
 

package/graphapi/webclient/WebSocketConnection.js

@@ -84,6 +84,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
 
     requestItem(aId, aEncode) {
         let item = this._getRequestItem();
+        item.requireProperty("item", null);
         item.setValue("requestData", {"type": "item", "id": aId, "encode": aEncode, "requestId": item.id});
         this._runRequest(item);
         

package/graphapi/webclient/admin/ItemEditor.js

@@ -105,7 +105,7 @@ export default class ItemEditor extends Dbm.core.BaseObject {
     }
 
     getVisibilityEditor(aInitialValue) {
-        let name = "visibility"
+        let name = "visibility";
         let valueEditor = this.item["visibility"];
         if(!valueEditor) {
             valueEditor = new Dbm.graphapi.webclient.admin.ValueEditor();
@@ -124,6 +124,26 @@ export default class ItemEditor extends Dbm.core.BaseObject {
         return valueEditor;
     }
 
+    getIdentiferEditor(aInitialValue) {
+        let name = "identifer";
+        let valueEditor = this.item["identifer"];
+        if(!valueEditor) {
+            valueEditor = new Dbm.graphapi.webclient.admin.ValueEditor();
+            valueEditor.item.editValue.setInitialValue(aInitialValue);
+
+            valueEditor.item.setValue("itemEditor", this.item);
+            valueEditor.item.setValue("updateEncoding", "identifer");
+
+            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.setIdentifier);
+        }
+
+        return valueEditor;
+    }
+
     addCommandsToSaveData(aSaveData) {
 
         let editedItemId = Dbm.objectPath(this.item, "editedItem.id");

package/package.json

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

package/react/admin/EditPage.js

@@ -194,7 +194,13 @@ export default class EditPage extends Dbm.react.BaseObject {
                             "155"
                         )
                     ),
-
+                    React.createElement("div", {className: "spacing standard"}),
+                    React.createElement(Dbm.react.form.LabelledArea, {label: "Main image"}, 
+                        React.createElement(Dbm.react.admin.editorsgroup.EditRelation, {"direction": "in", "relationType": "isMainImageFor", "objectType": "image"},
+                            React.createElement(Dbm.react.form.GraphApiImage, {value: Dbm.react.source.contextVariable("valueEditor.editValue.value"), "objectType": "page", "encoding": "title", nameField: "title", className: "standard-field standard-field-padding full-width"})
+                        )
+                    ),
+                    React.createElement("div", {className: "spacing standard"}),
                     React.createElement("div", {className: "flex-row small-item-spacing"},
                         React.createElement("div", {className: "flex-row-item"},
                             React.createElement(Dbm.react.form.Checkbox, {checked: itemEditor.getEditor("seo/noIndex").item.editValue.value}),

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

@@ -58,6 +58,14 @@ export default class ImageField extends Dbm.react.BaseObject {
                                         "Save to library"
                                     )
                                 )
+                            ),
+                            React.createElement("div", {className: "flex-row-item flex-resize"}),
+                            React.createElement("div", {className: "flex-row-item"},
+                                React.createElement(Dbm.react.interaction.CommandButton, {command: Dbm.commands.callFunction(this._updateFromLibrary.bind(this))},
+                                    React.createElement("div", {className: "action-button action-button-padding"},
+                                        "Update from library"
+                                    )
+                                )
                             )
                         )
                     )
@@ -153,6 +161,29 @@ export default class ImageField extends Dbm.react.BaseObject {
         let request = Dbm.getInstance().repository.getItem("graphApi").controller.editItem(this.item.value.id, changes);
     }
 
+    _updateFromLibrary() {
+        let graphApi = Dbm.getInstance().repository.getItem("graphApi").controller;
+
+        let request = graphApi.requestItem(this.item.value.id, ["image"]);
+        Dbm.flow.addUpdateCommandWhenMatched(request.properties.status, Dbm.loading.LoadingStatus.LOADED, Dbm.commands.callFunction(this._libraryImageLoaded.bind(this), [request]));
+        
+    }
+
+    _libraryImageLoaded(aRequest) {
+        console.log("_libraryImageLoaded");
+        console.log(aRequest);
+
+        let item = aRequest.item;
+
+        let imageData = {id: item.id, url: item.url, resizeUrl: item.resizeUrl, identifier: item.identifier, altText: item.altText};
+        this.item.value = null;
+
+        setTimeout(() => {
+            this.item.value = imageData;
+        }, 100);
+        
+    }
+
     _imageSelected(aImage) {
         //console.log("_imageSelected");
         //console.log(aImage);

package/react/admin/editorsgroup/EditIdentifer.js

@@ -0,0 +1,25 @@
+import React from "react";
+import Dbm from "../../../index.js";
+
+export default class EditVisibility extends Dbm.react.BaseObject {
+    _construct() {
+        super._construct();
+
+        let item = this.context.item;
+        let itemEditor = this.context.itemEditor;
+        let initialDataPath = this.getPropValueWithDefault("initialDataPath", "identifier");
+        let initialData = Dbm.objectPath(item, initialDataPath);
+
+        let editor = itemEditor.getIdentiferEditor(initialData);
+        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,4 +1,5 @@
 export {default as EditField} from "./EditField.js";
 export {default as EditItem} from "./EditItem.js";
 export {default as EditRelation} from "./EditRelation.js";
-export {default as EditVisibility} from "./EditVisibility.js";
+export {default as EditVisibility} from "./EditVisibility.js";
+export {default as EditIdentifer} from "./EditIdentifer.js";

package/react/admin/objects/ObjectList.js

@@ -44,6 +44,7 @@ export default class ObjectList extends Dbm.react.BaseObject {
 
     _create() {
         console.log("_create");
+
         let objectType = this.getPropValue("objectType");
         let encodings = this.getPropValueWithDefault("encodings", ["name"]);
         let visibility = this.getPropValueWithDefault("visibility", "private");
@@ -52,7 +53,13 @@ export default class ObjectList extends Dbm.react.BaseObject {
             {"type": "setField", "data": {"value": "Unnamed " + objectType, "field": "name"}}
         ];
 
-        let request = Dbm.getInstance().repository.getItem("graphApi").controller.createItem([objectType], visibility, changes, encodings);
+        let types = [objectType];
+        let additionalTypes = this.getPropValue("additionalTypes");
+        if(additionalTypes) {
+            types = types.concat(additionalTypes);
+        }
+
+        let request = Dbm.getInstance().repository.getItem("graphApi").controller.createItem(types, visibility, changes, encodings);
 
         Dbm.flow.addUpdateCommand(request.properties.status, Dbm.commands.callFunction(this._created.bind(this), [request]));
     }

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

@@ -0,0 +1,45 @@
+import React from "react";
+import Dbm from "../../../../index.js";
+
+export default class Identifier 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]},
+                ],
+                ["identifier"]
+            );
+            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: "Identifer"}, 
+                    React.createElement(Dbm.react.admin.editorsgroup.EditIdentifer, {},
+                        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/MainImage.js

@@ -0,0 +1,46 @@
+import React from "react";
+import Dbm from "../../../../index.js";
+
+export default class MainImage 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: "Main image"}, 
+                    React.createElement(Dbm.react.admin.editorsgroup.EditRelation, {"direction": "in", "relationType": "isMainImageFor", "objectType": "image"},
+                        React.createElement(Dbm.react.form.GraphApiImage, {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/PageRepresentation.js

@@ -0,0 +1,46 @@
+import React from "react";
+import Dbm from "../../../../index.js";
+
+export default class PageRepresentation 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: "Represening page"}, 
+                    React.createElement(Dbm.react.admin.editorsgroup.EditRelation, {"direction": "in", "relationType": "pageRepresentationFor", "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/index.js

@@ -5,4 +5,7 @@ export {default as Link} from "./Link.js";
 export {default as Visibility} from "./Visibility.js";
 export {default as LinkedPage} from "./LinkedPage.js";
 export {default as Question} from "./Question.js";
-export {default as RichDescription} from "./RichDescription.js";
+export {default as RichDescription} from "./RichDescription.js";
+export {default as PageRepresentation} from "./PageRepresentation.js";
+export {default as MainImage} from "./MainImage.js";
+export {default as Identifier} from "./Identifier.js";

package/react/admin/website/EditLocalBusiness.js

@@ -48,6 +48,12 @@ export default class EditWebsite extends Dbm.react.BaseObject {
         let mainImage = (isMainImageForRelations && isMainImageForRelations.length) ? isMainImageForRelations[0].id : null;
         itemEditor.addIncomingRelationEditor("isMainImageFor", "image", mainImage, ["relations"]);
 
+        {
+            let relatedItems = Dbm.utils.ArrayFunctions.filterByField(Dbm.objectPath(item, "relations/in.for.objects"), "objectTypes", "schema/type", "arrayContains");
+            let relatedItem = (relatedItems && relatedItems.length) ? relatedItems[0].id : null;
+            itemEditor.addIncomingRelationEditor("for", "schema/type", relatedItem, ["relations"]);
+        }
+
         itemEditor.addFieldEditor("phoneNumber", Dbm.objectPath(item, "fields.phoneNumber"), "admin_fields");
         itemEditor.addFieldEditor("email", Dbm.objectPath(item, "fields.email"), "admin_fields");
         itemEditor.addFieldEditor("priceRangeDescription", Dbm.objectPath(item, "fields.priceRangeDescription"), "admin_fields");
@@ -83,6 +89,9 @@ export default class EditWebsite extends Dbm.react.BaseObject {
                     React.createElement(Dbm.react.form.LabelledArea, {"label": "Name"},
                         React.createElement(Dbm.react.form.FormField, {"value": Dbm.react.source.contextVariable("itemEditor.value.item.editor_name.item.editValue.item.properties.value"), className: "standard-field standard-field-padding full-width"})
                     ),
+                    React.createElement(Dbm.react.form.LabelledArea, {"label": "Schema type"},
+                        React.createElement(Dbm.react.form.GraphApiObjectSelection, {"objectType": "schema/type", "value": Dbm.react.source.contextVariable("itemEditor.value.item.editor_relation_in_for_schema/type.item.editValue.item.properties.value")}),
+                    ),
                     React.createElement(Dbm.react.form.LabelledArea, {"label": "Image"},
                         React.createElement(Dbm.react.form.GraphApiImage, {"value": Dbm.react.source.contextVariable("itemEditor.value.item.editor_relation_in_isMainImageFor_image.item.editValue.item.properties.value")}),
                     ),

package/react/blocks/admin/objects/List.js

@@ -9,9 +9,15 @@ export default class ObjectList extends Dbm.react.BaseObject {
     _renderMainElement() {
 
         let encodings = Dbm.utils.ArrayFunctions.arrayOrSeparatedString(this.context.blockData.encodings);
+        let additionalTypes = [];
+
+        let additionalTypesString = this.context.blockData.additionalTypes;
+        if(additionalTypesString) {
+            additionalTypes = Dbm.utils.ArrayFunctions.arrayOrSeparatedString(additionalTypesString);
+        }
 
         return React.createElement("div", {className: "content-narrow"}, 
-            React.createElement(Dbm.react.admin.objects.ObjectList, {objectType: this.context.blockData.objectType, encodings: encodings, nameField: this.context.blockData.nameField, visibility: this.context.blockData.visibility})
+            React.createElement(Dbm.react.admin.objects.ObjectList, {objectType: this.context.blockData.objectType, additionalTypes: additionalTypes, encodings: encodings, nameField: this.context.blockData.nameField, visibility: this.context.blockData.visibility})
         );
     }
 }

package/react/blocks/faq/AskAQuestion.js

@@ -66,7 +66,7 @@ export default class AskAQuestion extends Dbm.react.BaseObject {
         let currentRow = new Dbm.repository.Item();
         currentRow.setId("_dbmInternal/row" + Dbm.getInstance().getNextId());
         currentRow.setValue("item", currentItem);
-        currentRow.setValue("element", React.createElement(Dbm.react.blocks.faq.HelpSectionRowItem, {"open": this._getOpenProperty(i)}));
+        currentRow.setValue("element", React.createElement(Dbm.react.blocks.faq.HelpSectionRowItem, {"open": this._getOpenProperty(i), "startState": (i === 0 ? "open" : "close")}));
         rows.push(currentRow);
       }
       this.item.results = rows;
@@ -133,7 +133,7 @@ export default class AskAQuestion extends Dbm.react.BaseObject {
               ),
               React.createElement("div", {className: "flex-row-item flex-no-resize"},
                 React.createElement("div", {className: "submit-button-field-padding-right-side border-box-sizing full-height"},
-                  React.createElement("button", {className: "skip-default full-height"},
+                  React.createElement("button", {className: "skip-default full-height", "aria-label": "Search"},
                     React.createElement("div", {className: "field-submit-button field-submit-button-padding full-height", onClick: () => {this._search();}},
                       React.createElement("div", {className: "centered-cell-holder full-size"},
                         React.createElement(Dbm.react.image.Image, {src: "/assets/img/right-arrow.svg", className: "right-arrow-link-icon background-contain"})

package/react/blocks/faq/HelpSectionRowItem.js

@@ -71,7 +71,7 @@ export default class HelpSectionRowItem extends Dbm.react.BaseObject {
                     )
                 )
             ),
-            React.createElement(Dbm.react.area.OpenCloseExpandableArea, {open: open}, 
+            React.createElement(Dbm.react.area.OpenCloseExpandableArea, {open: open, startState: this.getPropValue("startState")}, 
                 answerElement
             )
         );

package/react/blocks/index.js

@@ -114,6 +114,10 @@ export let registerAllBlocks = function() {
                 createElement(Dbm.react.admin.editor.fields.TextField, {name: "objectType"})
             ),
             createElement("div", {className: "spacing medium"}),
+            createElement(Dbm.react.form.LabelledArea, {label: "Additional types (optional)"},
+                createElement(Dbm.react.admin.editor.fields.TextField, {name: "additionalTypes"})
+            ),
+            createElement("div", {className: "spacing medium"}),
             createElement(Dbm.react.form.LabelledArea, {label: "Encodings"},
                 createElement(Dbm.react.admin.editor.fields.TextField, {name: "encodings"})
             ),
@@ -210,15 +214,11 @@ export let registerAllBlocks = function() {
 
     {
         let editor = createElement(Dbm.react.admin.editor.EditorBlockName, {},
-            createElement(Dbm.react.form.LabelledArea, {label: "Text 1"},
-                createElement(Dbm.react.admin.editor.fields.TextField, {name: "text1"})
-            ),
-            createElement("div", {className: "spacing medium"}),
             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});
+        registerBlock("faq/askAQuestion", "FAQ / Ask a question", createElement(Dbm.react.blocks.faq.AskAQuestion, {}), editor, {}, {});
     }
 
     {
@@ -251,6 +251,11 @@ export let registerAllBlocks = function() {
         itemEditor.setValue("element", createElement(Dbm.react.admin.objects.itemeditors.Visibility, {}));
     }
 
+    {
+        let itemEditor = Dbm.getInstance().repository.getItem("admin/itemEditors/identifier");
+        itemEditor.setValue("element", createElement(Dbm.react.admin.objects.itemeditors.Identifier, {}));
+    }
+
     {
         let itemEditor = Dbm.getInstance().repository.getItem("admin/itemEditors/linkedPage");
         itemEditor.setValue("element", createElement(Dbm.react.admin.objects.itemeditors.LinkedPage, {}));
@@ -260,6 +265,16 @@ export let registerAllBlocks = function() {
         let itemEditor = Dbm.getInstance().repository.getItem("admin/itemEditors/question");
         itemEditor.setValue("element", createElement(Dbm.react.admin.objects.itemeditors.Question, {}));
     }
+
+    {
+        let itemEditor = Dbm.getInstance().repository.getItem("admin/itemEditors/pageRepresentation");
+        itemEditor.setValue("element", createElement(Dbm.react.admin.objects.itemeditors.PageRepresentation, {}));
+    }
+
+    {
+        let itemEditor = Dbm.getInstance().repository.getItem("admin/itemEditors/mainImage");
+        itemEditor.setValue("element", createElement(Dbm.react.admin.objects.itemeditors.MainImage, {}));
+    }
     
     {
         let objectTypeEditor = Dbm.getInstance().repository.getItem("admin/objectTypeEditors/page");
@@ -300,4 +315,19 @@ export let registerAllBlocks = function() {
         newArray.push(Dbm.getInstance().repository.getItem("admin/itemEditors/visibility"));
         objectTypeEditor.editors = newArray;
     }
+
+    {
+        let objectTypeEditor = Dbm.getInstance().repository.getItem("admin/objectTypeEditors/type");
+        if(!objectTypeEditor.editors) {
+            objectTypeEditor.setValue("editors", []);
+        }
+
+        let newArray = [].concat(objectTypeEditor.editors);
+        newArray.push(Dbm.getInstance().repository.getItem("admin/itemEditors/name"));
+        newArray.push(Dbm.getInstance().repository.getItem("admin/itemEditors/identifier"));
+        newArray.push(Dbm.getInstance().repository.getItem("admin/itemEditors/pageRepresentation"));
+        newArray.push(Dbm.getInstance().repository.getItem("admin/itemEditors/mainImage"));
+        
+        objectTypeEditor.editors = newArray;
+    }
 }

package/utils/ArrayFunctions.js

@@ -290,4 +290,24 @@ export const getItemIndexByIfExists = function(aArray, aField, aIdentifier) {
     }
     
     return -1;
+}
+
+export const sum = function(aArray) {
+		
+    if(!Array.isArray(aArray)) {
+        console.warn("No array provided", aArray);
+        return 0;
+    }
+    
+    let sum = 0;
+    let currentArray = aArray;
+    let currentArrayLength = currentArray.length;
+    for(let i = 0; i < currentArrayLength; i++) {
+        let currentValue = 1*currentArray[i];
+        if(!isNaN(currentValue)) {
+            sum += currentValue;
+        }
+    }
+    
+    return sum;
 }