dbm 1.1.20 → 1.1.22

package/package.json

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

package/react/BaseObject.js

@@ -10,12 +10,17 @@ export default class BaseObject extends Component {
         this._construct();
 
         this._prepareProps();
+        this._constructAfterProps();
     }
 
     _construct() {
 
     }
 
+    _constructAfterProps() {
+
+    }
+
     _prepareProps() {
         //console.log("_prepareProps");
         let props = this.props;

package/react/admin/EditObjectById.js

@@ -0,0 +1,54 @@
+import React from "react";
+import Dbm from "../../index.js";
+
+export default class EditObjectById extends Dbm.react.BaseObject {
+    _constructAfterProps() {
+        super._constructAfterProps();
+
+        let editorGroup = this.context.editorGroup;
+        if(!editorGroup) {
+            editorGroup = new Dbm.graphapi.webclient.admin.EditorGroup();
+        }
+        this.item.setValue("editorGroup", editorGroup);
+        
+
+        let graphApi = Dbm.getInstance().repository.getItem("graphApi").controller;
+        
+        let id = this.getPropValue("id");
+        console.log(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.getPropValue("id");
+        let item = Dbm.getInstance().repository.getItem(id);
+        let itemEditor = this.item.editorGroup.getItemEditor(id);
+
+        let children = this.getPropValue("children");
+
+        return React.createElement("div", {},
+            React.createElement(Dbm.react.area.HasData, {check: this.item.properties.loaded},
+                React.createElement(Dbm.react.context.AddContextVariables, {values: {"editorGroup": this.item.editorGroup, "item": item, "itemEditor": itemEditor}},
+                    children
+                )
+            )
+        );
+    }
+}

package/react/admin/EditPage.js

@@ -42,6 +42,17 @@ export default class EditPage extends Dbm.react.BaseObject {
         let saveData = editorGroup.getSaveData();
         let itemSaveData = saveData.getItemSaveData(page.id);
 
+        let itemEditor = editorGroup.getItemEditor(page.id);
+        let content = itemEditor.getEditor("content").item.editValue.getValue();
+
+        let preloadImages = [];
+
+        let pageEditorItem = Dbm.getInstance().repository.getItem("admin/editor/pageEditor");
+        if(pageEditorItem.generateContentPreload) {
+            preloadImages = pageEditorItem.generateContentPreload(content);
+        }
+
+        itemSaveData.setField("contentPreloadTags", preloadImages);
         itemSaveData.setField("lastModified", (new Date()).toISOString());
         itemSaveData.createChange("clearCache", {});
 
@@ -162,125 +173,139 @@ export default class EditPage extends Dbm.react.BaseObject {
         let editorGroup = this.item.editorGroup;
         let itemEditor = editorGroup.getItemEditor(page.id);
 
+        let admin = Dbm.getInstance().repository.getItem("admin");
+        let pageEditors = admin.requireProperty("pageEditors", []);
+
         return React.createElement("div", {},
             React.createElement(Dbm.react.context.AddContextVariables, {values: {"editorGroup": editorGroup, "itemEditor": itemEditor}},
-                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(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(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: "spacing standard"}),
+                        React.createElement("div", {},
+                            React.createElement("label", {className: "standard-field-label"},
+                                "Navigation name"
+                            ),
+                            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.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", {},
-                        React.createElement("label", {className: "standard-field-label"},
-                            "Url"
+                        React.createElement("div", {className: "spacing standard"}),
+                        React.createElement("div", {},
+                            React.createElement("label", {className: "standard-field-label"},
+                                "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.form.FormField, {"value": itemEditor.getEditor("url").item.editValue.value, className: "standard-field standard-field-padding full-width", placeholder: "Url"}),
-                    ),
-                    React.createElement("div", {className: "spacing standard"}),
-                    React.createElement("div", {},
-                        React.createElement("label", {className: "standard-field-label"},
-                            "Publish date"
+                        React.createElement("div", {className: "spacing standard"}),
+                        React.createElement("div", {},
+                            React.createElement("label", {className: "standard-field-label"},
+                                "Publish date"
+                            ),
+                            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("div", {className: "spacing standard"}),
+                        React.createElement("div", {},
+                            React.createElement("label", {className: "standard-field-label"},
+                                "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(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("div", {className: "spacing standard"}),
-                    React.createElement("div", {},
+                    React.createElement("div", {"className": "dbm-admin-box dbm-admin-box-padding"},
                         React.createElement("label", {className: "standard-field-label"},
-                            "Category"
+                            "Seo description"
                         ),
-                        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", {"className": "dbm-admin-box dbm-admin-box-padding"},
-                    React.createElement("label", {className: "standard-field-label"},
-                        "Seo description"
-                    ),
-                    React.createElement(Dbm.react.form.FormField, {"value": itemEditor.getEditor("meta/description").item.editValue.value, className: "standard-field standard-field-padding full-width", placeholder: "Description"}),
-                    React.createElement("div", {className: "spacing micro"}),
-                    React.createElement("div", {className: "flex-row justify-between"},
-                        React.createElement("div", {className: "flex-row-item"},
-                            React.createElement("div", {onClick: () => {this._generateSeoSummary()}, className: "action-button action-button-padding"}, "Generate"),
+                        React.createElement(Dbm.react.form.FormField, {"value": itemEditor.getEditor("meta/description").item.editValue.value, className: "standard-field standard-field-padding full-width", placeholder: "Description"}),
+                        React.createElement("div", {className: "spacing micro"}),
+                        React.createElement("div", {className: "flex-row justify-between"},
+                            React.createElement("div", {className: "flex-row-item"},
+                                React.createElement("div", {onClick: () => {this._generateSeoSummary()}, className: "action-button action-button-padding"}, "Generate"),
+                            ),
+                            React.createElement("div", {className: "flex-row-item"},
+                                Dbm.react.text.text(this.item.properties.descriptionLength),
+                                " / ",
+                                "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: "flex-row-item"},
-                            Dbm.react.text.text(this.item.properties.descriptionLength),
-                            " / ",
-                            "155"
+                        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}),
+                                "Noindex"
+                            ),
+                            React.createElement("div", {className: "flex-row-item"},
+                                React.createElement(Dbm.react.form.Checkbox, {checked: itemEditor.getEditor("seo/noFollow").item.editValue.value}),
+                                "Nofollow"
+                            ),
                         )
                     ),
                     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": "dbm-admin-box dbm-admin-box-padding"},
+                        React.createElement("label", {className: "standard-field-label"},
+                            "Content"
+                        ),
+                        React.createElement("div", {},
+                            React.createElement(Dbm.react.admin.editor.Editor, {"value": itemEditor.getEditor("content").item.editValue.value, "ref": this.createRef("editor")}),
                         )
                     ),
-                    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}),
-                            "Noindex"
-                        ),
-                        React.createElement("div", {className: "flex-row-item"},
-                            React.createElement(Dbm.react.form.Checkbox, {checked: itemEditor.getEditor("seo/noFollow").item.editValue.value}),
-                            "Nofollow"
+                    React.createElement(Dbm.react.area.HasData, {check: pageEditors},
+                        React.createElement("div", {className: "spacing standard"}),
+                        React.createElement(Dbm.react.area.List, {items: pageEditors, as: "editor"},
+                            React.createElement("div", {"className": "dbm-admin-box dbm-admin-box-padding"},
+                                React.createElement(Dbm.react.area.InsertElement, {element: Dbm.react.source.contextVariable("editor.element")})
+                            ),
+                            React.createElement("div", {className: "spacing standard", "data-slot": "spacing"}),
                         ),
-                    )
-                ),
-                React.createElement("div", {className: "spacing standard"}),
-                React.createElement("div", {"className": "dbm-admin-box dbm-admin-box-padding"},
-                    React.createElement("label", {className: "standard-field-label"},
-                        "Content"
                     ),
-                    React.createElement("div", {},
-                        React.createElement(Dbm.react.admin.editor.Editor, {"value": itemEditor.getEditor("content").item.editValue.value, "ref": this.createRef("editor")}),
-                    )
-                ),
-                React.createElement("div", {className: "spacing standard"}),
-                React.createElement("div", {"className": "dbm-admin-box dbm-admin-box-padding"},
-                    React.createElement("label", {className: "standard-field-label", "onClick": () => {this._toggleImportExport()}},
-                        "Import/export"
-                    ),
-                    React.createElement(Dbm.react.area.OpenCloseExpandableArea, {open: this.item.properties.importExportOpen}, 
-                        React.createElement("div", {},
-                            React.createElement("div", {className: "flex-row small-item-spacing"},
-                                React.createElement("div", {className: "flex-row-item"},
-                                    React.createElement("div", {"className": "standard-button standard-button-padding", "onClick": () => {this._export()}},
-                                        "Export"
+                    React.createElement("div", {className: "spacing standard"}),
+                    React.createElement("div", {"className": "dbm-admin-box dbm-admin-box-padding"},
+                        React.createElement("label", {className: "standard-field-label", "onClick": () => {this._toggleImportExport()}},
+                            "Import/export"
+                        ),
+                        React.createElement(Dbm.react.area.OpenCloseExpandableArea, {open: this.item.properties.importExportOpen}, 
+                            React.createElement("div", {},
+                                React.createElement("div", {className: "flex-row small-item-spacing"},
+                                    React.createElement("div", {className: "flex-row-item"},
+                                        React.createElement("div", {"className": "standard-button standard-button-padding", "onClick": () => {this._export()}},
+                                            "Export"
+                                        )
                                     )
-                                )
-                            ),
-                            React.createElement("div", {className: "spacing standard"}),
-                            React.createElement(Dbm.react.form.TextArea, {value: this.item.properties.importText, className: "standard-field standard-field-padding full-width"}),
-                            React.createElement("div", {className: "flex-row small-item-spacing"},
-                                React.createElement("div", {className: "flex-row-item"},
-                                    React.createElement("div", {"className": "standard-button standard-button-padding", "onClick": () => {this._import()}},
-                                        "Import"
+                                ),
+                                React.createElement("div", {className: "spacing standard"}),
+                                React.createElement(Dbm.react.form.TextArea, {value: this.item.properties.importText, className: "standard-field standard-field-padding full-width"}),
+                                React.createElement("div", {className: "flex-row small-item-spacing"},
+                                    React.createElement("div", {className: "flex-row-item"},
+                                        React.createElement("div", {"className": "standard-button standard-button-padding", "onClick": () => {this._import()}},
+                                            "Import"
+                                        )
                                     )
                                 )
+                                /*
+                                React.createElement("div", {className: "flex-row-item"},
+                                    React.createElement("div", {onClick: () => {this._generateHelpSectionSuggestions()}, className: "action-button action-button-padding"}, "Dev: Help sections"),
+                                ),
+                                */
                             )
-                            /*
-                            React.createElement("div", {className: "flex-row-item"},
-                                React.createElement("div", {onClick: () => {this._generateHelpSectionSuggestions()}, className: "action-button action-button-padding"}, "Dev: Help sections"),
-                            ),
-                            */
                         )
-                    )
-                    
-                ),
-                React.createElement("div", {className: "spacing standard"}),
-                React.createElement("div", {className: "save-all-position"},
-                    React.createElement(Dbm.react.area.OpenCloseExpandableArea, {open: this.item.properties.changed},
-                        React.createElement("div", {"className": "standard-button standard-button-padding", "onClick": () => {this._save()}},
-                            "Save all changes"
+                        
+                    ),
+                    React.createElement("div", {className: "spacing standard"}),
+                    React.createElement("div", {className: "save-all-position"},
+                        React.createElement(Dbm.react.area.OpenCloseExpandableArea, {open: this.item.properties.changed},
+                            React.createElement("div", {"className": "standard-button standard-button-padding", "onClick": () => {this._save()}},
+                                "Save all changes"
+                            )
                         )
                     )
                 )

package/react/admin/index.js

@@ -2,9 +2,11 @@ export {default as CreatePage} from "./CreatePage.js";
 export {default as EditPage} from "./EditPage.js";
 export {default as SelectImageFromLibrary} from "./SelectImageFromLibrary.js";
 export {default as SelectedImage} from "./SelectedImage.js";
+export {default as EditObjectById} from "./EditObjectById.js";
 
 export * as editor from "./editor/index.js";
 export * as pages from "./pages/index.js";
 export * as website from "./website/index.js";
 export * as objects from "./objects/index.js";
-export * as editorsgroup from "./editorsgroup/index.js";
+export * as editorsgroup from "./editorsgroup/index.js";
+export * as pageeditors from "./pageeditors/index.js";

package/react/admin/pageeditors/HelpSections.js

@@ -0,0 +1,96 @@
+import React from "react";
+import Dbm from "../../../index.js";
+
+export default class HelpSections extends Dbm.react.BaseObject {
+    _construct() {
+        super._construct();
+
+        let item = this.context.item;
+        let itemEditor = this.context.itemEditor;
+
+        {
+            let direction = "in";
+            let relationType = "for";
+            let objectType = "helpSection";
+            let relations = Dbm.utils.ArrayFunctions.filterByField(Dbm.objectPath(item, "relations/" + direction + "." + relationType + ".objects"), "objectTypes", objectType, "arrayContains");
+            let editor = itemEditor.addMultipleIncomingRelationsEditor(relationType, objectType, Dbm.utils.ArrayFunctions.mapField(relations, "id"), ["relations"]);
+            console.log(relations, editor);
+        }
+    }
+
+    _addArrayRow(aArrayEditor) {
+        console.log("_addArrayRow");
+
+        let changes = [
+            {"type": "addOutgoingRelation", "data": {"value": this.context.item.id, "type": "for"}}
+        ];
+
+        let request = Dbm.getInstance().repository.getItem("graphApi").controller.createItem(["helpSection"], "public", changes, ["id"]);
+
+        Dbm.flow.addUpdateCommandWhenMatched(request.properties.status, 1, Dbm.commands.callFunction(this._created.bind(this), [request, aArrayEditor]));
+    }
+
+    _created(aRequest, aArrayEditor) {
+        console.log("_created");
+        console.log(aRequest);
+
+        aArrayEditor.push(aRequest.item.id);
+    }
+
+    _removeArrayRow(aArrayEditor, aItem) {
+        aArrayEditor.removeItem(aItem);
+    }
+
+    _renderMainElement() {
+
+        let direction = "in";
+        let relationType = "for";
+        let objectType = "helpSection";
+
+        return React.createElement("div", {},
+            React.createElement("h2", {}, "Faq questions"),
+                        
+                React.createElement(Dbm.react.form.EditArray, {"value": Dbm.react.source.contextVariable("itemEditor.item.editor_multipleRelations_" + direction + "_" + relationType + "_" + objectType + ".item.editValue.item.properties.value")},
+                    React.createElement("div", {},
+                        React.createElement("h3", {}, "Question ", Dbm.react.text.text(Dbm.react.source.contextVariable("item.properties.value"))),
+                        React.createElement(Dbm.react.admin.EditObjectById, {id: Dbm.react.source.contextVariable("item.value")},
+                                React.createElement("div", {},
+                                    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"})
+                                        )
+                                    ),
+                                    React.createElement(Dbm.react.form.LabelledArea, {label: "Title"}, 
+                                        React.createElement(Dbm.react.admin.editorsgroup.EditField, {"fieldName": "title", "initialDataPath": "title"},
+                                            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: "Description"}, 
+                                    React.createElement(Dbm.react.admin.editorsgroup.EditField, {"fieldName": "description"},
+                                        React.createElement(Dbm.react.form.TextArea, {value: Dbm.react.source.contextVariable("valueEditor.editValue.value"), className: "standard-field standard-field-padding full-width"})
+                                    )
+                                ),
+                                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("div", {"data-slot": "after"},
+                        React.createElement("div", {"className": "spacing standard"}),
+                        React.createElement(Dbm.react.interaction.CommandButton, {command: Dbm.commands.callFunction(this._addArrayRow.bind(this), [Dbm.react.source.contextVariable("arrayEditor")])},
+                            React.createElement("div", {"className": "flex-row"},
+                                React.createElement("div", {"className": "flex-row-item"},
+                                    React.createElement("div", {"className": "action-button action-button-padding"}, "Add")
+                                )
+                            ),
+                            
+                        )
+                    )
+                ),
+        );
+    }
+}
+

package/react/admin/pageeditors/index.js

@@ -0,0 +1 @@
+export {default as HelpSections} from "./HelpSections.js";

package/react/blocks/faq/AskAQuestion.js

@@ -117,9 +117,11 @@ export default class AskAQuestion extends Dbm.react.BaseObject {
     }
 
     _renderMainElement() {
-        return React.createElement("div", {
-            className: "content-narrow"
-          }, React.createElement("form", {
+
+      let askElement = null;
+      if(!this.context.blockData.skipSearch) {
+        askElement = React.createElement("div", {},
+          React.createElement("form", {
             onSubmit: aEvent => {
               aEvent.preventDefault();
               this._search();
@@ -146,6 +148,11 @@ export default class AskAQuestion extends Dbm.react.BaseObject {
           )
         ),
         React.createElement("div", {className: "spacing small"}),
+        );
+      }
+
+      return React.createElement("div", {className: "content-narrow"},
+        askElement,
         React.createElement(Dbm.react.area.InsertElement, {element: this.item.properties.resultElement})
       );
     }

package/react/blocks/index.js

@@ -1,3 +1,4 @@
+import React from "react";
 import Dbm from "../../index.js";
 import {createElement} from "react";
 
@@ -219,6 +220,10 @@ export let registerAllBlocks = function() {
             createElement(Dbm.react.form.LabelledArea, {label: "Initial sections"}, 
                 createElement(Dbm.react.admin.editor.fields.SelectObjectsField, {objectType: "helpSection", name:"initialSections", "encoding": "title", "nameField": "title"})
             ),
+            createElement(Dbm.react.form.LabelledArea, {label: "Hide ask a question"}, 
+                createElement(Dbm.react.admin.editor.fields.CheckboxField, {"name": "skipSearch"}),
+                "Hide"
+            ),
         );
         registerBlock("faq/askAQuestion", "FAQ / Ask a question", createElement(Dbm.react.blocks.faq.AskAQuestion, {}), editor, {}, {});
     }
@@ -359,4 +364,18 @@ export let registerAllBlocks = function() {
         
         objectTypeEditor.editors = newArray;
     }
+
+
+    let admin = Dbm.getInstance().repository.getItem("admin");
+    admin.requireProperty("pageEditors", []);
+
+    let pageEditors = [].concat(admin.pageEditors);
+
+    {
+        let newEditor = Dbm.getInstance().repository.getItem("admin/pageEditors/helpSections");
+        newEditor.setValue("element", React.createElement(Dbm.react.admin.pageeditors.HelpSections));
+        pageEditors.push(newEditor);
+    }
+
+    admin.pageEditors = pageEditors;
 }

package/tracking/Controller.js

@@ -212,6 +212,30 @@ export default class Controller extends Dbm.core.BaseObject {
         this.trackEvent("Checkout started", data);
     }
 
+    trackAddShipping(aProductOrProducts) {
+        let items = Dbm.utils.ArrayFunctions.singleOrArray(aProductOrProducts);
+
+        let data = {
+            currency: this.item.currency,
+            value: this._getValueFromItems(items),
+            items: items
+        }
+
+        this.trackEvent("Add shipping", data);
+    }
+
+    trackAddPayment(aProductOrProducts) {
+        let items = Dbm.utils.ArrayFunctions.singleOrArray(aProductOrProducts);
+
+        let data = {
+            currency: this.item.currency,
+            value: this._getValueFromItems(items),
+            items: items
+        }
+
+        this.trackEvent("Add payment", data);
+    }
+
     trackPurchase(aTransactionId, aProductOrProducts) {
         let items = Dbm.utils.ArrayFunctions.singleOrArray(aProductOrProducts);
 

package/utils/UrlFunctions.js

@@ -1,4 +1,4 @@
-export let createScaledImageUrl = function(aImageData, aWantedWidth) {
+export let createScaledImageUrlWithPixelDensity = function(aImageData, aWantedWidth, aPixelDensity, aMaxSize) {
     if(!aImageData || !aImageData["url"]) {
         return null;
     }
@@ -10,10 +10,10 @@ export let createScaledImageUrl = function(aImageData, aWantedWidth) {
 
     if(aImageData["resizeUrl"]) {
         let scaleToWidth = Math.min(
-            Math.round(window.devicePixelRatio*aWantedWidth),
+            Math.round(aPixelDensity*aWantedWidth),
             Math.max(
                 100,
-                100*Math.round(window.devicePixelRatio*window.innerWidth/100)
+                100*Math.round(aPixelDensity*aMaxSize/100)
             )
         );
 
@@ -30,7 +30,36 @@ export let createScaledImageUrl = function(aImageData, aWantedWidth) {
     return url;
 }
 
-export let createCoverScaledImageUrl = function(aImageData, aWantedWidth, aWantedHeight) {
+export let createScaledImageUrl = function(aImageData, aWantedWidth) {
+    return createScaledImageUrlWithPixelDensity(aImageData, aWantedWidth, window.devicePixelRatio, window.innerWidth);
+}
+
+export let getCoverScaledImageUrlWithPixelDensity = function(aUrl, aWantedWidth, aWantedHeight, aPixelDensity, aMaxSize) {
+    let scaleToWidth = Math.min(
+        Math.round(aPixelDensity*aWantedWidth),
+        Math.max(
+            100,
+            100*Math.round(aPixelDensity*aMaxSize/100)
+        )
+    );
+
+    let scaleToHeight = Math.round(aWantedHeight*scaleToWidth/aWantedWidth);
+
+    let scaleString = "width=" + scaleToWidth + ",height=" + scaleToHeight + ",fit=cover";
+
+    let format = "webp";
+    if(format) {
+        scaleString += ",format=" + format;
+    }
+
+    return aUrl.split("{scale}").join(scaleString);
+}
+
+export const getCoverScaledImageUrl = function(aUrl, aWantedWidth, aWantedHeight) {
+    return getCoverScaledImageUrlWithPixelDensity(aUrl, aWantedWidth, aWantedHeight, window.devicePixelRatio, window.innerWidth);
+}
+
+export let createCoverScaledImageUrlWithPixelDensity = function(aImageData, aWantedWidth, aWantedHeight, aPixelDensity, aMaxSize) {
     if(!aImageData || !aImageData["url"]) {
         return null;
     }
@@ -41,35 +70,22 @@ export let createCoverScaledImageUrl = function(aImageData, aWantedWidth, aWante
     }
 
     if(aImageData["resizeUrl"]) {
-        let scaleToWidth = Math.min(
-            Math.round(window.devicePixelRatio*aWantedWidth),
-            Math.max(
-                100,
-                100*Math.round(window.devicePixelRatio*window.innerWidth/100)
-            )
-        );
-
-        let scaleToHeight = Math.round(aWantedHeight*scaleToWidth/aWantedWidth);
-
-        let scaleString = "width=" + scaleToWidth + ",height=" + scaleToHeight + ",fit=cover";
-
-        let format = "webp";
-        if(format) {
-            scaleString += ",format=" + format;
-        }
-
-        url = aImageData["resizeUrl"].split("{scale}").join(scaleString);
+        url = getCoverScaledImageUrl(aImageData["resizeUrl"], aWantedWidth, aWantedHeight);
     }
 
     return url;
 }
 
-export const getContainScaledImageUrl = function(aUrl, aWantedWidth, aWantedHeight) {
+export let createCoverScaledImageUrl = function(aImageData, aWantedWidth, aWantedHeight) {
+    return createCoverScaledImageUrlWithPixelDensity(aImageData, aWantedWidth, aWantedHeight, window.devicePixelRatio, window.innerWidth);
+}
+
+export const getContainScaledImageUrlWithPixelDensity = function(aUrl, aWantedWidth, aWantedHeight, aPixelDensity, aMaxSize) {
     let scaleToWidth = Math.min(
-        Math.round(window.devicePixelRatio*aWantedWidth),
+        Math.round(aPixelDensity*aWantedWidth),
         Math.max(
             100,
-            100*Math.round(window.devicePixelRatio*window.innerWidth/100)
+            100*Math.round(aPixelDensity*aMaxSize/100)
         )
     );
 
@@ -85,6 +101,10 @@ export const getContainScaledImageUrl = function(aUrl, aWantedWidth, aWantedHeig
     return aUrl.split("{scale}").join(scaleString);
 }
 
+export const getContainScaledImageUrl = function(aUrl, aWantedWidth, aWantedHeight) {
+    return getContainScaledImageUrlWithPixelDensity(aUrl, aWantedWidth, aWantedHeight, window.devicePixelRatio, window.innerWidth);
+}
+
 export let createContainScaledImageUrl = function(aImageData, aWantedWidth, aWantedHeight) {
     if(!aImageData || !aImageData["url"]) {
         return null;