aloha-vue 2.67.0 → 2.69.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aloha-vue",
-  "version": "2.67.0",
+  "version": "2.69.0",
   "description": "Aloha-vue is a JavaScript library that provides a wide range of accessible components and directives for Vue.js. Accessibility is of paramount importance to us, and we have designed all our components to meet accessibility compliance criteria. This library is a valuable tool for frontend developers and has already been used in three projects, including two large-scale ones",
   "keywords": [
     "accessibility compliance criteria",

package/src/ATableForm/ATableFormCell/ATableFormCell.js

@@ -161,8 +161,16 @@ export default {
     } = this.formElementLocal;
 
     const slotProps = {
+      change: this.updateRowData,
       column: this.column,
       columnIndex: this.columnIndex,
+      errorIcon: this.errorIcon,
+      errors: this.errors,
+      id: this.id,
+      isCreateMode: this.isCreateMode,
+      isEditMode: this.isEditMode,
+      isFooter: this.isFooter,
+      modelValue: get(this.rowDataLocal, this.column.id),
       row: this.row,
       rowIndex: this.rowIndex,
       rows: this.rows,

package/src/ui/ACheckbox/ACheckbox.js

@@ -88,12 +88,17 @@ export default {
       required: false,
       default: undefined,
     },
-    dataExtra: {
-      type: Array,
-      required: false,
-      default: () => [],
-    },
-    dependencies: {
+    dataExtra: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
+    mergeData: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+    dependencies: {
       type: [Array, Object],
       required: false,
       default: undefined,

package/src/ui/AInputCurrency/AInputCurrency.js

@@ -353,9 +353,10 @@ export default {
     } = VerifyAPI(props);
 
     const {
-      clearModel,
-      displayValue,
-      initLocalVars,
+      clearModel,
+      displayValue,
+      displayValueReadonly,
+      initLocalVars,
       isInternalChange,
       localModel,
       modelNumber,
@@ -415,9 +416,10 @@ export default {
       attributesToExcludeFromRender,
       clearModel,
       componentStyleHide,
-      decrease,
-      displayValue,
-      errorsId,
+      decrease,
+      displayValue,
+      displayValueReadonly,
+      errorsId,
       hasErrorIcon,
       handleInput,
       handleKeydown,
@@ -452,7 +454,7 @@ export default {
         label: this.label,
         labelClass: this.labelClass,
         labelScreenReader: this.labelScreenReader,
-        modelValue: this.displayValue,
+        modelValue: this.displayValueReadonly,
         readonlyDefault: this.readonlyDefault,
         required: this.required,
         style: this.componentStyleHide,

package/src/ui/AInputCurrency/__tests__/AInputCurrency.ModelAPI.test.js

@@ -0,0 +1,73 @@
+import {
+  reactive,
+} from "vue";
+import {
+  describe,
+  expect,
+  it,
+} from "@jest/globals";
+
+import ModelAPI from "../compositionAPI/ModelAPI";
+
+const getModelAPI = () => {
+  const props = reactive({
+    currencySymbol: "€",
+    currencySymbolPosition: "right",
+    decimalDivider: ",",
+    decimalPartLength: 2,
+    disabled: false,
+    modelType: "number",
+    modelUndefined: undefined,
+    modelValue: 1234.5,
+    required: false,
+    skipRequiredModelInit: false,
+    thousandDivider: ".",
+  });
+  const modelAPI = ModelAPI(props, {
+    adjustFloatPartAndDivider: () => "1.234,50",
+  });
+
+  modelAPI.initLocalVars();
+
+  return {
+    modelAPI,
+    props,
+  };
+};
+
+describe("AInputCurrency ModelAPI", () => {
+  it("adds the currency symbol to the readonly display value at the configured position", () => {
+    const {
+      modelAPI,
+      props,
+    } = getModelAPI();
+
+    expect(modelAPI.displayValueReadonly.value).toBe("1.234,50 €");
+
+    props.currencySymbol = "$";
+    props.currencySymbolPosition = "left";
+
+    expect(modelAPI.displayValueReadonly.value).toBe("$ 1.234,50");
+  });
+
+  it("does not add the currency symbol to an empty readonly display value", () => {
+    const {
+      modelAPI,
+    } = getModelAPI();
+
+    modelAPI.displayValue.value = "";
+
+    expect(modelAPI.displayValueReadonly.value).toBe("");
+  });
+
+  it("keeps the readonly display value unchanged when the currency symbol is empty", () => {
+    const {
+      modelAPI,
+      props,
+    } = getModelAPI();
+
+    props.currencySymbol = "";
+
+    expect(modelAPI.displayValueReadonly.value).toBe("1.234,50");
+  });
+});

package/src/ui/AInputCurrency/compositionAPI/ModelAPI.js

@@ -13,20 +13,32 @@ export default function ModelAPI(props, {
   adjustFloatPartAndDivider = () => {},
   changeModel = () => {},
 }) {
-  const required = toRef(props, "required");
-  const modelValue = toRef(props, "modelValue");
+  const currencySymbol = toRef(props, "currencySymbol");
+  const currencySymbolPosition = toRef(props, "currencySymbolPosition");
+  const decimalDivider = toRef(props, "decimalDivider");
+  const decimalPartLength = toRef(props, "decimalPartLength");
+  const disabled = toRef(props, "disabled");
   const modelType = toRef(props, "modelType");
   const modelUndefined = toRef(props, "modelUndefined");
+  const modelValue = toRef(props, "modelValue");
+  const required = toRef(props, "required");
   const skipRequiredModelInit = toRef(props, "skipRequiredModelInit");
-  const decimalDivider = toRef(props, "decimalDivider");
-  const disabled = toRef(props, "disabled");
-  const decimalPartLength = toRef(props, "decimalPartLength");
   const thousandDivider = toRef(props, "thousandDivider");
 
   const displayValue = ref(undefined);
   const isInternalChange = ref(false);
   const localModel = ref(undefined);
 
+  const displayValueReadonly = computed(() => {
+    if (isNil(displayValue.value) || displayValue.value === "" || !currencySymbol.value) {
+      return displayValue.value;
+    }
+
+    return currencySymbolPosition.value === "left" ?
+      `${ currencySymbol.value } ${ displayValue.value }` :
+      `${ displayValue.value } ${ currencySymbol.value }`;
+  });
+
   const initLocalVars = () => {
     displayValue.value = adjustFloatPartAndDivider(modelValue.value);
     localModel.value = modelValue.value;
@@ -78,6 +90,7 @@ export default function ModelAPI(props, {
   return {
     clearModel,
     displayValue,
+    displayValueReadonly,
     initLocalVars,
     isInternalChange,
     localModel,

package/src/ui/AMultiselectOrdered/AMultiselectOrdered.js

@@ -119,12 +119,17 @@ export default {
       required: false,
       default: undefined,
     },
-    dataExtra: {
-      type: Array,
-      required: false,
-      default: () => [],
-    },
-    dependencies: {
+    dataExtra: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
+    mergeData: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+    dependencies: {
       type: [Array, Object],
       required: false,
       default: undefined,

package/src/ui/ARadio/ARadio.js

@@ -88,12 +88,17 @@ export default {
       required: false,
       default: undefined,
     },
-    dataExtra: {
-      type: Array,
-      required: false,
-      default: () => [],
-    },
-    dependencies: {
+    dataExtra: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
+    mergeData: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+    dependencies: {
       type: [Array, Object],
       required: false,
       default: undefined,

package/src/ui/ASelect/ASelect.js

@@ -122,12 +122,17 @@ export default {
       required: false,
       default: undefined,
     },
-    dataExtra: {
-      type: Array,
-      required: false,
-      default: () => ASelectPluginOptions.propsDefault.dataExtra,
-    },
-    dependencies: {
+    dataExtra: {
+      type: Array,
+      required: false,
+      default: () => ASelectPluginOptions.propsDefault.dataExtra,
+    },
+    mergeData: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+    dependencies: {
       type: [Array, Object],
       required: false,
       default: undefined,

package/src/ui/compositionApi/UiDataWithKeyIdAndLabelAPI.js

@@ -31,9 +31,10 @@ export default function UiDataWithKeyIdAndLabelAPI(props) {
   const data = toRef(props, "data");
   const dataExtra = toRef(props, "dataExtra");
   const isDataSimpleArray = toRef(props, "isDataSimpleArray");
-  const keyId = toRef(props, "keyId");
-  const keyLabel = toRef(props, "keyLabel");
-  const keyLabelCallback = toRef(props, "keyLabelCallback");
+  const keyId = toRef(props, "keyId");
+  const keyLabel = toRef(props, "keyLabel");
+  const keyLabelCallback = toRef(props, "keyLabelCallback");
+  const mergeData = toRef(props, "mergeData");
   const searchTextInHtml = toRef(props, "searchTextInHtml");
   const translateData = toRef(props, "translateData");
 
@@ -156,7 +157,14 @@ export default function UiDataWithKeyIdAndLabelAPI(props) {
     let DATA_LOCAL = data.value || [];
 
     if (dataFromServer.value.length) {
-      DATA_LOCAL = dataFromServer.value;
+      if (mergeData.value) {
+        DATA_LOCAL = uniqBy([
+          ...dataFromServer.value,
+          ...DATA_LOCAL,
+        ], item => get(item, keyId.value, item));
+      } else {
+        DATA_LOCAL = dataFromServer.value;
+      }
     }
 
     if (!dataFromRetrieve.value.length) {

package/src/ui/compositionApi/__tests__/UiDataWithKeyIdAndLabelAPI.test.js

@@ -0,0 +1,128 @@
+import {
+  createApp,
+  defineComponent,
+} from "vue";
+import {
+  describe,
+  expect,
+  it,
+  jest,
+} from "@jest/globals";
+
+import UiDataWithKeyIdAndLabelAPI from "../UiDataWithKeyIdAndLabelAPI";
+
+import {
+  AKeyId,
+  AKeyLabel,
+} from "../../../const/AKeys";
+
+jest.mock("../../../index", () => ({
+  AKeyId: "_a_id",
+  AKeyLabel: "_a_label",
+  AKeyLabelSearch: "_a_label_search",
+  extractTextFromHtml: value => value,
+  getTranslatedText: ({ placeholder }) => placeholder,
+  isArrayOfArrays: value => Array.isArray(value) && value.every(Array.isArray),
+  isPlaceholderTranslate: () => false,
+}));
+
+const createProps = ({
+  data,
+  isDataSimpleArray = false,
+  mergeData = false,
+}) => ({
+  alwaysTranslate: false,
+  data,
+  dataExtra: [],
+  isDataSimpleArray,
+  keyId: "id",
+  keyLabel: "label",
+  keyLabelCallback: undefined,
+  mergeData,
+  searchTextInHtml: false,
+  translateData: false,
+});
+
+const useDataAPI = props => {
+  let result;
+  const app = createApp(defineComponent({
+    name: "TestUiDataWithKeyIdAndLabelAPI",
+    setup() {
+      result = UiDataWithKeyIdAndLabelAPI(props);
+      return () => null;
+    },
+  }));
+
+  app.mount(document.createElement("div"));
+  return result;
+};
+
+describe("UiDataWithKeyIdAndLabelAPI", () => {
+  it("keeps replacing prop data with internally loaded data by default", () => {
+    const {
+      dataFromServer,
+      dataLocal,
+    } = useDataAPI(createProps({
+      data: [
+        { id: 1, label: "Prop one" },
+        { id: 3, label: "Prop three" },
+      ],
+    }));
+
+    dataFromServer.value = [
+      { id: 1, label: "Internal one" },
+      { id: 2, label: "Internal two" },
+    ];
+
+    expect(dataLocal.value.map(item => item[AKeyLabel])).toEqual([
+      "Internal one",
+      "Internal two",
+    ]);
+  });
+
+  it("merges prop and internally loaded data by ID with internal items taking precedence", () => {
+    const {
+      dataFromServer,
+      dataLocal,
+    } = useDataAPI(createProps({
+      data: [
+        { id: 1, label: "Prop one" },
+        { id: 3, label: "Prop three" },
+      ],
+      mergeData: true,
+    }));
+
+    dataFromServer.value = [
+      { id: 1, label: "Internal one" },
+      { id: 2, label: "Internal two" },
+    ];
+
+    expect(dataLocal.value.map(item => ({
+      id: item[AKeyId],
+      label: item[AKeyLabel],
+    }))).toEqual([
+      { id: 1, label: "Internal one" },
+      { id: 2, label: "Internal two" },
+      { id: 3, label: "Prop three" },
+    ]);
+  });
+
+  it("merges simple arrays by their values", () => {
+    const {
+      dataFromServer,
+      dataLocal,
+    } = useDataAPI(createProps({
+      data: ["one", "three"],
+      isDataSimpleArray: true,
+      mergeData: true,
+    }));
+
+    dataFromServer.value = ["one", "two"];
+
+    expect(dataLocal.value.map(item => item[AKeyId])).toEqual([
+      "one",
+      "two",
+      "three",
+    ]);
+  });
+});