@webitel/ui-sdk 24.10.83 → 24.10.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webitel/ui-sdk",
-  "version": "24.10.83",
+  "version": "24.10.85",
   "private": false,
   "scripts": {
     "dev": "vite",
@@ -118,6 +118,7 @@
     "deep-equal": "^2.0.3",
     "deepmerge": "^4.3.1",
     "file-saver-es": "^2.0.5",
+    "flat": "^6.0.1",
     "is-valid-domain": "^0.1.6",
     "jszip": "^3.5.0",
     "jszip-utils": "^0.1.0",

package/src/css/styleguide/colors/_colors.scss

@@ -77,7 +77,7 @@
   // primary colors
   --primary-color: var(--amber-accent-3);
   --primary-hover-color: var(--amber-accent-2);
-  --primary-light-color: var(--amber-lighten-4);
+  --primary-light-color: var(--amber-lighten-3);
   --primary-on-color: var(--black);
 
   // secondary colors
@@ -175,7 +175,7 @@
   // primary colors
   --primary-color: var(--amber-darken-2);
   --primary-hover-color: var(--amber-darken-1);
-  --primary-light-color: var(--amber-lighten-4);
+  --primary-light-color: var(--amber-darken-4);
   --primary-on-color: var(--black);
 
   // secondary colors

package/src/modules/CSVExport/XLSExport.js

@@ -1,4 +1,5 @@
 import { saveAs } from 'file-saver-es';
+import { flatten } from 'flat';
 import * as XLSX from 'xlsx';
 import { objSnakeToCamel } from '../../scripts/caseConverters.js';
 
@@ -27,18 +28,6 @@ export default class XLSExport {
     return value;
   }
 
-  // NOTE: creates a new object that only includes the properties specified in the columns array
-  filterDataByColumns(data, columns) {
-    return data.map((item) => {
-      const filteredItem = {};
-      columns.forEach((column) => {
-        const value = item.hasOwnProperty(column) ? this.extractNameFromObject(item[column]) : ''; // '' needed to display column that has no data
-        filteredItem[column] = value;
-      });
-      return filteredItem;
-    });
-  }
-
   // NOTE: calculates the width of the columns based on the data to display it in the EXEL file
   calculateColumnWidths(data, columns) {
     return columns.map((column) => {
@@ -51,9 +40,23 @@ export default class XLSExport {
   }
 
   save(data, columns) {
-    const filteredData = this.filterDataByColumns(data, columns);
-    const ws = XLSX.utils.json_to_sheet(filteredData);
-    const columnWidths = this.calculateColumnWidths(filteredData, columns);
+    const transformedData = data.map(({
+                                        variables,
+                                        ...item
+                                      }) => {
+      const flatVariables = flatten({ variables });
+
+      return columns.reduce((acc, column) => {
+        return {
+          ...acc,
+          [column]: this.extractNameFromObject(item[column]) || flatVariables[column] || '',
+        };
+      }, {});
+    });
+
+
+    const ws = XLSX.utils.json_to_sheet(transformedData);
+    const columnWidths = this.calculateColumnWidths(transformedData, columns);
     ws['!cols'] = columnWidths;
     const wb = XLSX.utils.book_new();
     XLSX.utils.book_append_sheet(wb, ws, 'Sheet1');
@@ -66,7 +69,8 @@ export default class XLSExport {
     let data = [];
     let isNext = false;
     let page = 1;
-    const columns = params._columns || (params?.fields ? objSnakeToCamel(params?.fields) : []);
+    const columns = params._columns ||
+      (params?.fields ? objSnakeToCamel(params?.fields) : []);
 
     do {
       const { items, next } = await this.fetchMethod({