inviton-powerduck 0.0.86 → 0.0.87

package/common/localized-value-helper.ts

@@ -1,17 +1,19 @@
 import PowerduckState from '../app/powerduck-state';
 import { Language } from './enums/language';
-import LocalizedText from './localized-text';
+import { ILocalizedText } from './localized-text';
 import { isNullOrEmpty } from './utils/is-null-or-empty';
 
-export default class LocalizedValueHelper {
-    static getLocalizedValue(value: LocalizedText): string {
+export default class LocalizedValueHelper {   
+    static getValue(value: ILocalizedText, lang?: Language | string): string {
         if (value == null) {
             return null as any;
         }
 
-        const lang = PowerduckState.getCurrentLanguage();
-        const inLang = value[lang];
+        if (lang == null) {
+            lang = PowerduckState.getCurrentLanguage()
+        }
 
+        const inLang = value[lang];
         if (inLang != null) {
             return inLang;
         }
@@ -42,8 +44,8 @@ export default class LocalizedValueHelper {
         return null as any;
     }
 
-    static validateLocalizedValue(locValArr: LocalizedText): boolean {
-        if (isNullOrEmpty(LocalizedValueHelper.getLocalizedValue(locValArr))) {
+    static validateLocalizedValue(locValArr: ILocalizedText): boolean {
+        if (isNullOrEmpty(LocalizedValueHelper.getValue(locValArr))) {
             return false;
         }
 

package/common/validation.ts

@@ -21,11 +21,11 @@
 } from "@vuelidate/validators";
 import { PowerduckViewModelBase } from "./base-component";
 import { Validation } from "@vuelidate/core";
-import LocalizedStringHelper from "./utils/localized-string";
 import { isNullOrEmpty } from "./utils/is-null-or-empty";
 import { capitalize } from "./utils/capitalize-string";
 import PowerduckState from "../app/powerduck-state";
 import { IValidationSet, ValidationRuleset, ValidationState } from "./static-wrappers/interfaces/validation-interface";
+import LocalizedValueHelper from "./localized-value-helper";
 
 function getFirstUnsattisfiedValidatorName(valProp: Validation): string {
     const errors = valProp?.$errors || [];
@@ -158,7 +158,7 @@ export class ValidationBuilder {
 
     requiredLocalizedString(): ValidationBuilder {
         this._validationArgs.requiredLocalizedString = (value) => {
-            if (value == null || isNullOrEmpty(LocalizedStringHelper.getValue(value, 'sk'))) {
+            if (value == null || isNullOrEmpty(LocalizedValueHelper.getValue(value, 'sk'))) {
                 return false;
             }
 

package/components/input/localized-info-input.tsx

@@ -1,5 +1,5 @@
 import { Prop, toNative } from "vue-facing-decorator";
-import LocalizedText from "../../common/localized-text";
+import { ILocalizedText } from "../../common/localized-text";
 import TsxComponent, { Component } from "../../app/vuetsx";
 import { Language } from "../../common/enums/language";
 import { isNullOrEmpty } from "../../common/utils/is-null-or-empty";
@@ -12,13 +12,13 @@ import { ValidationState } from "../../common/static-wrappers/interfaces/validat
 interface LocalizedInfoInputArgs {
     label: string;
     wrap?: boolean;
-    value: LocalizedText;
+    value: ILocalizedText;
     placeholder?: string;
     subtitle?: string;
     hint?: string;
     displayType?: "input" | "textarea";
     validationState?: ValidationState;
-    changed: (e: LocalizedText) => void;
+    changed: (e: ILocalizedText) => void;
     mandatory?: boolean;
 }
 
@@ -26,19 +26,19 @@ interface LocalizedInfoInputArgs {
 class LocalizedInfoInputComponent extends TsxComponent<LocalizedInfoInputArgs> implements LocalizedInfoInputArgs {
     @Prop() label: string;
     @Prop() wrap?: boolean;
-    @Prop() value: LocalizedText;
+    @Prop() value: ILocalizedText;
     @Prop() placeholder!: string;
     @Prop() subtitle!: string;
     @Prop() hint!: string;
     @Prop() displayType: "input" | "textarea";
-    @Prop() changed: (e: LocalizedText) => void;
+    @Prop() changed: (e: ILocalizedText) => void;
     @Prop() mandatory?: boolean;
 
     getValueForTmrLanguage(lang: Language): string {
         return this.value[lang];
     }
 
-    getValue(value: LocalizedText): LocalizedText {
+    getValue(value: ILocalizedText): ILocalizedText {
         if (value == null) {
             return {
                 cs: null,
@@ -62,13 +62,13 @@ class LocalizedInfoInputComponent extends TsxComponent<LocalizedInfoInputArgs> i
         };
     }
 
-    valueChanged(e: LocalizedText): void {
+    valueChanged(e: ILocalizedText): void {
         if (e == null) {
             this.changed(null);
             return;
         }
 
-        let retObj: LocalizedText = {} as any;
+        let retObj: ILocalizedText = {} as any;
         const addLocalizedValue = (lang: Language, value: string): void => {
             if (!isNullOrEmpty(value)) {
                 retObj[lang] = value;

package/components/input/localized-string-input.tsx

@@ -9,17 +9,17 @@ import { ButtonLayout } from "../button/button-layout";
 import { DropdownButtonItemArgs } from "../dropdown-button/dropdown-button-item";
 import { PortalUtils } from "../../common/utils/utils";
 import { LanguageUtils } from "../../common/utils/language-utils";
-import LocalizedStringHelper from "../../common/utils/localized-string";
 import { Language } from "../../common/enums/language";
 import { isNullOrEmpty } from "../../common/utils/is-null-or-empty";
 import globalIcon from './img/global.png';
 import PowerduckState from "../../app/powerduck-state";
-import LocalizedText from "../../common/localized-text";
+import { ILocalizedText } from "../../common/localized-text";
 import "./css/localized-string-input.css";
+import LocalizedValueHelper from "../../common/localized-value-helper";
 
 interface LocalizedStringInputArgs extends FormItemWrapperArgs {
-    value: LocalizedText;
-    changed: (e: LocalizedText) => void;
+    value: ILocalizedText;
+    changed: (e: ILocalizedText) => void;
     supportedLanguages?: Language[];
     placeholder?: string;
 }
@@ -29,8 +29,8 @@ class LocalizedStringInputComponent extends TsxComponent<LocalizedStringInputArg
     @Prop() label!: string;
     @Prop() labelButtons!: DropdownButtonItemArgs[];
     @Prop() subtitle!: string;
-    @Prop() value!: LocalizedText;
-    @Prop() changed: (e: LocalizedText) => void;
+    @Prop() value!: ILocalizedText;
+    @Prop() changed: (e: ILocalizedText) => void;
     @Prop() supportedLanguages?: Language[];
     @Prop() marginType?: MarginType;
     @Prop() maxWidth?: number;
@@ -45,11 +45,11 @@ class LocalizedStringInputComponent extends TsxComponent<LocalizedStringInputArg
     @Prop() prependIcon: string;
     @Prop() appendClicked: () => void;
     @Prop() prependClicked: () => void;
-    currentValue: LocalizedText = null;
+    currentValue: ILocalizedText = null;
     modalWillShow: boolean = false;
     uuid: string = "lsw-" + PortalUtils.randomString(10);
 
-    raiseChangeEvent(newValue: LocalizedText): void {
+    raiseChangeEvent(newValue: ILocalizedText): void {
         this.populateValidationDeclaration();
 
         if (this.changed != null) {
@@ -60,10 +60,10 @@ class LocalizedStringInputComponent extends TsxComponent<LocalizedStringInputArg
     isAllSame(): boolean {
         if (this.value != null) {
             let langList = LanguageUtils.getLanguageList();
-            let skValue = LocalizedStringHelper.getValue(this.value, Language.sk);
+            let skValue = LocalizedValueHelper.getValue(this.value, Language.sk);
 
             for (let i = 0, len = langList.length; i < len; i++) {
-                if (LocalizedStringHelper.getValue(this.value, langList[i].id) != skValue) {
+                if (LocalizedValueHelper.getValue(this.value, langList[i].id) != skValue) {
                     return false;
                 }
             }
@@ -73,7 +73,7 @@ class LocalizedStringInputComponent extends TsxComponent<LocalizedStringInputArg
     }
 
     hasSomeValue(): boolean {
-        return !isNullOrEmpty(LocalizedStringHelper.getValue(this.value, Language.sk));
+        return !isNullOrEmpty(LocalizedValueHelper.getValue(this.value, Language.sk));
     }
 
     getModalContext(): JQuery {
@@ -117,7 +117,7 @@ class LocalizedStringInputComponent extends TsxComponent<LocalizedStringInputArg
 
                 if (currentVal == null || currentVal.length == 0) {
                     var language: Language = $this.attr("data-inv-lang") as any;
-                    var lsValue = LocalizedStringHelper.getValue(value, language) || "";
+                    var lsValue = LocalizedValueHelper.getValue(value, language) || "";
                     $this.attr("placeholder", lsValue);
                 }
             });
@@ -175,7 +175,7 @@ class LocalizedStringInputComponent extends TsxComponent<LocalizedStringInputArg
         return (
             <div class={PowerduckState.getFormControlCssClass() + "  localized-input"} onClick={(e) => this.showInputModal()}>
                 <img src={globalIcon} />
-                &nbsp;{LocalizedStringHelper.getValue(this.value, Language.sk)}
+                &nbsp;{LocalizedValueHelper.getValue(this.value, Language.sk)}
             </div>
         );
     }
@@ -190,7 +190,7 @@ class LocalizedStringInputComponent extends TsxComponent<LocalizedStringInputArg
 
                     let langValue = this.value[lang.id];
                     let hasValue = !isNullOrEmpty(langValue);
-                    langValue = hasValue ? langValue : LocalizedStringHelper.getValue(this.value, lang.id);
+                    langValue = hasValue ? langValue : LocalizedValueHelper.getValue(this.value, lang.id);
 
                     return (
                         <div class={"localized-input-item" + (hasValue ? "" : " lii-auto")}>
@@ -216,7 +216,7 @@ class LocalizedStringInputComponent extends TsxComponent<LocalizedStringInputArg
 
                                 let langValue = this.currentValue[lang.id];
                                 let hasValue = !isNullOrEmpty(langValue);
-                                langValue = hasValue ? langValue : LocalizedStringHelper.getValue(this.currentValue, lang.id);
+                                langValue = hasValue ? langValue : LocalizedValueHelper.getValue(this.currentValue, lang.id);
 
                                 return (
                                     <div class="row align-items-end lsi-form-group">

package/components/input/localized-string-textarea.tsx

@@ -8,11 +8,11 @@ import TextArea from "./textarea";
 import { LanguageUtils } from "../../common/utils/language-utils";
 import { Language } from "../../common/enums/language";
 import PowerduckState from "../../app/powerduck-state";
-import LocalizedText from "../../common/localized-text";
+import {ILocalizedText} from "../../common/localized-text";
 
 interface LocalizedStringInputArgs extends FormItemWrapperArgs {
-    value: LocalizedText;
-	changed: (e: LocalizedText) => void;
+    value: ILocalizedText;
+	changed: (e: ILocalizedText) => void;
     supportedLanguages?: Language[];
     placeholder?: string;
 }
@@ -22,8 +22,8 @@ class LocalizedStringTextareaComponent extends TsxComponent<LocalizedStringInput
     @Prop() label!: string;
     @Prop() labelButtons!: DropdownButtonItemArgs[];
     @Prop() subtitle!: string;
-	@Prop() value!: LocalizedText;
-	@Prop() changed: (e: LocalizedText) => void;
+	@Prop() value!: ILocalizedText;
+	@Prop() changed: (e: ILocalizedText) => void;
     @Prop() supportedLanguages?: Language[];
     @Prop() marginType?: MarginType;
     @Prop() maxWidth?: number;
@@ -37,9 +37,9 @@ class LocalizedStringTextareaComponent extends TsxComponent<LocalizedStringInput
     @Prop() prependIcon: string;
     @Prop() appendClicked: () => void;
     @Prop() prependClicked: () => void;
-	currentValue: LocalizedText = null;
+	currentValue: ILocalizedText = null;
 
-	raiseChangeEvent (newValue: LocalizedText): void {
+	raiseChangeEvent (newValue: ILocalizedText): void {
         this.populateValidationDeclaration();
 
         if (this.changed != null) {
@@ -52,12 +52,12 @@ class LocalizedStringTextareaComponent extends TsxComponent<LocalizedStringInput
     }
 
     changeValue(lang: Language, newValue: string): void {
-		let value = this.value || ({} as LocalizedText);
+		let value = this.value || ({} as ILocalizedText);
         value[lang] = newValue;
         this.raiseChangeEvent(value);
     }
 
-	getActualValue (lang: Language, value: LocalizedText): string {
+	getActualValue (lang: Language, value: ILocalizedText): string {
         if (value == null) {
             return null;
         }

package/components/input/localized-string-wysiwyg.tsx

@@ -5,14 +5,14 @@ import Tabs, { TabsRenderMode } from "../tabs/tabs";
 import { TabPage } from "../tabs/tab-page";
 import { DropdownButtonItemArgs } from "../dropdown-button/dropdown-button-item";
 import WysiwigEditor from "./wysiwig";
-import LocalizedText from "../../common/localized-text";
+import {ILocalizedText} from "../../common/localized-text";
 import { LanguageUtils } from "../../common/utils/language-utils";
 import { Language } from "../../common/enums/language";
 import PowerduckState from "../../app/powerduck-state";
 
 interface LocalizedStringInputArgs extends FormItemWrapperArgs {
-    value: LocalizedText;
-    changed: (e: LocalizedText) => void;
+    value: ILocalizedText;
+    changed: (e: ILocalizedText) => void;
     supportedLanguages?: Language[];
     placeholder?: string;
     resizable?: boolean
@@ -23,8 +23,8 @@ class LocalizedStringWysiwigComponent extends TsxComponent<LocalizedStringInputA
     @Prop() label!: string;
     @Prop() labelButtons!: DropdownButtonItemArgs[];
     @Prop() subtitle!: string;
-    @Prop() value!: LocalizedText;
-    @Prop() changed: (e: LocalizedText) => void;
+    @Prop() value!: ILocalizedText;
+    @Prop() changed: (e: ILocalizedText) => void;
     @Prop() supportedLanguages?: Language[];
     @Prop() marginType?: MarginType;
     @Prop() maxWidth?: number;
@@ -38,9 +38,9 @@ class LocalizedStringWysiwigComponent extends TsxComponent<LocalizedStringInputA
     @Prop() prependIcon: string;
     @Prop() appendClicked: () => void;
     @Prop() prependClicked: () => void;
-    currentValue: LocalizedText = null;
+    currentValue: ILocalizedText = null;
 
-    raiseChangeEvent(newValue: LocalizedText): void {
+    raiseChangeEvent(newValue: ILocalizedText): void {
         this.populateValidationDeclaration();
 
         if (this.changed != null) {
@@ -53,12 +53,12 @@ class LocalizedStringWysiwigComponent extends TsxComponent<LocalizedStringInputA
     }
 
     changeValue(lang: Language, newValue: string): void {
-        let value = this.value || ({} as LocalizedText);
+        let value = this.value || ({} as ILocalizedText);
         value[lang] = newValue;
         this.raiseChangeEvent(value);
     }
 
-    getActualValue(lang: Language, value: LocalizedText): string {
+    getActualValue(lang: Language, value: ILocalizedText): string {
         if (value == null) {
             return null;
         }

package/components/input/localized-url-input.tsx

@@ -13,16 +13,16 @@ import FlexFormItem from "../form/form-item-flex";
 import { FileManagerDialog, FileManagerModalFileType } from "../modal/ts/file-manager-dialog";
 import { PortalUtils } from "../../common/utils/utils";
 import { LanguageUtils } from "../../common/utils/language-utils";
-import LocalizedStringHelper from "../../common/utils/localized-string";
 import { Language } from "../../common/enums/language";
 import { isNullOrEmpty } from "../../common/utils/is-null-or-empty";
 import globalIcon from './img/global.png';
 import PowerduckState from "../../app/powerduck-state";
-import LocalizedText from "../../common/localized-text";
+import {ILocalizedText} from "../../common/localized-text";
+import LocalizedValueHelper from "../../common/localized-value-helper";
 
 interface LocalizedUrlInputArgs extends FormItemWrapperArgs {
-    value: LocalizedText;
-	changed: (e: LocalizedText) => void;
+    value: ILocalizedText;
+	changed: (e: ILocalizedText) => void;
     supportedLanguages?: Language[];
     placeholder?: string;
 }
@@ -32,8 +32,8 @@ class LocalizedUrlInputComponent extends TsxComponent<LocalizedUrlInputArgs> imp
     @Prop() label!: string;
     @Prop() labelButtons!: DropdownButtonItemArgs[];
     @Prop() subtitle!: string;
-	@Prop() value!: LocalizedText;
-	@Prop() changed: (e: LocalizedText) => void;
+	@Prop() value!: ILocalizedText;
+	@Prop() changed: (e: ILocalizedText) => void;
     @Prop() supportedLanguages?: Language[];
     @Prop() marginType?: MarginType;
     @Prop() maxWidth?: number;
@@ -47,12 +47,12 @@ class LocalizedUrlInputComponent extends TsxComponent<LocalizedUrlInputArgs> imp
     @Prop() prependIcon: string;
     @Prop() appendClicked: () => void;
     @Prop() prependClicked: () => void;
-	currentValue: LocalizedText = null;
+	currentValue: ILocalizedText = null;
     modalWillShow: boolean = false;
     isModal: boolean = false;
     uuid: string = "lsw-" + PortalUtils.randomString(10);
 
-	raiseChangeEvent (newValue: LocalizedText): void {
+	raiseChangeEvent (newValue: ILocalizedText): void {
         this.populateValidationDeclaration();
 
         if (this.changed != null) {
@@ -63,10 +63,10 @@ class LocalizedUrlInputComponent extends TsxComponent<LocalizedUrlInputArgs> imp
     isAllSame(): boolean {
         if (this.value != null) {
             let langList = LanguageUtils.getLanguageList();
-            let skValue = LocalizedStringHelper.getValue(this.value, Language.sk);
+            let skValue = LocalizedValueHelper.getValue(this.value, Language.sk);
 
             for (let i = 0, len = langList.length; i < len; i++) {
-                if (LocalizedStringHelper.getValue(this.value, langList[i].id) != skValue) {
+                if (LocalizedValueHelper.getValue(this.value, langList[i].id) != skValue) {
                     return false;
                 }
             }
@@ -76,7 +76,7 @@ class LocalizedUrlInputComponent extends TsxComponent<LocalizedUrlInputArgs> imp
     }
 
     hasSomeValue(): boolean {
-        return !isNullOrEmpty(LocalizedStringHelper.getValue(this.value, Language.sk));
+        return !isNullOrEmpty(LocalizedValueHelper.getValue(this.value, Language.sk));
     }
 
     getModalContext(): JQuery {
@@ -133,7 +133,7 @@ class LocalizedUrlInputComponent extends TsxComponent<LocalizedUrlInputArgs> imp
 
                 if (currentVal == null || currentVal.length == 0) {
                     var language: Language = $this.attr("data-inv-lang") as any;
-                    var lsValue = LocalizedStringHelper.getValue(value, language) || "";
+                    var lsValue = LocalizedValueHelper.getValue(value, language) || "";
                     $this.attr("placeholder", lsValue);
                 }
             });
@@ -207,7 +207,7 @@ class LocalizedUrlInputComponent extends TsxComponent<LocalizedUrlInputArgs> imp
     }
 
     renderInputGlobalValue(h) {
-        let langValue = LocalizedStringHelper.getValue(this.value, Language.sk);
+        let langValue = LocalizedValueHelper.getValue(this.value, Language.sk);
         return (
             <FlexContainer cssClass={"mb-1"} fullWidthOnMobile={false}>
                 <FlexFormItem flexFill={true}>
@@ -255,7 +255,7 @@ class LocalizedUrlInputComponent extends TsxComponent<LocalizedUrlInputArgs> imp
 
                     let langValue = this.value[lang.id];
                     let hasValue = !isNullOrEmpty(langValue);
-                    langValue = hasValue ? langValue : LocalizedStringHelper.getValue(this.value, lang.id);
+                    langValue = hasValue ? langValue : LocalizedValueHelper.getValue(this.value, lang.id);
 
                     return (
                         <div class={"localized-input-item" + (hasValue ? "" : " lii-auto")}>
@@ -281,7 +281,7 @@ class LocalizedUrlInputComponent extends TsxComponent<LocalizedUrlInputArgs> imp
 
                                 let langValue = this.currentValue[lang.id];
                                 let hasValue = !isNullOrEmpty(langValue);
-                                langValue = hasValue ? langValue : LocalizedStringHelper.getValue(this.currentValue, lang.id);
+                                langValue = hasValue ? langValue : LocalizedValueHelper.getValue(this.currentValue, lang.id);
 
                                 return (
                                     <FlexContainer cssClass={"mb-1"} fullWidthOnMobile={false}>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inviton-powerduck",
-  "version": "0.0.86",
+  "version": "0.0.87",
   "type": "module",
   "scripts": {
     "build": " vite build && vue-tsc  --declaration --emitDeclarationOnly",

package/common/utils/localized-string.ts

@@ -1,83 +0,0 @@
-import { Language } from "../enums/language";
-import LocalizedText, { ILocalizedText } from "../localized-text";
-import { isNullOrEmpty } from "./is-null-or-empty";
-import { LanguageUtils } from "./language-utils";
-
-export interface ILocalizedString {
-    Slovak: string;
-    English: string;
-    Czech: string;
-    German: string;
-    Latvian: string;
-    Polish: string;
-    Italian: string;
-    Hungarian: string;
-}
-
-function getValueForPair(localizedString: any, langCode: string, lang: Language): string {
-    return localizedString[langCode] || localizedString[lang];
-}
-
-export default class LocalizedStringHelper {
-    static getValue(value: ILocalizedString | ILocalizedText, lang: Language | string) {
-        if (value == null) {
-            return null;
-        }
-
-        if (lang == Language.sk) {
-            const skVal = getValueForPair(value, 'sk', Language.sk);
-            if (!isNullOrEmpty(skVal)) {
-                return skVal;
-            }
-
-            const csVal = getValueForPair(value, 'cs', Language.cs);
-            if (!isNullOrEmpty(csVal)) {
-                return csVal;
-            }
-        } else if (lang == Language.cs) {
-            const csVal = getValueForPair(value, 'cs', Language.cs);
-            if (!isNullOrEmpty(csVal)) {
-                return csVal;
-            }
-
-            const skVal = getValueForPair(value, 'sk', Language.sk);
-            if (!isNullOrEmpty(skVal)) {
-                return skVal;
-            }
-        } else if (lang == Language.de) {
-            const val = getValueForPair(value, 'de', Language.de);
-            if (!isNullOrEmpty(val)) {
-                return val;
-            }
-        } else if (lang == Language.pl) {
-            const val = getValueForPair(value, 'pl', Language.pl);
-            if (!isNullOrEmpty(val)) {
-                return val;
-            }
-        } else if (lang == Language.it) {
-            const val = getValueForPair(value, 'it', Language.it);
-            if (!isNullOrEmpty(val)) {
-                return val;
-            }
-        } else if (lang == Language.hu) {
-            const val = getValueForPair(value, 'hu', Language.hu);
-            if (!isNullOrEmpty(val)) {
-                return val;
-            }
-        }
-
-        const lastTry = getValueForPair(value, 'sk', Language.sk);
-        if (!isNullOrEmpty(lastTry)) {
-            return lastTry;
-        }
-
-        for (const propName in value) {
-            const text = (value as any)[propName];
-            if (text != null && text.toString().length > 0) {
-                return text;
-            }
-        }
-
-        return null;
-    }
-}

package/common/utils/localized-text-util.ts

@@ -1,36 +0,0 @@
-import LocalizedText from './../localized-text';
-import { Language } from './../enums/language';
-
-export default class LocalizedTextUtil {
-    static getLocalizedTextValue(value: LocalizedText, langKey: string | Language): string {
-        if (value == null) {
-            return null as any;
-        }
-
-        let retVal = (value as any)[langKey];
-        if (retVal == null) {
-            if (langKey == "sk") {
-                retVal = value.cs;
-            } else if (langKey == "cs") {
-                retVal = value.sk;
-            } else {
-                retVal = value.en;
-            }
-        }
-
-        if (retVal == null) {
-            if (value.sk != null) {
-                return value.sk;
-            }
-
-            for (const propName in value) {
-                const text = (value as any)[propName];
-                if (text != null && text.toString().length > 0) {
-                    return text;
-                }
-            }
-        }
-
-        return retVal || value.sk;
-    }
-}