impact-ui 5.0.1-alpha.2 → 5.0.1-beta.2

package/dist/components/TableV36/filterUtils.js

@@ -205,63 +205,23 @@ const buildFilterModelEntry = (parsedValue, filterType, columnDef, operationType
   };
   return filterEntry;
 };
-const resolveAdvanceSearchFieldFromFilterKey = (filterKey, colDefs) => {
-  if (!colDefs || !filterKey) {
-    return filterKey;
-  }
-  const find = (defs) => {
-    for (const col of defs) {
-      if (col.children) {
-        const nested = find(col.children);
-        if (nested != null) {
-          return nested;
-        }
-      }
-      if (col.columnFieldsFilterMap) {
-        const entry = Object.entries(col.columnFieldsFilterMap).find(
-          ([, mapped]) => mapped === filterKey
-        );
-        if (entry) {
-          return entry[0];
-        }
-      }
-    }
-    return null;
-  };
-  return find(colDefs) ?? filterKey;
-};
-const resolveDuplicateAdvanceField = (col, field) => {
-  if (!col.toShowDuplicateColumnInAdvanceSearch || !col.columnFieldsInAdvanceSearch) {
-    return null;
-  }
-  let advanceField = field;
-  let index = col.columnFieldsInAdvanceSearch.indexOf(field);
-  if (index === -1 && col.columnFieldsFilterMap) {
-    const entry = Object.entries(col.columnFieldsFilterMap).find(([, mapped]) => mapped === field);
-    if (entry) {
-      advanceField = entry[0];
-      index = col.columnFieldsInAdvanceSearch.indexOf(advanceField);
-    }
-  }
-  if (index === -1) {
-    return null;
-  }
-  return { advanceField, index };
-};
 const findColumnDef = (colDefs, field) => {
+  var _a;
   for (const col of colDefs) {
     if (col.children) {
       const found = findColumnDef(col.children, field);
       if (found) return found;
     }
-    const duplicate = resolveDuplicateAdvanceField(col, field);
-    if (duplicate) {
-      return {
-        ...col,
-        currentColumnField: `${duplicate.advanceField}${duplicate.index + 1}`
-      };
-    }
-    if (col.colId && col.colId === field || col.field && col.field === field) {
+    if (col.toShowDuplicateColumnInAdvanceSearch && col.columnFieldsInAdvanceSearch) {
+      const index = (_a = col.columnFieldsInAdvanceSearch) == null ? void 0 : _a.indexOf(field);
+      if (index !== -1) {
+        return {
+          ...col,
+          currentColumnField: `${field}${index + 1}`
+          // add index + 1
+        };
+      }
+    } else if (col.colId && col.colId === field || col.field && col.field === field) {
       return col;
     }
   }
@@ -352,8 +312,7 @@ const hasValidFilterValue = (filter) => {
 };
 const convertFilterToModalFormat = (columnId, filter, columnDef, colDefs) => {
   var _a;
-  const advanceField = resolveAdvanceSearchFieldFromFilterKey(columnId, colDefs);
-  const columnLabel = getColumnLabel(advanceField, columnDef, colDefs);
+  const columnLabel = getColumnLabel(columnId, columnDef, colDefs);
   let value = (filter == null ? void 0 : filter.filter) || "";
   if (filter == null ? void 0 : filter.dateFrom) {
     if (typeof filter.dateFrom === "string") {
@@ -376,7 +335,7 @@ const convertFilterToModalFormat = (columnId, filter, columnDef, colDefs) => {
   return {
     column: {
       label: columnLabel,
-      value: advanceField,
+      value: columnId,
       type: (filter == null ? void 0 : filter.filterType) || "text"
     },
     operation: {
@@ -427,11 +386,10 @@ const prepareValueForModal = (inputValue, columnDef, getOptionFromDropdownValue)
   }
 };
 const createModalFilterEntry = (columnId, value, columnDef, colDefs) => {
-  const advanceField = resolveAdvanceSearchFieldFromFilterKey(columnId, colDefs);
   return {
     column: {
-      label: getColumnLabel(advanceField, columnDef, colDefs),
-      value: advanceField,
+      label: getColumnLabel(columnId, columnDef, colDefs),
+      value: columnId,
       type: (columnDef == null ? void 0 : columnDef.type) || "text"
     },
     operation: getDefaultOperationForColumn(columnDef),
@@ -476,7 +434,7 @@ const buildAdvanceSearchFilterModel = (formValues, colDefs) => {
     return filterModel;
   }
   formValues.forEach((value) => {
-    var _a, _b, _c;
+    var _a, _b;
     if (!((_a = value == null ? void 0 : value.column) == null ? void 0 : _a.value) || !((_b = value == null ? void 0 : value.operation) == null ? void 0 : _b.value)) {
       return;
     }
@@ -488,9 +446,7 @@ const buildAdvanceSearchFilterModel = (formValues, colDefs) => {
     if (!isValidFilterValue(parsedValue)) {
       return;
     }
-    const advanceField = value.column.value;
-    const mappedKey = (_c = columnDef.columnFieldsFilterMap) == null ? void 0 : _c[advanceField];
-    const columnKey = mappedKey || columnDef.colId || advanceField;
+    const columnKey = columnDef.colId || value.column.value;
     const filterEntry = buildFilterModelEntry(
       parsedValue,
       filterType,
@@ -517,7 +473,6 @@ export {
   isValidFilterValue,
   parseFilterValue,
   parseInlineSearchValue,
-  resolveAdvanceSearchFieldFromFilterKey,
   syncFiltersWithModal,
   updateOrAddFilter
 };

package/dist/components/TableV36/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/TableV36/index.tsx"],"names":[],"mappings":"AA0BA,OAAO,sCAAsC,CAAC;AAC9C,OAAO,8CAA8C,CAAC;AACtD,OAAO,qBAAqB,CAAC;AAsjE7B,eAAO,MAAM,QAAQ,mFAUnB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/TableV36/index.tsx"],"names":[],"mappings":"AA2BA,OAAO,sCAAsC,CAAC;AAC9C,OAAO,8CAA8C,CAAC;AACtD,OAAO,qBAAqB,CAAC;AAqkE7B,eAAO,MAAM,QAAQ,mFAUnB,CAAC"}