Skip to content

Commit

Permalink
Apply grid persistance on other views (#4868)
Browse files Browse the repository at this point in the history
* Apply grid persistance on other views

* Create beige-ducks-matter.md

* Update beige-ducks-matter.md
  • Loading branch information
andrzejewsky authored May 27, 2024
1 parent ca83d3a commit 8943ae2
Show file tree
Hide file tree
Showing 13 changed files with 20 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .changeset/beige-ducks-matter.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"saleor-dashboard": minor
---

Now you can see columns and their ordering that you previously selected when swtich betetween listing pages.
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ export const CategoryListDatagrid = ({
[onUpdateListSettings],
);
const { handlers, selectedColumns, staticColumns, visibleColumns } = useColumns({
gridName: "category_list",
staticColumns: memoizedStaticColumns,
selectedColumns: settings?.columns ?? [],
onSave: handleColumnChange,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ export const CollectionListDatagrid = ({
);
const { handlers, visibleColumns, staticColumns, selectedColumns, recentlyAddedColumn } =
useColumns({
gridName: "collection_list",
staticColumns: collectionListStaticColumns,
selectedColumns: settings?.columns ?? [],
onSave: onColumnChange,
Expand Down
2 changes: 1 addition & 1 deletion src/components/Datagrid/ColumnPicker/withPersistance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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());
};
4 changes: 4 additions & 0 deletions src/components/Datagrid/persistance/persistedColumn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,8 @@ export class PersistedColumn {
public identifier() {
return this.id;
}

public isEmpty() {
return this.id === "empty";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ export const CustomerListDatagrid = ({
);
const { handlers, visibleColumns, staticColumns, selectedColumns, recentlyAddedColumn } =
useColumns({
gridName: "customer_list",
staticColumns: customerListStaticColumns,
selectedColumns: settings?.columns ?? [],
onSave: onColumnChange,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ export const DiscountListDatagrid = ({
);
const { handlers, visibleColumns, staticColumns, selectedColumns, recentlyAddedColumn } =
useColumns({
gridName: "discount_list",
staticColumns: discountListStaticColumns,
selectedColumns: settings?.columns ?? [],
onSave: onColumnChange,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ export const SaleListDatagrid = ({
);
const { handlers, visibleColumns, staticColumns, selectedColumns, recentlyAddedColumn } =
useColumns({
gridName: "sale_list",
staticColumns: collectionListStaticColumns,
selectedColumns: settings?.columns ?? [],
onSave: onColumnChange,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export const VoucherListDatagrid = ({
);
const { handlers, visibleColumns, recentlyAddedColumn, staticColumns, selectedColumns } =
useColumns({
gridName: "voucher_list",
selectedColumns: settings?.columns ?? [],
staticColumns: vouchersListStaticColumns,
onSave: onColumnChange,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ export const OrderListDatagrid: React.FC<OrderListDatagridProps> = ({
[emptyColumn, intl, sort],
);
const { handlers, staticColumns, visibleColumns, selectedColumns } = useColumns({
gridName: "order_list",
staticColumns: memoizedStaticColumns,
selectedColumns: settings?.columns ?? [],
onSave: handleColumnChange,
Expand Down
1 change: 1 addition & 0 deletions src/pages/components/PageListDatagrid/PageListDatagrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export const PageListDatagrid = ({
);
const { handlers, visibleColumns, staticColumns, selectedColumns, recentlyAddedColumn } =
useColumns({
gridName: "page_list",
staticColumns: pageListStaticColumns,
selectedColumns: settings?.columns ?? [],
onSave: onColumnChange,
Expand Down

0 comments on commit 8943ae2

Please sign in to comment.