Skip to content

Commit 7f29f82

Browse files
committed
[Demo] Update lists to allow sorting by reference
1 parent 2c575c8 commit 7f29f82

File tree

7 files changed

+30
-12
lines changed

7 files changed

+30
-12
lines changed

examples/crm/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"clsx": "^2.1.1",
1313
"date-fns": "^3.6.0",
1414
"faker": "~5.4.0",
15-
"fakerest": "4.1.3",
15+
"fakerest": "^4.1.3",
1616
"lodash": "~4.17.5",
1717
"papaparse": "^5.4.1",
1818
"ra-data-simple-rest": "^5.3.0",

examples/demo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"data-generator-retail": "^5.0.0",
1414
"date-fns": "^3.6.0",
1515
"echarts": "^5.6.0",
16-
"fakerest": "^4.1.1",
16+
"fakerest": "^4.2.0",
1717
"graphql": "^15.6.0",
1818
"graphql-tag": "^2.12.6",
1919
"inflection": "^3.0.0",

examples/demo/src/invoices/InvoiceList.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ const InvoiceList = () => (
5555
sort={{ field: 'date', order: 'DESC' }}
5656
actions={<ListActions />}
5757
title={<InvoicesTitle />}
58+
queryOptions={{ meta: { embed: 'customer' } }}
5859
>
5960
<DataTable
6061
rowClick="expand"
@@ -67,7 +68,11 @@ const InvoiceList = () => (
6768
>
6869
<Column source="id" />
6970
<Column field={DateField} source="date" />
70-
<Column source="customer_id" className="onlyLarge">
71+
<Column
72+
source="customer.last_name"
73+
label="resources.invoices.fields.customer_id"
74+
className="onlyLarge"
75+
>
7176
<ReferenceField source="customer_id" reference="customers">
7277
<FullNameField source="last_name" />
7378
</ReferenceField>

examples/demo/src/orders/OrderList.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ const OrderList = () => (
6666
filters={orderFilters}
6767
actions={<ListActions />}
6868
title={<OrdersTitle />}
69+
queryOptions={{ meta: { embed: 'customer' } }}
6970
>
7071
<TabbedDatagrid />
7172
</List>
@@ -195,7 +196,12 @@ const OrdersTable = React.memo(
195196
<DateField source="date" showTime />
196197
</Column>
197198
<Column source="reference" />
198-
<Column source="customer_id" field={CustomerReferenceField} />
199+
<Column
200+
source="customer.last_name"
201+
label="resources.orders.fields.customer_id"
202+
>
203+
<CustomerReferenceField />
204+
</Column>
199205
<Column label="resources.orders.fields.address">
200206
<ReferenceField
201207
source="customer_id"

examples/demo/src/reviews/ReviewList.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ const ReviewList = () => {
7171
sort={{ field: 'date', order: 'DESC' }}
7272
actions={<ReviewListActions />}
7373
title={<ReviewsTitle />}
74+
queryOptions={{ meta: { embed: ['customer', 'product'] } }}
7475
>
7576
{isXSmall ? (
7677
<ReviewListMobile />

examples/demo/src/reviews/ReviewListDesktop.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,16 @@ const ReviewListDesktop = ({ selectedRow }: ReviewListDesktopProps) => {
6060
}}
6161
>
6262
<Column source="date" field={DateField} />
63-
<Column source="customer_id">
63+
<Column
64+
source="customer.last_name"
65+
label="resources.reviews.fields.customer_id"
66+
>
6467
<CustomerReferenceField source="customer_id" link={false} />
6568
</Column>
66-
<Column source="product_id">
69+
<Column
70+
source="product.reference"
71+
label="resources.reviews.fields.product_id"
72+
>
6773
<ProductReferenceField source="product_id" link={false} />
6874
</Column>
6975
<Column

yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9860,7 +9860,7 @@ __metadata:
98609860
data-generator-retail: "npm:^5.0.0"
98619861
date-fns: "npm:^3.6.0"
98629862
echarts: "npm:^5.6.0"
9863-
fakerest: "npm:^4.1.1"
9863+
fakerest: "npm:^4.2.0"
98649864
graphql: "npm:^15.6.0"
98659865
graphql-tag: "npm:^2.12.6"
98669866
inflection: "npm:^3.0.0"
@@ -11482,12 +11482,12 @@ __metadata:
1148211482
languageName: node
1148311483
linkType: hard
1148411484

11485-
"fakerest@npm:4.1.3, fakerest@npm:^4.0.1, fakerest@npm:^4.1.1, fakerest@npm:^4.1.3":
11486-
version: 4.1.3
11487-
resolution: "fakerest@npm:4.1.3"
11485+
"fakerest@npm:^4.0.1, fakerest@npm:^4.1.3, fakerest@npm:^4.2.0":
11486+
version: 4.2.0
11487+
resolution: "fakerest@npm:4.2.0"
1148811488
dependencies:
1148911489
lodash: "npm:^4.17.21"
11490-
checksum: 535064d032a6bec88aa9b3e33d6f84e0622bee1f722a821abb8d6e6ca9e65102e11dd800c81be8c6a3fb97bb80875142e809b412e4a434c4fb9dd1911367b6dc
11490+
checksum: bb96c442d6bdc880d6477a2a4e5031a9c6fff361553a88b065c4ba7362bf24c2c194c350be763b4d2bd7c3ccc78bd26a76221990e67b4daf1f0733c1dcf47a6b
1149111491
languageName: node
1149211492
linkType: hard
1149311493

@@ -19705,7 +19705,7 @@ __metadata:
1970519705
clsx: "npm:^2.1.1"
1970619706
date-fns: "npm:^3.6.0"
1970719707
faker: "npm:~5.4.0"
19708-
fakerest: "npm:4.1.3"
19708+
fakerest: "npm:^4.1.3"
1970919709
lodash: "npm:~4.17.5"
1971019710
papaparse: "npm:^5.4.1"
1971119711
ra-data-simple-rest: "npm:^5.3.0"

0 commit comments

Comments
 (0)