@redsift/table 11.2.1 → 11.2.2-alpha.1

package/index.d.ts

@@ -183,8 +183,8 @@ declare const getSearchParamsFromSorting: (sorting: GridSortItem[]) => URLSearch
 declare const getPaginationFromString: (searchString: string) => ExtendedGridPaginationModel | 'invalid';
 declare const getSearchParamsFromPagination: (pagination: ExtendedGridPaginationModel) => URLSearchParams;
 /** COLUMN VISIBILITY */
+declare const getColumnVisibilityFromString: (searchString: string, columns: DataGridProps['columns']) => GridColumnVisibilityModel | 'invalid';
 declare const getSearchParamsFromColumnVisibility: (columnVisibility: GridColumnVisibilityModel, columns: DataGridProps['columns']) => URLSearchParams;
-declare const getColumnVisibilityFromString: (notParsed: string, tableColumns: DataGridProps['columns']) => GridColumnVisibilityModel | 'invalid';
 declare const getPinnedColumnsFromString: (notParsed: string, tableColumns: DataGridProps['columns']) => PinnedColumns | 'invalid';
 declare const getSearchParamsFromPinnedColumns: (pinnedColumns: GridPinnedColumns) => URLSearchParams;
 declare const getSearchParamsFromTab: (search: string) => URLSearchParams;

package/index.js

@@ -18140,7 +18140,7 @@ const getFilterModelFromString = (searchString, columns) => {
       searchParams.set(key, value);
     }
     if (key === '_logicOperator') {
-      logicOperator = value;
+      logicOperator = value === GridLogicOperator.And || value === GridLogicOperator.Or ? value : GridLogicOperator.And;
     }
   }
   let id = 5000;
@@ -18327,6 +18327,7 @@ const getSearchParamsFromPagination = pagination => {
 // - if we don't have that, use the localStorage and update the URL
 // - if we don't have that, return an empty PaginationModel
 const getPaginationModel = (search, localStoragePagination, setLocalStoragePagination, initialState) => {
+  var _initialState$paginat;
   const pagination = getPaginationFromString(search);
   if (pagination !== 'invalid') {
     const searchFromPaginationModel = getSearchParamsFromPagination(pagination);
@@ -18340,11 +18341,11 @@ const getPaginationModel = (search, localStoragePagination, setLocalStoragePagin
   if (paginationModelFromLocalStorage !== 'invalid') {
     return paginationModelFromLocalStorage;
   }
-  return initialState !== null && initialState !== void 0 && initialState.pagination ? _objectSpread2({
+  return initialState !== null && initialState !== void 0 && (_initialState$paginat = initialState.pagination) !== null && _initialState$paginat !== void 0 && _initialState$paginat.paginationModel ? _objectSpread2({
     page: 0,
     pageSize: 25,
     direction: 'next'
-  }, initialState.pagination) : {
+  }, initialState.pagination.paginationModel) : {
     page: 0,
     pageSize: 25,
     direction: 'next'
@@ -18353,6 +18354,31 @@ const getPaginationModel = (search, localStoragePagination, setLocalStoragePagin
 
 /** COLUMN VISIBILITY */
 
+const getColumnVisibilityFromString = (searchString, columns) => {
+  if (!searchString) {
+    return 'invalid';
+  }
+  const searchParams = new URLSearchParams(searchString);
+  const value = searchParams.get('_columnVisibility');
+  if (value === '' || value === null || value === '[]') {
+    return 'invalid';
+  }
+  const parsedFields = value.slice(1, value.length - 1).split(',');
+  const fields = columns.map(column => column.field);
+  const visibility = {};
+  for (const field of fields) {
+    visibility[field] = false;
+  }
+  for (const parsedField of parsedFields) {
+    if (fields.includes(parsedField)) {
+      visibility[parsedField] = true;
+    }
+  }
+  if (Object.values(visibility).filter(v => v === true).length === 0) {
+    return 'invalid';
+  }
+  return visibility;
+};
 const getSearchParamsFromColumnVisibility = (columnVisibility, columns) => {
   const searchParams = new URLSearchParams();
   const fields = columns.map(column => column.field);
@@ -18370,63 +18396,10 @@ const getSearchParamsFromColumnVisibility = (columnVisibility, columns) => {
       [colName]: true
     });
   }, columnVisibility);
-  const visibleColumns = Object.entries(finalColumnVisibility)
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  .filter(_ref => {
-    let [_, visible] = _ref;
-    return visible;
-  })
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  .map(_ref2 => {
-    let [column, _] = _ref2;
-    return encodeValue(column);
-  });
+  const visibleColumns = fields.filter(column => finalColumnVisibility[column] !== false);
   searchParams.set('_columnVisibility', `[${visibleColumns.join(',')}]`);
   return searchParams;
 };
-const getColumnVisibilityFromString = (notParsed, tableColumns) => {
-  if (!notParsed || notParsed.length === 1 && notParsed[0] === '?') {
-    return 'invalid';
-  }
-  // remove the initial ? if present
-  const parsed = notParsed[0] === '?' ? notParsed.slice(1) : notParsed;
-  const visibility = {};
-  let exist = false;
-  let visibleColumnsCount = 0;
-  for (const item of parsed.split('&')) {
-    // if it's not column visibility field, skip
-    const fieldURL = item.split('=')[0];
-    if (fieldURL !== '_columnVisibility') {
-      continue;
-    }
-    // e.g. item = _columnVisibility[abc,def]
-    const left = item.split(']')[0];
-    if (left.split('[').length < 2) {
-      continue;
-    }
-    const encodedValues = item.split('[')[1].split(']')[0];
-    if (typeof encodedValues !== 'string') {
-      continue;
-    }
-    exist = true;
-    const fields = tableColumns.map(column => column.field);
-    // TODO: Add validation that , is present
-    const columns = encodedValues.split(',').map(value => decodeValue(value));
-
-    // for each column, check if it's visible and add it to visibility model
-    for (const column of fields) {
-      const isColumnVisible = columns.includes(column);
-      visibility[column] = isColumnVisible;
-      if (isColumnVisible) {
-        visibleColumnsCount += 1;
-      }
-    }
-  }
-  if (visibleColumnsCount === 0 && !exist) {
-    return 'invalid';
-  }
-  return visibility;
-};
 
 // Rules:
 // - if we have something in the URL, use that info
@@ -18490,9 +18463,9 @@ const getPinnedColumnsFromString = (notParsed, tableColumns) => {
       pinnedColumns['right'] = columns;
     }
   }
-  return pinnedColumns['left'] || pinnedColumns['right'] ? {
-    left: pinnedColumns['left'] || [],
-    right: pinnedColumns['right'] || []
+  return pinnedColumns.left && pinnedColumns.left.length > 0 || pinnedColumns.right && pinnedColumns.right.length > 0 ? {
+    left: pinnedColumns.left || [],
+    right: pinnedColumns.right || []
   } : 'invalid';
 };
 const getSearchParamsFromPinnedColumns = pinnedColumns => {
@@ -18544,7 +18517,7 @@ const getSearchParamsFromTab = search => {
   }
   return searchParams;
 };
-const getFinalSearch = _ref3 => {
+const getFinalSearch = _ref => {
   let {
     search,
     filterModel,
@@ -18553,7 +18526,7 @@ const getFinalSearch = _ref3 => {
     columnsVisibilityModel,
     pinnedColumnsModel,
     columns
-  } = _ref3;
+  } = _ref;
   const filterModelSearch = getSearchParamsFromFilterModel(filterModel);
   const sortModelSearch = getSearchParamsFromSorting(sortModel);
   const paginationModelSearch = getSearchParamsFromPagination(paginationModel);
@@ -18608,14 +18581,14 @@ const getModelsParsedOrUpdateLocalStorage = (search, columns, historyReplace, in
     pinnedColumnsModel
   };
 };
-const updateUrl = (_ref4, search, historyReplace, columns) => {
+const updateUrl = (_ref2, search, historyReplace, columns) => {
   let {
     filterModel,
     sortModel,
     paginationModel,
     columnsModel: columnsVisibilityModel,
     pinnedColumnsModel
-  } = _ref4;
+  } = _ref2;
   const newSearch = getFinalSearch({
     search,
     filterModel,