diff --git a/.changeset/beige-ducks-matter.md b/.changeset/beige-ducks-matter.md new file mode 100644 index 00000000000..628409d8377 --- /dev/null +++ b/.changeset/beige-ducks-matter.md @@ -0,0 +1,5 @@ +--- +"saleor-dashboard": minor +--- + +Now you can see columns and their ordering that you previously selected when swtich betetween listing pages. diff --git a/src/categories/components/CategoryListDatagrid/CategoryListDatagrid.tsx b/src/categories/components/CategoryListDatagrid/CategoryListDatagrid.tsx index 2f9a8df1f8a..895e0fca09b 100644 --- a/src/categories/components/CategoryListDatagrid/CategoryListDatagrid.tsx +++ b/src/categories/components/CategoryListDatagrid/CategoryListDatagrid.tsx @@ -52,6 +52,7 @@ export const CategoryListDatagrid = ({ [onUpdateListSettings], ); const { handlers, selectedColumns, staticColumns, visibleColumns } = useColumns({ + gridName: "category_list", staticColumns: memoizedStaticColumns, selectedColumns: settings?.columns ?? [], onSave: handleColumnChange, diff --git a/src/collections/components/CollectionListDatagrid/CollectionListDatagrid.tsx b/src/collections/components/CollectionListDatagrid/CollectionListDatagrid.tsx index 362105d738a..0e2af8ec1fb 100644 --- a/src/collections/components/CollectionListDatagrid/CollectionListDatagrid.tsx +++ b/src/collections/components/CollectionListDatagrid/CollectionListDatagrid.tsx @@ -61,6 +61,7 @@ export const CollectionListDatagrid = ({ ); const { handlers, visibleColumns, staticColumns, selectedColumns, recentlyAddedColumn } = useColumns({ + gridName: "collection_list", staticColumns: collectionListStaticColumns, selectedColumns: settings?.columns ?? [], onSave: onColumnChange, diff --git a/src/components/Datagrid/ColumnPicker/withPersistance.ts b/src/components/Datagrid/ColumnPicker/withPersistance.ts index 2c8a9903c6b..5957ddbf955 100644 --- a/src/components/Datagrid/ColumnPicker/withPersistance.ts +++ b/src/components/Datagrid/ColumnPicker/withPersistance.ts @@ -48,5 +48,5 @@ export const selectedWithPersistance = ( ) => { if (persistedColumns.length === 0) return selectedColumns; - return persistedColumns.map(column => column.identifier()); + return persistedColumns.filter(column => !column.isEmpty()).map(column => column.identifier()); }; diff --git a/src/components/Datagrid/persistance/persistedColumn.ts b/src/components/Datagrid/persistance/persistedColumn.ts index ec39dd83216..bad07b96671 100644 --- a/src/components/Datagrid/persistance/persistedColumn.ts +++ b/src/components/Datagrid/persistance/persistedColumn.ts @@ -35,4 +35,8 @@ export class PersistedColumn { public identifier() { return this.id; } + + public isEmpty() { + return this.id === "empty"; + } } diff --git a/src/customers/components/CustomerListDatagrid/CustomerListDatagrid.tsx b/src/customers/components/CustomerListDatagrid/CustomerListDatagrid.tsx index a7ff15a2692..fd6e2fd4e30 100644 --- a/src/customers/components/CustomerListDatagrid/CustomerListDatagrid.tsx +++ b/src/customers/components/CustomerListDatagrid/CustomerListDatagrid.tsx @@ -60,6 +60,7 @@ export const CustomerListDatagrid = ({ ); const { handlers, visibleColumns, staticColumns, selectedColumns, recentlyAddedColumn } = useColumns({ + gridName: "customer_list", staticColumns: customerListStaticColumns, selectedColumns: settings?.columns ?? [], onSave: onColumnChange, diff --git a/src/discounts/components/DiscountListDatagrid/DiscountListDatagrid.tsx b/src/discounts/components/DiscountListDatagrid/DiscountListDatagrid.tsx index fe00e63735a..621a0e298ab 100644 --- a/src/discounts/components/DiscountListDatagrid/DiscountListDatagrid.tsx +++ b/src/discounts/components/DiscountListDatagrid/DiscountListDatagrid.tsx @@ -52,6 +52,7 @@ export const DiscountListDatagrid = ({ ); const { handlers, visibleColumns, staticColumns, selectedColumns, recentlyAddedColumn } = useColumns({ + gridName: "discount_list", staticColumns: discountListStaticColumns, selectedColumns: settings?.columns ?? [], onSave: onColumnChange, diff --git a/src/discounts/components/SaleListDatagrid/SaleListDatagrid.tsx b/src/discounts/components/SaleListDatagrid/SaleListDatagrid.tsx index 149c30ed557..238710c8a80 100644 --- a/src/discounts/components/SaleListDatagrid/SaleListDatagrid.tsx +++ b/src/discounts/components/SaleListDatagrid/SaleListDatagrid.tsx @@ -57,6 +57,7 @@ export const SaleListDatagrid = ({ ); const { handlers, visibleColumns, staticColumns, selectedColumns, recentlyAddedColumn } = useColumns({ + gridName: "sale_list", staticColumns: collectionListStaticColumns, selectedColumns: settings?.columns ?? [], onSave: onColumnChange, diff --git a/src/discounts/components/VoucherListDatagrid/VoucherListDatagrid.tsx b/src/discounts/components/VoucherListDatagrid/VoucherListDatagrid.tsx index d3e3c0b5ffa..3b08ab5d96a 100644 --- a/src/discounts/components/VoucherListDatagrid/VoucherListDatagrid.tsx +++ b/src/discounts/components/VoucherListDatagrid/VoucherListDatagrid.tsx @@ -58,6 +58,7 @@ export const VoucherListDatagrid = ({ ); const { handlers, visibleColumns, recentlyAddedColumn, staticColumns, selectedColumns } = useColumns({ + gridName: "voucher_list", selectedColumns: settings?.columns ?? [], staticColumns: vouchersListStaticColumns, onSave: onColumnChange, diff --git a/src/giftCards/GiftCardsList/GiftCardsListDatagrid/GiftCardsListDatagrid.tsx b/src/giftCards/GiftCardsList/GiftCardsListDatagrid/GiftCardsListDatagrid.tsx index 6b5be9735a0..4f7df1b9303 100644 --- a/src/giftCards/GiftCardsList/GiftCardsListDatagrid/GiftCardsListDatagrid.tsx +++ b/src/giftCards/GiftCardsList/GiftCardsListDatagrid/GiftCardsListDatagrid.tsx @@ -58,6 +58,7 @@ export const GiftCardsListDatagrid = () => { ); const { handlers, staticColumns, visibleColumns, selectedColumns, recentlyAddedColumn } = useColumns({ + gridName: "gift_cards_list", staticColumns: availableColumns, selectedColumns: settings?.columns ?? [], onSave: onColumnChange, diff --git a/src/orders/components/OrderDraftListDatagrid/OrderDraftListDatagrid.tsx b/src/orders/components/OrderDraftListDatagrid/OrderDraftListDatagrid.tsx index 03ac8967a66..7a2a8c3f3da 100644 --- a/src/orders/components/OrderDraftListDatagrid/OrderDraftListDatagrid.tsx +++ b/src/orders/components/OrderDraftListDatagrid/OrderDraftListDatagrid.tsx @@ -53,6 +53,7 @@ export const OrderDraftListDatagrid = ({ [intl, sort], ); const { handlers, staticColumns, visibleColumns, selectedColumns } = useColumns({ + gridName: "order_drafts_list", staticColumns: memoizedStaticColumns, selectedColumns: settings?.columns ?? [], onSave: handleColumnChange, diff --git a/src/orders/components/OrderListDatagrid/OrderListDatagrid.tsx b/src/orders/components/OrderListDatagrid/OrderListDatagrid.tsx index 6a3c5a00299..27d21640ddb 100644 --- a/src/orders/components/OrderListDatagrid/OrderListDatagrid.tsx +++ b/src/orders/components/OrderListDatagrid/OrderListDatagrid.tsx @@ -53,6 +53,7 @@ export const OrderListDatagrid: React.FC = ({ [emptyColumn, intl, sort], ); const { handlers, staticColumns, visibleColumns, selectedColumns } = useColumns({ + gridName: "order_list", staticColumns: memoizedStaticColumns, selectedColumns: settings?.columns ?? [], onSave: handleColumnChange, diff --git a/src/pages/components/PageListDatagrid/PageListDatagrid.tsx b/src/pages/components/PageListDatagrid/PageListDatagrid.tsx index 91a5a68b4e3..713bdeadf99 100644 --- a/src/pages/components/PageListDatagrid/PageListDatagrid.tsx +++ b/src/pages/components/PageListDatagrid/PageListDatagrid.tsx @@ -54,6 +54,7 @@ export const PageListDatagrid = ({ ); const { handlers, visibleColumns, staticColumns, selectedColumns, recentlyAddedColumn } = useColumns({ + gridName: "page_list", staticColumns: pageListStaticColumns, selectedColumns: settings?.columns ?? [], onSave: onColumnChange,