dbm 1.2.0 → 1.2.2

package/react/blocks/index.js

@@ -215,6 +215,15 @@ export let registerAllBlocks = function() {
         registerBlock("content/contentBlock", "Content block", createElement(Dbm.react.blocks.content.ContentBlock, {}), editor, {}, {});
     }
 
+    {
+        let editor = createElement(Dbm.react.admin.editor.EditorBlockName, {},
+            createElement(Dbm.react.form.LabelledArea, {label: "Link list"},
+                createElement(Dbm.react.admin.editor.fields.SelectObjectField, {name: "list", "objectType": "linkList"})
+            )
+        );
+        registerBlock("content/linkList", "Link list", createElement(Dbm.react.blocks.content.LinkList, {}), editor, {}, {});
+    }
+
     {
         let editor = createElement(Dbm.react.admin.editor.EditorBlockName, {},
             createElement(Dbm.react.form.LabelledArea, {label: "Link name"},
@@ -374,17 +383,42 @@ export let registerAllBlocks = function() {
         objectTypeEditor.editors = newArray;
     }
 
+    {
+        let objectTypeEditor = Dbm.getInstance().repository.getItem("admin/objectTypeEditors/group/translationGroup");
+        if(!objectTypeEditor.editors) {
+            objectTypeEditor.setValue("editors", []);
+        }
+
+        let newArray = [].concat(objectTypeEditor.editors);
+        newArray.push(Dbm.getInstance().repository.getItem("admin/itemEditors/name"));
+        
+        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/linkPreviews");
+        newEditor.setValue("element", React.createElement(Dbm.react.admin.pageeditors.LinkPreviews));
+        pageEditors.push(newEditor);
+    }
+
     {
         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;
+
+    {
+        let elementItem = Dbm.getRepositoryItem("linkListCard");
+        elementItem.setValue("element", React.createElement(Dbm.react.blocks.content.LinkListCard));
+    }
 }

package/react/form/Option.js

@@ -0,0 +1,18 @@
+import React from "react";
+import Dbm from "../../index.js";
+
+export default class Option extends Dbm.react.BaseObject {
+    _construct() {
+        super._construct();
+
+        this.getDynamicProp("value", "");
+    }
+
+    _renderMainElement() {
+
+        let value = this.getDynamicProp("value").value;
+
+        return this._createMainElement("option", {"value": value,}, this.getPropValue("children"));
+    }
+}
+

package/react/form/index.js

@@ -9,4 +9,5 @@ export {default as GraphApiImage} from "./GraphApiImage.js";
 export {default as EditArray} from "./EditArray.js";
 export {default as TextArea} from "./TextArea.js";
 export {default as EditObjectProperty} from "./EditObjectProperty.js";
-export {default as Form} from "./Form.js";
+export {default as Form} from "./Form.js";
+export {default as Option} from "./Option.js";

package/react/text/HtmlText.js

@@ -7,7 +7,12 @@ export default class HtmlText extends Dbm.react.BaseObject {
 
     _renderMainElement() {
         
-        let text = "" + this.getPropValue("text");
+        let rawText = this.getPropValue("text");;
+        let text = "";
+
+        if(rawText !== undefined && rawText !== null) {
+            text += rawText;
+        }
 
         return this._createMainElement("span", {"dangerouslySetInnerHTML": {__html: text}});;
     }

package/react/text/NumberDisplay.js

@@ -0,0 +1,30 @@
+import Dbm from "../../index.js";
+
+export default class NumberDisplay extends Dbm.react.BaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    render() {
+        let text = this.getPropValue("number");
+        let number = 1*text;
+
+        if(!isNaN(number)) {
+
+            let offset = this.getPropValueWithDefault("offset", 0);
+            if(offset) {
+                number += offset;
+            }
+            
+
+            if("numberOfDecimals" in this.props) {
+                text = number.toFixed(this.getPropValue("numberOfDecimals"));
+            }
+            else {
+                text = "" + number;
+            }
+        }
+
+        return text;
+    }
+}

package/react/text/OptionalLink.js

@@ -0,0 +1,21 @@
+import Dbm from "../../index.js";
+import React from "react";
+
+export default class OptionalLink extends Dbm.react.BaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    _renderMainElement() {
+
+        let url = this.getPropValue("href");
+        let children = this.getPropValue("children");
+        if(url) {
+            return this._createMainElement(Dbm.react.text.Link, {href: url}, children);
+        }
+        else {
+            return React.createElement(React.Fragment, {}, children);
+        }
+        
+    }
+}

package/react/text/TranslatedText.js

@@ -0,0 +1,25 @@
+import Dbm from "../../index.js";
+
+export default class TranslatedText extends Dbm.react.BaseObject {
+    _constructAfterProps() {
+        super._constructAfterProps();
+
+        let text = this.getPropValue("text");
+        let textId = this.getPropValue("textId");
+        let additionalPath = [];
+        if(!textId) {
+            textId = Dbm.utils.StringFunctions.convertToCamelCase(text);
+        }
+        let path = this.context.translationPath;
+
+        //METODO: split textId into additional path
+
+        let translation = Dbm.flow.updatefunctions.basic.translation(textId, text, path, additionalPath);
+
+        this.item.requireProperty("translatedText", text).connectInput(translation.output.properties.value);
+    }
+
+    _renderMainElement() {
+        return Dbm.react.text.text(this.item.properties.translatedText);
+    }
+}

package/react/text/TranslationGroup.js

@@ -0,0 +1,24 @@
+import React from "react";
+import Dbm from "../../index.js";
+
+export default class TranslationGroup extends Dbm.react.BaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    render() {
+        
+        let translationPath = this.context.translationPath;
+        if(!translationPath) {
+            translationPath = this.getPropValue("path");
+        }
+        else {
+            translationPath += "/" + this.getPropValue("path");
+        }
+
+        let values = {};
+        values["translationPath"] = translationPath;
+
+        return React.createElement(Dbm.react.context.AddContextVariables, {"values": values}, this.getPropValue("children"));
+    }
+}

package/react/text/index.js

@@ -4,17 +4,25 @@ import {createElement} from "react";
 export {default as Text} from "./Text.js";
 export {default as HtmlText} from "./HtmlText.js";
 export {default as Link} from "./Link.js";
+export {default as OptionalLink} from "./OptionalLink.js";
+export {default as NumberDisplay} from "./NumberDisplay.js";
+export {default as TranslatedText} from "./TranslatedText.js";
+export {default as TranslationGroup} from "./TranslationGroup.js";
 
-export let text = function(aText) {
+export const text = function(aText) {
     if(typeof(aText) === "string") {
         return aText;
     }
     return createElement(Dbm.react.text.Text, {text: aText});
 }
 
-export let htmlText = function(aText, aElementType = "span", aAdditionalProps = {}) {
+export const htmlText = function(aText, aElementType = "span", aAdditionalProps = {}) {
     if(typeof(aText) === "string") {
         //return createElement(aElementType, {"dangerouslySetInnerHTML": {__html: aText}});
     }
     return createElement(Dbm.react.text.HtmlText, {text: aText, elementType: aElementType, ...aAdditionalProps});
+}
+
+export const translatedText = function(aText, aTextId) {
+    return createElement(Dbm.react.text.TranslatedText, {text: aText, textId: aTextId});
 }

package/site/SiteDataLoader.js

@@ -4,15 +4,11 @@ export default class SiteDataLoader extends Dbm.core.BaseObject {
     _construct() {
         super._construct();
 
-		this.item.setValue("status", 0);
+		this.item.setValue("status", Dbm.loading.LoadingStatus.NOT_STARTED);
         this.item.setValue("url", null);
 		this.item.setValue("currentPage", null);
-        
-		let urlUpdate = new Dbm.flow.updatefunctions.basic.RunCommand();
-		urlUpdate.input.properties.value.connectInput(this.item.properties.url);
-		urlUpdate.input.command = Dbm.commands.callFunction(this._loadUrl.bind(this), []);
 
-		urlUpdate.output.properties.value.startUpdating();
+		Dbm.flow.addUpdateCommand(this.item.properties.url, Dbm.commands.callFunction(this._loadUrl.bind(this), []));
     }
 
 	_loadUrl() {
@@ -23,19 +19,18 @@ export default class SiteDataLoader extends Dbm.core.BaseObject {
 			let parsedUrl = new URL(url);
 			let pathName = parsedUrl.pathname;
 
-			let pageData = Dbm.getInstance().repository.getItem(pathName);
+			let pageData = Dbm.getRepositoryItem(pathName);
 			pageData.setValue("url", url);
 
-			let graphApi = Dbm.getInstance().repository.getItem("graphApi").controller;
-			let request = graphApi.requestUrl(pathName);
+			let request = Dbm.getGraphApi().requestUrl(pathName);
 
-			this.item.setValue("status", 2);
-			Dbm.flow.addUpdateCommandWhenMatched(request.properties.status, 1, Dbm.commands.callFunction(this._pageDataLoaded.bind(this), [pageData, request]))
+			this.item.setValue("status", Dbm.loading.LoadingStatus.LOADING);
+			Dbm.flow.addUpdateCommandWhenMatched(request.properties.status, Dbm.loading.LoadingStatus.LOADED, Dbm.commands.callFunction(this._pageDataLoaded.bind(this), [pageData, request]))
 
 		}
 		else {
 			this.item.currentPage = null;
-			this.item.setValue("status", 0);
+			this.item.setValue("status", Dbm.loading.LoadingStatus.NOT_STARTED);
 		}
 	}
 
@@ -48,7 +43,7 @@ export default class SiteDataLoader extends Dbm.core.BaseObject {
 
 		if(this.item.url === aPageData.url) {
 			this.item.currentPage = aPageData;
-			this.item.setValue("status", 1);
+			this.item.setValue("status", Dbm.loading.LoadingStatus.LOADED);
 
 		}
 

package/site/index.js

@@ -1,5 +1,7 @@
 import Dbm from "../index.js";
 
+export * as translation from "./translation/index.js";
+
 export {default as SiteNavigation} from "./SiteNavigation.js";
 export {default as SiteDataLoader} from "./SiteDataLoader.js";
 export {default as BrowserUpdater} from "./BrowserUpdater.js";

package/site/translation/TranslationLoader.js

@@ -0,0 +1,59 @@
+import Dbm from "../../index.js";
+
+export default class TranslationLoader extends Dbm.core.BaseObject {
+    _construct() {
+        super._construct();
+
+        this.item.setValue("language", null);
+        this.item.setValue("baseUrl", "/assets/translations/");
+        this.item.setValue("ready", false);
+
+        Dbm.flow.addUpdateCommand(this.item.properties.language, Dbm.commands.callFunction(this._loadTranslation.bind(this), []));
+    }
+
+    _loadTranslation() {
+        console.log("_loadTranslation");
+
+        let language = this.item.language;
+
+        if(language) {
+            if(language.translations) {
+                this._updateTranslationManager();
+            }
+            else {
+                let baseUrl = this.item.baseUrl;
+                
+                let fullUrl = baseUrl + language.code + ".json?version=" + Dbm.getRepositoryItem("site").version;
+
+                let loader = new Dbm.loading.JsonLoader();
+                loader.setUrl(fullUrl);
+                Dbm.flow.addUpdateCommandWhenMatched(loader.item.properties.status, Dbm.loading.LoadingStatus.LOADED, Dbm.commands.callFunction(this._translationLoaded.bind(this), [language, loader]));
+                this.item.ready = false;
+                loader.load();
+            }
+        }
+        else {
+            Dbm.getRepositoryItem("site/translations").setValue("data", {});
+            this.item.ready = true;
+        }
+    }
+
+    _translationLoaded(aLanguage, aLoader) {
+        console.log("_translationLoaded");
+        console.log(aLanguage, aLoader);
+
+        let data = aLoader.item.data;
+        aLanguage.setValue("translations", data);
+
+        if(aLanguage === this.item.language) {
+            this._updateTranslationManager();
+        }
+    }
+
+    _updateTranslationManager() {
+
+        Dbm.getRepositoryItem("site/translations").setValue("data", this.item.language.translations);
+
+        this.item.ready = true;
+    }
+}

package/site/translation/index.js

@@ -0,0 +1,27 @@
+import Dbm from "../../index.js";
+
+export {default as TranslationLoader} from "./TranslationLoader.js";
+
+export const setupTranslationLoader = function(aUrlBase = "/assets/translations/") {
+
+    Dbm.getRepositoryItem("site/translations").requireProperty("data", {});
+
+    let controller = new Dbm.site.translation.TranslationLoader();
+    controller.item.register("site/translationLoader");
+
+    controller.item.setValue("baseUrl", aUrlBase);
+
+    controller.item.properties.language.connectInput(Dbm.getRepositoryItem("site").properties.currentLanguage);
+
+    return controller;
+}
+
+export const getLanguage = function(aLanguageCode) {
+    let item = Dbm.getRepositoryItem("languages/" + aLanguageCode);
+
+    if(!item.code) {
+        item.setValue("code", aLanguageCode);
+    }
+
+    return item;
+}

package/utils/ArrayFunctions.js

@@ -292,6 +292,22 @@ export const getItemIndexByIfExists = function(aArray, aField, aIdentifier) {
     return -1;
 }
 
+export const getItemByIfExists = function(aArray, aField, aIdentifier) {
+    let index = getItemIndexByIfExists(aArray, aField, aIdentifier);
+
+    return (index !== -1) ? aArray[index] : null;
+}
+
+export const getItemBy = function(aArray, aField, aIdentifier) {
+    let index = getItemIndexByIfExists(aArray, aField, aIdentifier);
+
+    if(index === -1) {
+        console.warn("No item found", aArray, aField, aIdentifier);
+    }
+
+    return (index !== -1) ? aArray[index] : null;
+}
+
 export const sum = function(aArray) {
 		
     if(!Array.isArray(aArray)) {

package/utils/CompareFunctions.js

@@ -15,6 +15,14 @@ export const strictEquals = function(aA, aB) {
 	return aA === aB;
 }
 
+export const notEquals = function(aA, aB) {
+	return aA != aB;
+}
+
+export const strictNotEquals = function(aA, aB) {
+	return aA !== aB;
+}
+
 export const arrayContains = function(aA, aB) {
     if(aA && aA.indexOf && aA.indexOf(aB) >= 0) {
         return true
@@ -31,6 +39,14 @@ export const inArray = function(aA, aB) {
 	return false;
 }
 
+export const notEmpty = function(aA, aB) {
+    if(aA && aA.length > 0) {
+        return true
+    }
+
+	return false;
+}
+
 export const fullSetup = function() {
     Dbm.getInstance().repository.getItem("compareFunctions/objectExists").setValue("compare", objectExists);
 
@@ -40,6 +56,14 @@ export const fullSetup = function() {
     Dbm.getInstance().repository.getItem("compareFunctions/===").setValue("compare", strictEquals);
     Dbm.getInstance().repository.getItem("compareFunctions/strictEquals").setValue("compare", strictEquals);
 
+    Dbm.getInstance().repository.getItem("compareFunctions/!=").setValue("compare", notEquals);
+    Dbm.getInstance().repository.getItem("compareFunctions/notEquals").setValue("compare", notEquals);
+
+    Dbm.getInstance().repository.getItem("compareFunctions/!==").setValue("compare", strictNotEquals);
+    Dbm.getInstance().repository.getItem("compareFunctions/strictNotEquals").setValue("compare", strictNotEquals);
+
     Dbm.getInstance().repository.getItem("compareFunctions/arrayContains").setValue("compare", arrayContains);
     Dbm.getInstance().repository.getItem("compareFunctions/inArray").setValue("compare", inArray);
+
+     Dbm.getInstance().repository.getItem("compareFunctions/notEmpty").setValue("compare", notEmpty);
 }

package/utils/StringFunctions.js

@@ -1,4 +1,4 @@
-export let createNiceFileName = function(aFileName) {
+export const createNiceFileName = function(aFileName) {
     let fileName = aFileName.toLowerCase();
 
     fileName = fileName.replace(/[åäã]/gi, 'a');
@@ -11,7 +11,7 @@ export let createNiceFileName = function(aFileName) {
     return fileName;
 }
 
-export let createNiceFilePath = function(aFileName) {
+export const createNiceFilePath = function(aFileName) {
     let fileName = aFileName.toLowerCase();
 
     fileName = fileName.replace(/[åäã]/gi, 'a');
@@ -22,4 +22,19 @@ export let createNiceFilePath = function(aFileName) {
     fileName = fileName.replace(/\-+/gi, '-');
 
     return fileName;
-}
+}
+
+export const convertToCamelCase = function(aText) {
+    let currentArray = aText.split(" ");
+    let currentArrayLength = currentArray.length;
+    let returnText = currentArray[0].toLowerCase();
+    //METODO: handle special characters
+    for(let i = 1; i < currentArrayLength; i++) { //MENOTE: first iteration is done outside of loop
+        let currentString = currentArray[i].toLowerCase();
+        if(currentString.length > 0) {
+            returnText += currentString[0].toUpperCase() + currentString.substring(1, currentString.length);
+        }
+    }
+    
+    return returnText;
+};

package/utils/index.js

@@ -2,4 +2,6 @@ export * as ArrayFunctions from "./ArrayFunctions.js";
 export * as NumberFunctions from "./NumberFunctions.js";
 export * as StringFunctions from "./StringFunctions.js";
 export * as UrlFunctions from "./UrlFunctions.js";
-export * as CompareFunctions from "./CompareFunctions.js";
+export * as CompareFunctions from "./CompareFunctions.js";
+
+export * as thirdparty from "./thirdparty/index.js";

package/utils/thirdparty/index.js

@@ -0,0 +1 @@
+export * as wprrapi from "./wprrapi/index.js";

package/utils/thirdparty/wprrapi/WprrApiParser.js

@@ -0,0 +1,31 @@
+import Dbm from "../../../index.js";
+
+export default class WprrApiParser extends Dbm.core.BaseObject {
+
+    constructor() {
+        super();
+
+        this.items = {};
+    }
+
+    setItems(aItems) {
+        this.items = aItems;
+
+        return this;
+    }
+
+    getItem(aId) {
+        return this.items[aId];
+    }
+
+    getItems(aIds) {
+        let returnArray = [];
+        let currentArray = aIds;
+        let currentArrayLength = currentArray.length;
+        for(let i = 0; i < currentArrayLength; i++) {
+            returnArray.push(this.getItem(currentArray[i]));
+        }
+
+        return returnArray;
+    }
+}

package/utils/thirdparty/wprrapi/index.js

@@ -0,0 +1,3 @@
+import Dbm from "../../../index.js";
+
+export {default as WprrApiParser} from "./WprrApiParser.js";