@sme.up/ketchup 5.0.0 → 5.1.1

package/dist/collection/components/kup-card/built-in/kup-card-column-drop-menu.js

@@ -44,16 +44,16 @@ function prepareList(options) {
   const listData = [];
   if (options.enableMerge) {
     listData.push({
-      text: dom.ketchup.language.translate(KupLanguageGeneric.MERGE),
-      value: KupLanguageGeneric.MERGE,
       icon: 'library_add',
+      id: KupLanguageGeneric.MERGE,
+      value: dom.ketchup.language.translate(KupLanguageGeneric.MERGE),
     });
   }
   if (options.enableMove) {
     listData.push({
-      text: dom.ketchup.language.translate(KupLanguageGeneric.MOVE),
-      value: KupLanguageGeneric.MOVE,
       icon: 'swap_horiz',
+      id: KupLanguageGeneric.MOVE,
+      value: dom.ketchup.language.translate(KupLanguageGeneric.MOVE),
     });
   }
   return listData.length > 0 ? (h("kup-list", { data: listData, showIcons: true, "onkup-list-click": (e) => listClick(e, options) })) : null;
@@ -64,29 +64,29 @@ function prepareCombobox(options, numericalColumnsExist) {
     dom.ketchup.objects.isNumber(options.starterColumn.obj);
   if (numeric) {
     comboListData.push({
-      text: dom.ketchup.language.translate(KupLanguageTotals.AVERAGE),
-      value: KupLanguageTotals.AVERAGE,
+      id: KupLanguageTotals.AVERAGE,
+      value: dom.ketchup.language.translate(KupLanguageTotals.AVERAGE),
     }, {
-      text: dom.ketchup.language.translate(KupLanguageTotals.DIFFERENCE),
-      value: KupLanguageTotals.DIFFERENCE,
+      id: KupLanguageTotals.DIFFERENCE,
+      value: dom.ketchup.language.translate(KupLanguageTotals.DIFFERENCE),
     }, {
-      text: dom.ketchup.language.translate(KupLanguageTotals.PRODUCT),
-      value: KupLanguageTotals.PRODUCT,
+      id: KupLanguageTotals.PRODUCT,
+      value: dom.ketchup.language.translate(KupLanguageTotals.PRODUCT),
     }, {
-      text: dom.ketchup.language.translate(KupLanguageTotals.SUM),
-      value: KupLanguageTotals.SUM,
+      id: KupLanguageTotals.SUM,
+      value: dom.ketchup.language.translate(KupLanguageTotals.SUM),
     }, {
-      text: `[${options.starterColumn.name}] / [${options.receivingColumn.name}] * 100`,
-      value: `([${options.starterColumn.name}]/[${options.receivingColumn.name}])*100`,
+      id: `([${options.starterColumn.name}]/[${options.receivingColumn.name}])*100`,
+      value: `[${options.starterColumn.name}] / [${options.receivingColumn.name}] * 100`,
     }, {
-      text: `[${options.receivingColumn.name}] / [${options.starterColumn.name}] * 100`,
-      value: `([${options.receivingColumn.name}]/[${options.starterColumn.name}])*100`,
+      id: `([${options.receivingColumn.name}]/[${options.starterColumn.name}])*100`,
+      value: `[${options.receivingColumn.name}] / [${options.starterColumn.name}] * 100`,
     });
   }
   else {
     comboListData.push({
-      text: dom.ketchup.language.translate(KupLanguageColumn.NO_FORMULA),
-      value: KupLanguageColumn.NO_FORMULA,
+      id: KupLanguageColumn.NO_FORMULA,
+      value: dom.ketchup.language.translate(KupLanguageColumn.NO_FORMULA),
     });
   }
   const comboData = {
@@ -119,8 +119,7 @@ function typeColumn(e, component) {
   });
 }
 function listClick(e, options) {
-  const value = e.detail.selected.value;
-  switch (value) {
+  switch (e.detail.selected.id) {
     case KupLanguageGeneric.MERGE:
       if (options.mergeCb) {
         options.mergeCb();
@@ -139,7 +138,7 @@ async function applyFormula(component) {
   if (combobox) {
     const value = (await combobox.getValue());
     if (premadeFormulas.includes(value)) {
-      dom.ketchup.data.datasetOperations.column.new(options.data, KupDataNewColumnTypes.MATH, {
+      dom.ketchup.data.column.new(options.data, KupDataNewColumnTypes.MATH, {
         columns: [
           options.receivingColumn.name,
           options.starterColumn.name,
@@ -151,7 +150,7 @@ async function applyFormula(component) {
       }
     }
     else {
-      const result = dom.ketchup.data.datasetOperations.column.new(options.data, KupDataNewColumnTypes.MATH, {
+      const result = dom.ketchup.data.column.new(options.data, KupDataNewColumnTypes.MATH, {
         operation: value,
       });
       if (typeof result === 'string' || result instanceof String) {

package/dist/collection/components/kup-card/kup-card.js

@@ -83,7 +83,7 @@ export class KupCard {
     this.scalingActive = false;
     this.componentWrapper = null;
     this.colorPicker = null;
-    this.firstColorPickerChange = null;
+    this.firstColorPickerChange = true;
   }
   onKupClick(id, value) {
     this.kupClick.emit({
@@ -256,7 +256,6 @@ export class KupCard {
           const color = colorPickerOptions
             ? colorPickerOptions.initialValue
             : null;
-          this.firstColorPickerChange = true;
           if (!this.colorPicker) {
             this.colorPicker = new Picker({
               alpha: false,

package/dist/collection/components/kup-chip/kup-chip.js

@@ -46,7 +46,7 @@ export class KupChip {
     const isChoice = this.type.toLowerCase() === FChipType.CHOICE;
     const isFilter = this.type.toLowerCase() === FChipType.FILTER;
     if (isChoice) {
-      this.kupManager.data.datasetOperations.node.setProperties(this.data, { checked: false }, true, [chip]);
+      this.kupManager.data.node.setProperties(this.data, { checked: false }, true, [chip]);
     }
     if (isChoice || isFilter) {
       chip.checked = chip.checked ? false : true;
@@ -69,7 +69,7 @@ export class KupChip {
     this.kupIconClick.emit({
       comp: this,
       id: this.rootElement.id,
-      chip: this.kupManager.data.datasetOperations.node.remove(this.data, chip),
+      chip: this.kupManager.data.node.remove(this.data, chip),
     });
     this.refresh();
   }
@@ -83,7 +83,7 @@ export class KupChip {
     if (newData.columns) {
       this.kupManager.debug.logMessage(this, 'Detected KupDataDataset: converting rows to nodes.', KupDebugCategory.WARNING);
       const data = this.data;
-      this.data = this.kupManager.data.datasetOperations.row.toNode(data);
+      this.data = this.kupManager.data.row.toNode(data);
     }
   }
   /*-------------------------------------------------*/
@@ -176,7 +176,7 @@ export class KupChip {
       props.onExpansionClick.push((chip, e) => {
         chip.isExpanded = !chip.isExpanded ? true : false;
         if (e.ctrlKey && chip.children && chip.children.length > 0) {
-          this.kupManager.data.datasetOperations.node.setProperties(chip.children, { isExpanded: chip.isExpanded }, true);
+          this.kupManager.data.node.setProperties(chip.children, { isExpanded: chip.isExpanded }, true);
         }
         this.refresh();
       });

package/dist/collection/components/kup-combobox/kup-combobox.js

@@ -146,7 +146,7 @@ export class KupCombobox {
     });
   }
   onKupItemClick(e) {
-    this.onKupChange(e.detail.selected.value);
+    this.onKupChange(e.detail.selected.id);
     __classPrivateFieldGet(this, _KupCombobox_instances, "m", _KupCombobox_closeList).call(this);
     if (__classPrivateFieldGet(this, _KupCombobox_textfieldEl, "f")) {
       __classPrivateFieldGet(this, _KupCombobox_textfieldEl, "f").focus();
@@ -808,8 +808,8 @@ _KupCombobox_kupManager = new WeakMap(), _KupCombobox_elStyle = new WeakMap(), _
   __classPrivateFieldGet(this, _KupCombobox_kupManager, "f").removeClickCallback(__classPrivateFieldGet(this, _KupCombobox_clickCb, "f"));
 }, _KupCombobox_isListOpened = function _KupCombobox_isListOpened() {
   return __classPrivateFieldGet(this, _KupCombobox_listEl, "f").menuVisible == true;
-}, _KupCombobox_consistencyCheck = function _KupCombobox_consistencyCheck(e, valueIn, setValue) {
-  let ret = consistencyCheck(valueIn, this.data['kup-list'], __classPrivateFieldGet(this, _KupCombobox_listEl, "f"), this.selectMode, this.displayMode, e);
+}, _KupCombobox_consistencyCheck = function _KupCombobox_consistencyCheck(e, idIn, setValue) {
+  let ret = consistencyCheck(idIn, this.data['kup-list'], __classPrivateFieldGet(this, _KupCombobox_listEl, "f"), this.selectMode, this.displayMode, e);
   if (ret.exists && setValue) {
     this.value = ret.value;
     this.displayedValue = ret.displayedValue;
@@ -818,10 +818,10 @@ _KupCombobox_kupManager = new WeakMap(), _KupCombobox_elStyle = new WeakMap(), _
     }
   }
   else {
-    this.value = valueIn;
-    this.displayedValue = valueIn;
+    this.value = idIn;
+    this.displayedValue = idIn;
     if (__classPrivateFieldGet(this, _KupCombobox_listEl, "f") != null) {
-      __classPrivateFieldGet(this, _KupCombobox_listEl, "f").filter = valueIn;
+      __classPrivateFieldGet(this, _KupCombobox_listEl, "f").filter = idIn;
     }
   }
   return ret;

package/dist/collection/components/kup-data-table/kup-data-table-declarations.js

@@ -40,8 +40,6 @@ export var KupDataTableProps;
   KupDataTableProps["rowActions"] = "Sets the actions of the rows.";
   KupDataTableProps["rowsPerPage"] = "Sets the number of rows per page to display.";
   KupDataTableProps["scrollOnHover"] = "Activates the scroll on hover function.";
-  KupDataTableProps["selectRow"] = "Selects the row at the specified rendered rows prosition (base 1).";
-  KupDataTableProps["selectRowsById"] = "Semicolon separated rows id to select.";
   KupDataTableProps["showCustomization"] = "If set to true, displays the button to open the customization panel.";
   KupDataTableProps["showFilters"] = "When set to true enables the column filters.";
   KupDataTableProps["showFooter"] = "When set to true shows the footer.";

package/dist/collection/components/kup-data-table/kup-data-table-helper.js

@@ -1,6 +1,5 @@
-import numeral from 'numeral';
 import { SortMode, TotalMode, } from './kup-data-table-declarations';
-import { isEmpty, stringToNumber } from '../../utils/utils';
+import { stringToNumber } from '../../utils/utils';
 import { getCellValueForDisplay, getColumnByName, compareCell, } from '../../utils/cell-utils';
 import { FiltersRows } from '../../utils/filters/filters-rows';
 const dom = document.documentElement;
@@ -234,7 +233,7 @@ function updateGroupTotal(groupRow, totals, addedRow, distinctObj) {
     return;
   }
   keys.forEach((key) => {
-    const currentTotalValue = groupRow.group.totals[key] || 0;
+    const currentTotalValue = dom.ketchup.math.numberify(groupRow.group.totals[key] || 0);
     const cell = addedRow.cells[key];
     if (cell) {
       let _isNumber = dom.ketchup.objects.isNumber(cell.obj);
@@ -253,7 +252,7 @@ function updateGroupTotal(groupRow, totals, addedRow, distinctObj) {
         case TotalMode.DISTINCT:
           let cellValue;
           if (_isNumber) {
-            cellValue = numeral(stringToNumber(cell.value)).value();
+            cellValue = dom.ketchup.math.numberify(stringToNumber(cell.value));
           }
           else {
             cellValue = cell.value;
@@ -305,17 +304,15 @@ function updateGroupTotal(groupRow, totals, addedRow, distinctObj) {
         case TotalMode.SUM:
         case TotalMode.AVERAGE:
           if (_isNumber) {
-            const cellValue = numeral(stringToNumber(cell.value));
-            groupRow.group.totals[key] = numeral(cellValue)
-              .add(currentTotalValue)
-              .value();
+            const cellValue = dom.ketchup.math.numberify(stringToNumber(cell.value));
+            groupRow.group.totals[key] =
+              cellValue + currentTotalValue;
             // updating parents
             let parent = groupRow.group.parent;
             while (parent != null) {
-              const currentParentSum = parent.group.totals[key] || 0;
-              parent.group.totals[key] = numeral(cellValue)
-                .add(currentParentSum)
-                .value();
+              const currentParentSum = dom.ketchup.math.numberify(parent.group.totals[key] || 0);
+              parent.group.totals[key] =
+                cellValue + currentParentSum;
               parent = parent.group.parent;
             }
           }
@@ -324,7 +321,7 @@ function updateGroupTotal(groupRow, totals, addedRow, distinctObj) {
         case TotalMode.MIN:
           if (_isNumber) {
             const currentTotalValue = groupRow.group.totals[key];
-            const cellValue = numeral(stringToNumber(cell.value)).value();
+            const cellValue = dom.ketchup.math.numberify(stringToNumber(cell.value));
             if (currentTotalValue) {
               groupRow.group.totals[key] = Math.min(currentTotalValue, cellValue);
             }
@@ -387,7 +384,7 @@ function updateGroupTotal(groupRow, totals, addedRow, distinctObj) {
         case TotalMode.MAX:
           if (_isNumber) {
             const currentTotalValue = groupRow.group.totals[key];
-            const cellValue = numeral(stringToNumber(cell.value)).value();
+            const cellValue = dom.ketchup.math.numberify(stringToNumber(cell.value));
             if (currentTotalValue) {
               groupRow.group.totals[key] = Math.max(currentTotalValue, cellValue);
             }
@@ -528,13 +525,13 @@ function adjustGroupAverageOrFormula(row, type, toAdjustKeys, totals) {
   // adjust average/formulas
   toAdjustKeys.forEach((key) => {
     if (type == TotalMode.AVERAGE) {
-      row.group.totals[key] = numeral(row.group.totals[key])
-        .divide(numberOfLeaf)
-        .value();
+      row.group.totals[key] =
+        dom.ketchup.math.numberify(row.group.totals[key]) /
+          numberOfLeaf;
     }
     if (type == TotalMode.MATH) {
       let formula = totals[key].substring(TotalMode.MATH.length);
-      row.group.totals[key] = dom.ketchup.data.formulas.custom(formula, row.group.totals);
+      row.group.totals[key] = dom.ketchup.math.formulas.custom(formula, row.group.totals);
     }
   });
   return numberOfLeaf;
@@ -564,7 +561,8 @@ export function normalizeRows(columns, rows) {
   }
 }
 export function calcTotals(rows = [], totals = {}) {
-  if (isEmpty(rows) || isEmpty(totals)) {
+  if (dom.ketchup.objects.isEmptyJsObject(rows) ||
+    dom.ketchup.objects.isEmptyJsObject(totals)) {
     return {};
   }
   const keys = Object.keys(totals);
@@ -586,7 +584,7 @@ export function calcTotals(rows = [], totals = {}) {
           if (totals[key] === TotalMode.DISTINCT) {
             let cellValue;
             if (dom.ketchup.objects.isNumber(cell.obj)) {
-              cellValue = numeral(stringToNumber(cell.value)).value();
+              cellValue = dom.ketchup.math.numberify(stringToNumber(cell.value));
             }
             else {
               cellValue = cell.value;
@@ -603,32 +601,32 @@ export function calcTotals(rows = [], totals = {}) {
             }
           }
           else if (dom.ketchup.objects.isNumber(cell.obj)) {
-            const cellValue = numeral(stringToNumber(cell.value));
+            const cellValue = dom.ketchup.math.numberify(stringToNumber(cell.value));
             let currentFooterValue = footerRow[key];
             switch (true) {
               // TODO DRY the MIN and MAX functions
               case totals[key] === TotalMode.MIN:
                 if (currentFooterValue) {
-                  footerRow[key] = Math.min(currentFooterValue, cellValue.value());
+                  footerRow[key] = Math.min(currentFooterValue, cellValue);
                 }
                 else {
-                  footerRow[key] = cellValue.value();
+                  footerRow[key] = cellValue;
                 }
                 break;
               case totals[key] === TotalMode.MAX:
                 if (currentFooterValue) {
-                  footerRow[key] = Math.max(currentFooterValue, cellValue.value());
+                  footerRow[key] = Math.max(currentFooterValue, cellValue);
                 }
                 else {
-                  footerRow[key] = cellValue.value();
+                  footerRow[key] = cellValue;
                 }
                 break;
               default:
                 // SUM
                 currentFooterValue = footerRow[key] || 0;
-                footerRow[key] = cellValue
-                  .add(currentFooterValue)
-                  .value();
+                footerRow[key] =
+                  cellValue +
+                    dom.ketchup.math.numberify(currentFooterValue);
             }
             // TODO DRY the MIN and MAX functions
           }
@@ -684,20 +682,21 @@ export function calcTotals(rows = [], totals = {}) {
         case totals[key] === TotalMode.AVERAGE:
           const sum = footerRow[key];
           if (sum && rows.length > 0) {
-            footerRow[key] = numeral(sum)
-              .divide(rows.length)
-              .value();
+            footerRow[key] = sum / rows.length;
           }
           break;
         case totals[key] === TotalMode.COUNT:
           footerRow[key] = rows.length;
           break;
         case totals[key].indexOf(TotalMode.MATH) == 0:
-          footerRow[key] = dom.ketchup.data.formulas.custom(totals[key].substring(TotalMode.MATH.length), footerRow);
+          footerRow[key] = dom.ketchup.math.formulas.custom(totals[key].substring(TotalMode.MATH.length), footerRow);
           break;
         default:
           break;
       }
+      if (footerRow[key]) {
+        footerRow[key] = +footerRow[key].toFixed(2);
+      }
     }
   }
   return footerRow;